Skip to content

Commit 0f87798

Browse files
committed
Don't write bad password back out to input
Closes #1379.
1 parent 963ebac commit 0f87798

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/browser/pages/login.html

-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ <h1 class="main">Welcome to code-server</h1>
3333
<input class="user" type="text" autocomplete="username" />
3434
<input id="base" type="hidden" name="base" value="/" />
3535
<div class="field">
36-
<!-- The onfocus code places the cursor at the end of the value. -->
3736
<input
3837
required
3938
autofocus
40-
value="{{VALUE}}"
41-
onfocus="const value=this.value;this.value='';this.value=value;"
4239
class="password"
4340
type="password"
4441
placeholder="PASSWORD"

src/node/app/login.ts

+5-10
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ export class LoginHttpProvider extends HttpProvider {
4545
return undefined
4646
}
4747

48-
public async getRoot(route: Route, value?: string, error?: Error): Promise<HttpResponse> {
48+
public async getRoot(route: Route, error?: Error): Promise<HttpResponse> {
4949
const response = await this.getUtf8Resource(this.rootPath, "src/browser/pages/login.html")
50-
response.content = response.content
51-
.replace(/{{VALUE}}/, value || "")
52-
.replace(/{{ERROR}}/, error ? `<div class="error">${error.message}</div>` : "")
50+
response.content = response.content.replace(/{{ERROR}}/, error ? `<div class="error">${error.message}</div>` : "")
5351
return this.replaceTemplates(route, response)
5452
}
5553

@@ -63,15 +61,12 @@ export class LoginHttpProvider extends HttpProvider {
6361
return { code: HttpCode.Ok }
6462
}
6563

66-
let payload: LoginPayload | undefined
6764
try {
6865
const data = await this.getData(request)
69-
const p = data ? querystring.parse(data) : {}
70-
payload = p
71-
72-
return await this.login(p, route, request)
66+
const payload = data ? querystring.parse(data) : {}
67+
return await this.login(payload, route, request)
7368
} catch (error) {
74-
return this.getRoot(route, payload ? payload.password : undefined, error)
69+
return this.getRoot(route, error)
7570
}
7671
}
7772

0 commit comments

Comments
 (0)