Skip to content

Commit 209ca86

Browse files
committed
Use vars instead of multiple ssh cert file strings
1 parent 99b70ee commit 209ca86

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

coder-base/server.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ var util = require('util');
3232
var cons = require('consolidate');
3333
var params = require('express-params');
3434
var querystring = require('querystring');
35+
var path = require('path');
3536

3637
var loadApp = function( loadpath ) {
3738

@@ -136,11 +137,13 @@ var startSSLRedirect = function() {
136137

137138
var startSSL = function() {
138139

140+
privateKeyFile=path.normalize('certs/server.key');
141+
certificateFile=path.normalize('certs/server.cert');
139142
var privateKey="";
140143
var certificate="";
141144
try {
142-
privateKey = fs.readFileSync('certs/server.key').toString();
143-
certificate = fs.readFileSync('certs/server.cert').toString();
145+
privateKey = fs.readFileSync(privateKeyFile).toString();
146+
certificate = fs.readFileSync(certificateFile).toString();
144147
} catch ( e ) {
145148
util.print( "no certificate found. generating self signed cert.\n" );
146149
}
@@ -150,30 +153,30 @@ var startSSL = function() {
150153
} else {
151154
var spawn = require('child_process').spawn;
152155

153-
var genSelfSignedCert = function() {
156+
var genSelfSignedCert = function(keyFile, certFile) {
154157
var genkey = spawn( 'openssl', [
155158
'req', '-x509', '-nodes',
156159
'-days', '365',
157160
'-newkey', 'rsa:2048',
158-
'-keyout', 'certs/server.key',
159-
'-out', 'certs/server.cert',
161+
'-keyout', keyFile,
162+
'-out', certFile,
160163
'-subj',
161164
'/C=' + config.country + '/ST=' + config.state + "/L=" + config.locale + "/CN=" + config.commonName + "/subjectAltName=" + config.subjectAltName
162165
]);
163166
genkey.stdout.on('data', function(d) { util.print(d) } );
164167
genkey.stderr.on('data', function(d) { util.print(d) } );
165168
genkey.addListener( 'exit', function( code, signal ) {
166-
fs.chmodSync('certs/server.key', '600');
169+
fs.chmodSync(privateKeyFile, '600');
167170
loadServer();
168171
});
169172
};
170173
var loadServer = function() {
171-
privateKey = fs.readFileSync('certs/server.key').toString();
172-
certificate = fs.readFileSync('certs/server.cert').toString();
174+
privateKey = fs.readFileSync(privateKeyFile).toString();
175+
certificate = fs.readFileSync(certificateFile).toString();
173176
https.createServer({ key: privateKey, cert: certificate }, sslapp).listen( config.listenPort, config.listenIP );
174177
};
175178

176-
genSelfSignedCert();
179+
genSelfSignedCert(privateKeyFile, certificateFile);
177180
}
178181
};
179182

0 commit comments

Comments
 (0)