a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix login redirect when not using https

This commit is contained in:
Asher 2019-07-22 10:43:18 -05:00
parent 078af59fd8
commit cd54aec2f9
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/server.ts
View File

@ -111,8 +111,10 @@ export abstract class Server {
protected readonly server: http.Server | https.Server; protected readonly server: http.Server | https.Server;
protected rootPath = path.resolve(__dirname, "../../../.."); protected rootPath = path.resolve(__dirname, "../../../..");
private listenPromise: Promise<string> | undefined; private listenPromise: Promise<string> | undefined;
private readonly protocol: string;
public constructor(public readonly options: ServerOptions) { public constructor(public readonly options: ServerOptions) {
this.protocol = this.options.allowHttp ? "http" : "https";
if (this.options.cert && this.options.certKey) { if (this.options.cert && this.options.certKey) {
useHttpsTransformer(); useHttpsTransformer();
const httpolyglot = require.__$__nodeRequire(path.resolve(__dirname, "../node_modules/httpolyglot/lib/index")) as typeof import("httpolyglot"); const httpolyglot = require.__$__nodeRequire(path.resolve(__dirname, "../node_modules/httpolyglot/lib/index")) as typeof import("httpolyglot");
@ -153,7 +155,7 @@ export abstract class Server {
: (address.address === "::" ? "localhost" : address.address) : (address.address === "::" ? "localhost" : address.address)
) + ":" + address.port ) + ":" + address.port
: address; : address;
return `${this.options.allowHttp ? "http" : "https"}://${endpoint}`; return `${this.protocol}://${endpoint}`;
} }
protected abstract handleRequest( protected abstract handleRequest(
@ -173,7 +175,9 @@ export abstract class Server {
response.writeHead(payload.redirect ? HttpCode.Redirect : payload.code || HttpCode.Ok, { response.writeHead(payload.redirect ? HttpCode.Redirect : payload.code || HttpCode.Ok, {
"Cache-Control": "max-age=86400", // TODO: ETag? "Cache-Control": "max-age=86400", // TODO: ETag?
"Content-Type": getMediaMime(payload.filePath), "Content-Type": getMediaMime(payload.filePath),
...(payload.redirect ? { Location: payload.redirect } : {}), ...(payload.redirect ? {
Location: `${this.protocol}://${request.headers.host}${payload.redirect}`,
} : {}),
...payload.headers, ...payload.headers,
}); });
response.end(payload.content); response.end(payload.content);
@ -189,7 +193,7 @@ export abstract class Server {
private async preHandleRequest(request: http.IncomingMessage): Promise<Response> { private async preHandleRequest(request: http.IncomingMessage): Promise<Response> {
const secure = (request.connection as tls.TLSSocket).encrypted; const secure = (request.connection as tls.TLSSocket).encrypted;
if (!this.options.allowHttp && !secure) { if (!this.options.allowHttp && !secure) {
return { redirect: "https://" + request.headers.host + request.url }; return { redirect: request.url };
} }
const parsedUrl = url.parse(request.url || "", true); const parsedUrl = url.parse(request.url || "", true);
@ -215,7 +219,7 @@ export abstract class Server {
if (requestPath === "/favicon.ico") { if (requestPath === "/favicon.ico") {
return this.getResource(path.join(this.rootPath, "/out/vs/server/src/favicon", requestPath)); return this.getResource(path.join(this.rootPath, "/out/vs/server/src/favicon", requestPath));
} else if (!this.authenticate(request)) { } else if (!this.authenticate(request)) {
return { redirect: "https://" + request.headers.host + "/login" }; return { redirect: "/login" };
} }
break; break;
case "/login": case "/login":
@ -240,13 +244,13 @@ export abstract class Server {
private async tryLogin(request: http.IncomingMessage): Promise<Response> { private async tryLogin(request: http.IncomingMessage): Promise<Response> {
if (this.authenticate(request)) { if (this.authenticate(request)) {
this.ensureGet(request); this.ensureGet(request);
return { redirect: "https://" + request.headers.host + "/" }; return { redirect: "/" };
} }
if (request.method === "POST") { if (request.method === "POST") {
const data = await this.getData<LoginPayload>(request); const data = await this.getData<LoginPayload>(request);
if (this.authenticate(request, data)) { if (this.authenticate(request, data)) {
return { return {
redirect: "https://" + request.headers.host + "/", redirect: "/",
headers: {"Set-Cookie": `password=${data.password}` } headers: {"Set-Cookie": `password=${data.password}` }
}; };
} }
@ -384,12 +388,7 @@ export class MainServer extends Server {
case "/node_modules": case "/node_modules":
case "/out": case "/out":
return this.getResource(path.join(this.rootPath, base, requestPath)); return this.getResource(path.join(this.rootPath, base, requestPath));
// TODO: this setup means you can't request anything from the root if it // TODO: make this a /resources endpoint instead. Will require patching?
// starts with /node_modules or /out, although that's probably low risk.
// There doesn't seem to be a really good way to solve this since some
// resources are requested by the browser (like the extension icon) and
// some by the file provider (like the extension README). Maybe add a
// /resource prefix and a file provider that strips that prefix?
default: return this.getResource(path.join(base, requestPath)); default: return this.getResource(path.join(base, requestPath));
} }
} }