NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-server/https): ask for passphrase (#2963)

Browse Source 
Fixes #2962
This commit is contained in:
Julien Fontanet 2018-05-18 15:05:49 +02:00 committed by GitHub
parent 005a9fdc01
commit c6ae969a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/xo-server/src/index.js
View File

@ -7,6 +7,7 @@ import has from 'lodash/has'
import helmet from 'helmet' import helmet from 'helmet'
import includes from 'lodash/includes' import includes from 'lodash/includes'
import proxyConsole from './proxy-console' import proxyConsole from './proxy-console'
import pw from 'pw'
import serveStatic from 'serve-static' import serveStatic from 'serve-static'
import startsWith from 'lodash/startsWith' import startsWith from 'lodash/startsWith'
import stoppable from 'stoppable' import stoppable from 'stoppable'
@ -227,12 +228,12 @@ async function registerPlugin (pluginPath, pluginName) {
// instance. // instance.
const instance = isFunction(factory) const instance = isFunction(factory)
? factory({ ? factory({
xo: this, xo: this,
getDataDir: () => { getDataDir: () => {
const dir = `${this._config.datadir}/${pluginName}` const dir = `${this._config.datadir}/${pluginName}`
return ensureDir(dir).then(() => dir) return ensureDir(dir).then(() => dir)
}, },
}) })
: factory : factory
await this.registerPlugin( await this.registerPlugin(
@ -311,6 +312,13 @@ async function makeWebServerListen (
) { ) {
if (cert && key) { if (cert && key) {
;[opts.cert, opts.key] = await Promise.all([readFile(cert), readFile(key)]) ;[opts.cert, opts.key] = await Promise.all([readFile(cert), readFile(key)])
if (opts.key.includes('ENCRYPTED')) {
opts.passphrase = await new Promise(resolve => {
console.log('Encrypted key %s', key)
process.stdout.write(`Enter pass phrase: `)
pw(resolve)
})
}
} }
try { try {
const niceAddress = await webServer.listen(opts) const niceAddress = await webServer.listen(opts)