OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Force certificates

Browse Source
This commit is contained in:
Kyle Carberry 2019-02-28 14:34:54 -06:00
parent e8174095ca
commit 43048c6d12
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app/browser/src/app.html
View File

@ -3,14 +3,14 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
<title>Coder</title> <title>Authenticate: code-server</title>
</head> </head>
<body> <body>
<div class="login"> <div class="login">
<div class="back"> <div class="back">
<- Back </div> <- Back </div>
<!-- <h4 class="title">AWS Cloud</h4> --> <h4 class="title">code-server</h4>
<h2 class="subtitle"> <h2 class="subtitle">
Enter server password Enter server password
</h2> </h2>

3
packages/server/src/modules.ts
View File

@ -1,5 +1,6 @@
import * as fs from "fs"; import * as fs from "fs";
import * as path from "path"; import * as path from "path";
import * as os from "os";
import { isCli, buildDir } from "./constants"; import { isCli, buildDir } from "./constants";
declare var __non_webpack_require__: typeof require; declare var __non_webpack_require__: typeof require;
@ -19,7 +20,7 @@ export const setup = (dataDirectory: string): void => {
} }
return currentDir; return currentDir;
}); // Might need path.sep here for linux. Having it for windows causes an error because \C:\Users ... }, os.platform() === "win32" ? undefined! : path.sep); // Might need path.sep here for linux. Having it for windows causes an error because \C:\Users ...
const unpackModule = (moduleName: string): void => { const unpackModule = (moduleName: string): void => {
const memFile = path.join(isCli ? buildDir! : path.join(__dirname, ".."), "build/dependencies", moduleName); const memFile = path.join(isCli ? buildDir! : path.join(__dirname, ".."), "build/dependencies", moduleName);

50
packages/server/src/server.ts
View File

@ -86,24 +86,46 @@ export const createApp = async (options: CreateAppOptions): Promise<{
options.registerMiddleware(app); options.registerMiddleware(app);
} }
const certs = await new Promise<pem.CertificateCreationResult>((res, rej): void => { interface CertificateInfo {
pem.createCertificate({ readonly key: string;
selfSigned: true, // tslint:disable-next-line:no-any
}, (err, result) => { readonly cert: any;
if (err) { }
rej(err);
return; const certs = await new Promise<CertificateInfo>(async (resolve, reject): Promise<void> => {
const selfSignedKeyPath = path.join(options.serverOptions!.dataDirectory, "self-signed.key");
const selfSignedCertPath = path.join(options.serverOptions!.dataDirectory, "self-signed.cert");
if (!fs.existsSync(selfSignedKeyPath) || !fs.existsSync(selfSignedCertPath)) {
try {
const certs = await new Promise<pem.CertificateCreationResult>((res, rej): void => {
pem.createCertificate({
selfSigned: true,
}, (err, result) => {
if (err) {
rej(err);
return;
}
res(result);
});
});
fs.writeFileSync(selfSignedKeyPath, certs.serviceKey);
fs.writeFileSync(selfSignedCertPath, certs.certificate);
} catch (ex) {
return reject(ex);
} }
}
res(result); resolve({
cert: fs.readFileSync(selfSignedCertPath).toString(),
key: fs.readFileSync(selfSignedKeyPath).toString(),
}); });
}); });
const server = httpolyglot.createServer({ const server = httpolyglot.createServer(options.httpsOptions || certs, app) as http.Server;
key: certs.serviceKey,
cert: certs.certificate,
}, app) as http.Server;
const wss = new ws.Server({ server }); const wss = new ws.Server({ server });
wss.shouldHandle = (req): boolean => { wss.shouldHandle = (req): boolean => {
@ -161,6 +183,10 @@ export const createApp = async (options: CreateAppOptions): Promise<{
const authStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/auth")); const authStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/auth"));
const unauthStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/unauth")); const unauthStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/unauth"));
app.use((req, res, next) => { app.use((req, res, next) => {
if (!isEncrypted(req.socket)) {
return res.redirect(301, `https://${req.headers.host!}${req.path}`);
}
if (isAuthed(req)) { if (isAuthed(req)) {
// We can serve the actual VSCode bin // We can serve the actual VSCode bin
authStaticFunc(req, res, next); authStaticFunc(req, res, next);