From acea47725d36b9a672975e6c3edd7f1d8b66d2b7 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Sun, 2 Jun 2019 13:13:44 +0800 Subject: [PATCH] allow both 'file' and 'greenlock' when protocol=='httpall' --- ConfigBasic.js | 26 +++++++++++++------------- ConfigCustom.js | 2 ++ server.js | 48 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/ConfigBasic.js b/ConfigBasic.js index 814512c..c05cfb0 100644 --- a/ConfigBasic.js +++ b/ConfigBasic.js @@ -1,15 +1,15 @@ -module.exports={ - protocol:'http', - host:'localhost', - port:undefined, +module.exports = { + protocol: 'http', + host: 'localhost', + port: undefined, - deploy:{ - host:'', // 待部署到的主机 - port:'22', // 带部署到的主机的 SSH 端口 - root:'/home/tic/node.console.web', // 待部署到的目录路径 - dist:'dist', // 待部署到的文件夹 - user:'tic', // 登录用户名 - password:'', // 登录用户密码 - key:`${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件 + deploy: { + host: '', // 待部署到的主机 + port: '22', // 带部署到的主机的 SSH 端口 + root: '/home/tic/node.console.web', // 待部署到的目录路径 + dist: 'dist', // 待部署到的文件夹 + user: 'tic', // 登录用户名 + password: '', // 登录用户密码 + key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件 }, -} \ No newline at end of file +} diff --git a/ConfigCustom.js b/ConfigCustom.js index 5f374e1..548a176 100644 --- a/ConfigCustom.js +++ b/ConfigCustom.js @@ -1,5 +1,7 @@ module.exports={ // 如果使用 https 协议，必须填写以下内容，或在命令行参数中设置： + // sslType: 'greenlock', + // sslDomainList: [''], // sslKey: '/etc/letsencrypt/live/test.bittic.net/privkey.pem', // ssl key file, // sslCert: '/etc/letsencrypt/live/test.bittic.net/fullchain.pem', // ssl cert file, // sslCA: '/etc/letsencrypt/live/test.bittic.net/bundle.crt', // ssl ca file, diff --git a/server.js b/server.js index a2ed1fc..8d9facd 100644 --- a/server.js +++ b/server.js @@ -34,6 +34,7 @@ try { .option('--sslCert ', 'SSL cert file. Default to ' + Config.sslCert) .option('--sslKey ', 'SSL privkey file. Default to ' + Config.sslKey) .option('--sslCA ', 'SSL ca bundle file') + .option('--sslType ', `SSL provider type. Default to ${Config.sslType}`) .parse(process.argv) // 把命令行参数 合并入配置。 @@ -43,6 +44,7 @@ try { Config.sslCert = commander.sslCert || Config.sslCert Config.sslKey = commander.sslKey || Config.sslKey Config.sslCA = commander.sslCA || Config.sslCA + Config.sslType = commander.sslType || Config.sslType console.info('Configuration is ready.') @@ -72,7 +74,7 @@ async function init() { /*** 设置全局对象 ***/ communityMember: false, store: require('greenlock-store-fs'), email: 'ssl@faronear.org', - approvedDomains: [wo.Config.host], + approvedDomains: wo.Config.sslDomainList, configDir: path.resolve(__dirname, 'ssl'), app: server, }) @@ -85,36 +87,54 @@ async function init() { /*** 设置全局对象 ***/ server.use(compression()) /*** 路由 ***/ - server.use(express.static(path.join(__dirname, 'dist'), {index:'index.html'})) + server.use(express.static(path.join(__dirname, 'dist'), {index: 'index.html'})) //server.use(require('serve-favicon')(path.join(__dirname, 'public', 'favicon.ico'))) // uncomment after placing your favicon in /public /*** 启动 Web 服务 ***/ + let webServer if ('http' === wo.Config.protocol) { - require('http').createServer(server).listen(wo.Config.port, function (err) { + webServer = require('http').createServer(server).listen(wo.Config.port, function(err) { if (err) console.log(err) else console.log(`Server listening on ${wo.Config.protocol}://${wo.Config.host}:${wo.Config.port} for ${server.settings.env} environment`) }) } else if ('https' === wo.Config.protocol) { - // require('https').createServer({ - // key: fs.readFileSync(wo.Config.sslKey), - // cert: fs.readFileSync(wo.Config.sslCert) // , ca: [ fs.readFileSync(wo.Config.sslCA) ] // only for self-signed certificate: https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener - // }, server).listen(......) - require('https').createServer(greenlock.httpsOptions, server).listen(wo.Config.port, function (err) { + webServer = require('https').createServer(wo.Config.sslType === 'greenlock' ? greenlock.httpsOptions : { + key: fs.readFileSync(wo.Config.sslKey), + cert: fs.readFileSync(wo.Config.sslCert), + // ca: [ fs.readFileSync(wo.Config.sslCA) ] // only for self-signed certificate: https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener + }, server).listen(wo.Config.port, function (err) { if (err) console.log(err) else console.log(`Server listening on ${wo.Config.protocol}://${wo.Config.host}:${wo.Config.port} for ${server.settings.env} environment`) }) } else if ('httpall' === wo.Config.protocol) { let portHttp = wo.Config.port ? wo.Config.port : 80 // 如果port参数已设置，使用它；否则默认为80 let portHttps = (wo.Config.port && wo.Config.port !== 80) ? wo.Config.port + 443 : 443 // 如果port参数已设置，使用它+443；否则默认为443 - greenlock.listen(portHttp, portHttps, function (err) { - if (err) console.log(err) - else console.log(`Server listening on [${wo.Config.protocol}] http=>https://${wo.Config.host}:${portHttp}=>${portHttps} for ${server.settings.env} environment`) - }) + if (wo.Config.sslType === 'greenlock') { + webServer = greenlock.listen(portHttp, portHttps, function (err) { + if (err) console.log(err) + else console.log(`Server listening on [${wo.Config.protocol}] http=>https://${wo.Config.host}:${portHttp}=>${portHttps} for ${server.settings.env} environment`) + }) + } else { + require('http').createServer(server.all('*', function (ask, reply) { + reply.redirect(`https://${wo.Config.host}:${portHttps}`) + })).listen(portHttp, function(err) { + if (err) console.log(err) + else console.log(`Server listening on [${wo.Config.protocol}] http://${wo.Config.host}:${portHttp} for ${server.settings.env} environment`) + }) + webServer = require('https').createServer({ + key: fs.readFileSync(wo.Config.sslKey), + cert: fs.readFileSync(wo.Config.sslCert), + // ca: [ fs.readFileSync(wo.Config.sslCA) ] // only for self-signed certificate: https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener + }, server).listen(portHttps, function (err) { + if (err) console.log(err) + else console.log(`Server listening on [${wo.Config.protocol}] https://${wo.Config.host}:${portHttps} for ${server.settings.env} environment`) + }) + } } else if ('http2https' === wo.Config.protocol) { wo.Config.port = wo.Config.port || 80 - require('http').createServer(express().all('*', function (ask, reply) { /* 错误的API调用进入这里。*/ + webServer = require('http').createServer(server.all('*', function(ask, reply) { /* 错误的API调用进入这里。*/ reply.redirect(`https://${wo.Config.host}`) - })).listen(wo.Config.port, function (err) { + })).listen(wo.Config.port, function(err) { if (err) console.log(err) else console.log(`Server listening on ${wo.Config.protocol}://${wo.Config.host}:${wo.Config.port} for ${server.settings.env} environment`) })