navy 5.0.0-rc.0 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cli/config/index.js +2 -1
- package/lib/cli/https.js +92 -0
- package/lib/cli/program.js +12 -0
- package/lib/config.js +23 -11
- package/lib/http-proxy.js +30 -5
- package/lib/middleware/{add-virtual-hosts.js → add-service-proxy-config.js} +7 -1
- package/lib/navy/default-middleware.js +2 -2
- package/lib/util/https.js +213 -0
- package/lib/util/service-host.js +24 -2
- package/package.json +3 -3
- package/LICENSE +0 -21
package/lib/cli/config/index.js
CHANGED
|
@@ -17,7 +17,8 @@ var _reconfigure = require("../util/reconfigure");
|
|
|
17
17
|
|
|
18
18
|
const NAME_MAP = {
|
|
19
19
|
'default-navy': 'defaultNavy',
|
|
20
|
-
'external-ip': 'externalIP'
|
|
20
|
+
'external-ip': 'externalIP',
|
|
21
|
+
'tlsCa-dir': 'tlsRootCaDir'
|
|
21
22
|
};
|
|
22
23
|
const configWhichNeedsReconfigure = ['externalIP'];
|
|
23
24
|
|
package/lib/cli/https.js
ADDED
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = _default;
|
|
9
|
+
|
|
10
|
+
var _chalk = _interopRequireDefault(require("chalk"));
|
|
11
|
+
|
|
12
|
+
var _errors = require("../errors");
|
|
13
|
+
|
|
14
|
+
var _navy = require("../navy");
|
|
15
|
+
|
|
16
|
+
var _config = require("../config");
|
|
17
|
+
|
|
18
|
+
var _httpProxy = require("../http-proxy");
|
|
19
|
+
|
|
20
|
+
var _https = require("../util/https");
|
|
21
|
+
|
|
22
|
+
var _fs = _interopRequireDefault(require("fs"));
|
|
23
|
+
|
|
24
|
+
async function _default(services, opts) {
|
|
25
|
+
const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
|
|
26
|
+
|
|
27
|
+
const configDir = (0, _config.getConfigDir)();
|
|
28
|
+
|
|
29
|
+
if (opts.disable) {
|
|
30
|
+
await (0, _https.removeCert)(opts);
|
|
31
|
+
await (0, _httpProxy.reconfigureHTTPProxy)({
|
|
32
|
+
restart: true
|
|
33
|
+
});
|
|
34
|
+
console.log();
|
|
35
|
+
console.log(_chalk.default.green(`✅ HTTPS for service ${opts.disable} is now disabled`));
|
|
36
|
+
console.log();
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
if (!services || services.length === 0) {
|
|
41
|
+
if (!_fs.default.existsSync(`${configDir}/tls-certs`)) return;
|
|
42
|
+
|
|
43
|
+
const files = _fs.default.readdirSync(`${configDir}/tls-certs`);
|
|
44
|
+
|
|
45
|
+
const urls = files.filter(file => file.endsWith('.crt')).map(crt => {
|
|
46
|
+
return `https://${crt.replace('.crt', '')}`;
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
for (const url of urls) {
|
|
50
|
+
console.log(`${url}`);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
if (!_fs.default.existsSync(`${tlsRootCaDir}/ca.crt`) || !_fs.default.existsSync(`${tlsRootCaDir}/ca.key`)) {
|
|
57
|
+
await (0, _https.generateRootCa)();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const navy = await (0, _navy.getNavy)(opts.navy);
|
|
61
|
+
await navy.ensurePluginsLoaded();
|
|
62
|
+
const availableServices = await navy.getAvailableServiceNames();
|
|
63
|
+
const httpsReadyServices = [];
|
|
64
|
+
|
|
65
|
+
for (const service of services) {
|
|
66
|
+
if (!availableServices.includes(service)) {
|
|
67
|
+
console.log(`❌ ${service} not found, skipping`);
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const serviceUrl = await navy.url(service);
|
|
72
|
+
|
|
73
|
+
try {
|
|
74
|
+
await (0, _https.createCert)({
|
|
75
|
+
serviceUrl
|
|
76
|
+
});
|
|
77
|
+
httpsReadyServices.push(service);
|
|
78
|
+
} catch (error) {
|
|
79
|
+
console.log(error);
|
|
80
|
+
throw new _errors.NavyError(`Could not generate TLS cert for ${service}`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
await (0, _httpProxy.reconfigureHTTPProxy)({
|
|
85
|
+
restart: true
|
|
86
|
+
});
|
|
87
|
+
console.log();
|
|
88
|
+
console.log(_chalk.default.green(`✅ Service(s) ${httpsReadyServices.join(', ')} now accessible via HTTPS🔒`));
|
|
89
|
+
console.log();
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
module.exports = exports.default;
|
package/lib/cli/program.js
CHANGED
|
@@ -176,6 +176,18 @@ _commander.default.command('use-tag <service> <tag>').option('-e, --navy [env]',
|
|
|
176
176
|
|
|
177
177
|
_commander.default.command('reset-tag <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets any tag override on the given service').action(basicCliWrapper('resetTag'));
|
|
178
178
|
|
|
179
|
+
_commander.default.command('https [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).option('-d, --disable <service>', 'disable https (deletes cert) for a given service', null).description('Prints or enables HTTPS services').action(lazyRequire('./https')).on('--help', () => console.log(`
|
|
180
|
+
Examples:
|
|
181
|
+
List urls of services that listen on https:
|
|
182
|
+
$ navy https
|
|
183
|
+
|
|
184
|
+
Enable https for mywebservice and anotherwebservice services
|
|
185
|
+
$ navy https mywebservice anotherwebservice
|
|
186
|
+
|
|
187
|
+
Disable https for mywebservice
|
|
188
|
+
$ navy https -d mywebservice
|
|
189
|
+
`));
|
|
190
|
+
|
|
179
191
|
_commander.default.command('use-port <service> <internal> <external>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Uses a specific external port for the given service and internal port').action(basicCliWrapper('usePort'));
|
|
180
192
|
|
|
181
193
|
_commander.default.command('reset-port <service> <internal>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets a specific external port mapping set by use-port').action(basicCliWrapper('resetPort'));
|
package/lib/config.js
CHANGED
|
@@ -5,32 +5,42 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
+
exports.DEFAULT_TLS_ROOT_CA_DIR = void 0;
|
|
8
9
|
exports.getConfig = getConfig;
|
|
10
|
+
exports.getConfigDir = getConfigDir;
|
|
9
11
|
exports.getConfigPath = getConfigPath;
|
|
10
12
|
exports.setConfig = setConfig;
|
|
11
13
|
|
|
12
14
|
var _path = _interopRequireDefault(require("path"));
|
|
13
15
|
|
|
14
|
-
var _bluebird = _interopRequireDefault(require("bluebird"));
|
|
15
|
-
|
|
16
16
|
var _invariant = _interopRequireDefault(require("invariant"));
|
|
17
17
|
|
|
18
|
-
var _fs =
|
|
18
|
+
var _fs = _interopRequireWildcard(require("fs"));
|
|
19
|
+
|
|
20
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
21
|
+
|
|
22
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
19
23
|
|
|
24
|
+
// $FlowIgnore
|
|
20
25
|
const DEFAULT_ENVIRONMENT_NAME = 'dev';
|
|
26
|
+
const DEFAULT_TLS_ROOT_CA_DIR = `${getConfigDir()}/tls-root-ca`;
|
|
27
|
+
exports.DEFAULT_TLS_ROOT_CA_DIR = DEFAULT_TLS_ROOT_CA_DIR;
|
|
21
28
|
const DEFAULT_CONFIG = {
|
|
22
29
|
defaultNavy: DEFAULT_ENVIRONMENT_NAME,
|
|
23
|
-
externalIP: null
|
|
30
|
+
externalIP: null,
|
|
31
|
+
tlsRootCaDir: DEFAULT_TLS_ROOT_CA_DIR
|
|
24
32
|
};
|
|
25
|
-
|
|
26
|
-
const mkdirp = _bluebird.default.promisify(require('mkdirp'));
|
|
27
|
-
|
|
28
33
|
let _config = null;
|
|
29
34
|
|
|
30
|
-
function
|
|
35
|
+
function getConfigDir() {
|
|
31
36
|
const home = process.env.HOME;
|
|
32
37
|
(0, _invariant.default)(home, "NO_HOME_DIRECTORY: No home directory available");
|
|
33
|
-
return _path.default.join(home, '.navy'
|
|
38
|
+
return _path.default.join(home, '.navy');
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function getConfigPath() {
|
|
42
|
+
const configDir = getConfigDir();
|
|
43
|
+
return _path.default.join(configDir, 'config.json');
|
|
34
44
|
}
|
|
35
45
|
|
|
36
46
|
function getConfig() {
|
|
@@ -50,8 +60,10 @@ function getConfig() {
|
|
|
50
60
|
|
|
51
61
|
async function setConfig(config) {
|
|
52
62
|
if (config == null) config = DEFAULT_CONFIG;
|
|
53
|
-
await
|
|
54
|
-
|
|
63
|
+
await _fs.promises.mkdir(_path.default.dirname(getConfigPath()), {
|
|
64
|
+
recursive: true
|
|
65
|
+
});
|
|
66
|
+
await _fs.promises.writeFile(getConfigPath(), JSON.stringify(config, null, 2)); // trash cached config
|
|
55
67
|
|
|
56
68
|
_config = null;
|
|
57
69
|
}
|
package/lib/http-proxy.js
CHANGED
|
@@ -15,7 +15,9 @@ var _jsYaml = _interopRequireDefault(require("js-yaml"));
|
|
|
15
15
|
|
|
16
16
|
var _dockerClient = _interopRequireDefault(require("./util/docker-client"));
|
|
17
17
|
|
|
18
|
-
var _fs = _interopRequireDefault(require("
|
|
18
|
+
var _fs = _interopRequireDefault(require("fs"));
|
|
19
|
+
|
|
20
|
+
var _https = require("./util/https");
|
|
19
21
|
|
|
20
22
|
var _execAsync = require("./util/exec-async");
|
|
21
23
|
|
|
@@ -38,25 +40,48 @@ async function updateComposeConfig(navies) {
|
|
|
38
40
|
networks.forEach(net => networksConfig[net.Name] = {
|
|
39
41
|
external: true
|
|
40
42
|
});
|
|
43
|
+
const ports = ['80:80'];
|
|
44
|
+
const volumes = ['/var/run/docker.sock:/tmp/docker.sock:ro']; // Enable HTTPS for services that
|
|
45
|
+
// match crt file names in tlsRootCaDir
|
|
46
|
+
|
|
47
|
+
const certsPath = await (0, _https.getCertsPath)(true);
|
|
48
|
+
|
|
49
|
+
if (certsPath) {
|
|
50
|
+
ports.push('443:443');
|
|
51
|
+
volumes.push(`${certsPath}:/etc/nginx/certs`);
|
|
52
|
+
volumes.push(`${certsPath}:/etc/nginx/dhparam`); // to persist DH params
|
|
53
|
+
}
|
|
54
|
+
|
|
41
55
|
const config = {
|
|
42
56
|
version: '2',
|
|
43
57
|
services: {
|
|
44
58
|
'nginx-proxy': {
|
|
45
59
|
image: 'navycloud/navy-proxy',
|
|
46
|
-
ports
|
|
60
|
+
ports,
|
|
47
61
|
networks: networks.map(net => net.Name),
|
|
48
|
-
volumes
|
|
62
|
+
volumes,
|
|
49
63
|
restart: 'always'
|
|
50
64
|
}
|
|
51
65
|
},
|
|
52
66
|
networks: networksConfig
|
|
53
67
|
};
|
|
54
|
-
|
|
68
|
+
|
|
69
|
+
_fs.default.writeFileSync(_path.default.join(_os.default.tmpdir(), 'navyinternaldockercompose.yml'), _jsYaml.default.dump(config));
|
|
55
70
|
}
|
|
56
71
|
|
|
57
72
|
async function reconfigureHTTPProxy(opts = {}) {
|
|
73
|
+
const navyInternalYamlFile = _path.default.join(_os.default.tmpdir(), 'navyinternaldockercompose.yml');
|
|
74
|
+
|
|
75
|
+
if (opts.restart) {
|
|
76
|
+
// proxy needs to be recreated to detect changes (deletes) in /etc/nginx/certs
|
|
77
|
+
if (_fs.default.existsSync(navyInternalYamlFile)) {
|
|
78
|
+
(0, _driverLogging.log)('Restarting HTTP proxy...');
|
|
79
|
+
await (0, _execAsync.execAsync)('docker-compose', ['-f', navyInternalYamlFile, '-p', 'navyinternal', 'rm', '-s', '-f', 'nginx-proxy']);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
58
83
|
if (!opts.navies) opts.navies = await (0, _navy.getLaunchedNavyNames)();
|
|
59
84
|
await updateComposeConfig(opts.navies);
|
|
60
85
|
(0, _driverLogging.log)('Configuring HTTP proxy...');
|
|
61
|
-
await (0, _execAsync.execAsync)('docker-compose', ['-f',
|
|
86
|
+
await (0, _execAsync.execAsync)('docker-compose', ['-f', navyInternalYamlFile, '-p', 'navyinternal', 'up', '-d']);
|
|
62
87
|
}
|
|
@@ -9,6 +9,8 @@ var _lodash = require("lodash");
|
|
|
9
9
|
|
|
10
10
|
var _serviceHost = require("../util/service-host");
|
|
11
11
|
|
|
12
|
+
var _https = require("../util/https");
|
|
13
|
+
|
|
12
14
|
const getServiceHTTPProxyConfig = (serviceName, navyFile) => {
|
|
13
15
|
if (navyFile && navyFile.httpProxy && navyFile.httpProxy[serviceName]) {
|
|
14
16
|
return navyFile.httpProxy[serviceName];
|
|
@@ -50,9 +52,13 @@ var _default = navy => async (config, state) => {
|
|
|
50
52
|
}
|
|
51
53
|
|
|
52
54
|
if (proxyConfig) {
|
|
55
|
+
const hostName = await (0, _serviceHost.createHostForService)(serviceName, navy.normalisedName, externalIP);
|
|
56
|
+
if (proxyConfig.enableHttps) await (0, _https.createCert)({
|
|
57
|
+
hostName
|
|
58
|
+
});
|
|
53
59
|
return services[serviceName] = { ...service,
|
|
54
60
|
environment: {
|
|
55
|
-
'VIRTUAL_HOST':
|
|
61
|
+
'VIRTUAL_HOST': hostName,
|
|
56
62
|
'VIRTUAL_PORT': proxyConfig.port,
|
|
57
63
|
...service.environment
|
|
58
64
|
}
|
|
@@ -13,7 +13,7 @@ var _tagOverride = _interopRequireDefault(require("../middleware/tag-override"))
|
|
|
13
13
|
|
|
14
14
|
var _portOverride = _interopRequireDefault(require("../middleware/port-override"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _addServiceProxyConfig = _interopRequireDefault(require("../middleware/add-service-proxy-config"));
|
|
17
17
|
|
|
18
18
|
var _setEnvVars = _interopRequireDefault(require("../middleware/set-env-vars"));
|
|
19
19
|
|
|
@@ -21,7 +21,7 @@ var _setLoggingDriver = _interopRequireDefault(require("../middleware/set-loggin
|
|
|
21
21
|
|
|
22
22
|
var _setImage = _interopRequireDefault(require("../middleware/set-image"));
|
|
23
23
|
|
|
24
|
-
var _default = navy => [_develop.default, _tagOverride.default, _portOverride.default, _setEnvVars.default, _setLoggingDriver.default, _setImage.default, (0,
|
|
24
|
+
var _default = navy => [_develop.default, _tagOverride.default, _portOverride.default, _setEnvVars.default, _setLoggingDriver.default, _setImage.default, (0, _addServiceProxyConfig.default)(navy)];
|
|
25
25
|
|
|
26
26
|
exports.default = _default;
|
|
27
27
|
module.exports = exports.default;
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.createCert = createCert;
|
|
9
|
+
exports.generateRootCa = generateRootCa;
|
|
10
|
+
exports.getCertsPath = getCertsPath;
|
|
11
|
+
exports.removeCert = removeCert;
|
|
12
|
+
|
|
13
|
+
var _path = _interopRequireDefault(require("path"));
|
|
14
|
+
|
|
15
|
+
var _config = require("../config");
|
|
16
|
+
|
|
17
|
+
var _errors = require("../errors");
|
|
18
|
+
|
|
19
|
+
var _chalk = _interopRequireDefault(require("chalk"));
|
|
20
|
+
|
|
21
|
+
var _fs = _interopRequireDefault(require("fs"));
|
|
22
|
+
|
|
23
|
+
var _nodeForge = require("node-forge");
|
|
24
|
+
|
|
25
|
+
var _navy = require("../navy");
|
|
26
|
+
|
|
27
|
+
const debug = require('debug')('navy:https');
|
|
28
|
+
|
|
29
|
+
function getCertsPath(create = false) {
|
|
30
|
+
const certsPath = _path.default.join((0, _config.getConfigDir)(), 'tls-certs');
|
|
31
|
+
|
|
32
|
+
if (!_fs.default.existsSync(certsPath)) {
|
|
33
|
+
if (create) {
|
|
34
|
+
debug(`Create ${certsPath} dir`); // $FlowIgnore
|
|
35
|
+
|
|
36
|
+
_fs.default.mkdirSync(certsPath, {
|
|
37
|
+
recursive: true
|
|
38
|
+
});
|
|
39
|
+
} else {
|
|
40
|
+
return '';
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return certsPath;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
async function removeCert(opts) {
|
|
48
|
+
const certsPath = getCertsPath();
|
|
49
|
+
const navy = await (0, _navy.getNavy)(opts.navy);
|
|
50
|
+
const serviceUrl = await navy.url(opts.disable);
|
|
51
|
+
const baseName = serviceUrl.split('//')[1];
|
|
52
|
+
const extensions = ['crt', 'key'];
|
|
53
|
+
|
|
54
|
+
for (const ext of extensions) {
|
|
55
|
+
const file = `${certsPath}/${baseName}.${ext}`;
|
|
56
|
+
|
|
57
|
+
if (_fs.default.existsSync(file)) {
|
|
58
|
+
try {
|
|
59
|
+
await _fs.default.unlinkSync(file);
|
|
60
|
+
debug(`File ${file} removed.`);
|
|
61
|
+
} catch (err) {
|
|
62
|
+
throw new _errors.NavyError(err);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
async function generateRootCa() {
|
|
69
|
+
const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
|
|
70
|
+
|
|
71
|
+
if (!_fs.default.existsSync(tlsRootCaDir)) {
|
|
72
|
+
debug(`Creating ${tlsRootCaDir} Root CA dir`);
|
|
73
|
+
|
|
74
|
+
try {
|
|
75
|
+
// $FlowIgnore
|
|
76
|
+
_fs.default.mkdirSync(tlsRootCaDir, {
|
|
77
|
+
recursive: true
|
|
78
|
+
});
|
|
79
|
+
} catch (err) {
|
|
80
|
+
throw new _errors.NavyError(err);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
if (_fs.default.existsSync(`${tlsRootCaDir}/ca.crt`) && _fs.default.existsSync(`${tlsRootCaDir}/ca.key`)) {
|
|
85
|
+
debug(`Root CA already exists, skipping generation`);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
debug('Generating Root CA');
|
|
90
|
+
debug('Generating 2048-bit key-pair...');
|
|
91
|
+
|
|
92
|
+
const keys = _nodeForge.pki.rsa.generateKeyPair(2048);
|
|
93
|
+
|
|
94
|
+
debug('Creating self-signed certificate...');
|
|
95
|
+
|
|
96
|
+
const cert = _nodeForge.pki.createCertificate();
|
|
97
|
+
|
|
98
|
+
cert.publicKey = keys.publicKey;
|
|
99
|
+
cert.serialNumber = '01';
|
|
100
|
+
cert.validity.notBefore = new Date();
|
|
101
|
+
cert.validity.notAfter = new Date();
|
|
102
|
+
cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 5);
|
|
103
|
+
const attrs = [{
|
|
104
|
+
name: 'commonName',
|
|
105
|
+
value: 'navy-dev-ca.local'
|
|
106
|
+
}, {
|
|
107
|
+
name: 'organizationName',
|
|
108
|
+
value: 'navy-dev'
|
|
109
|
+
}];
|
|
110
|
+
cert.setSubject(attrs);
|
|
111
|
+
cert.setIssuer(attrs);
|
|
112
|
+
cert.setExtensions([{
|
|
113
|
+
name: 'basicConstraints',
|
|
114
|
+
cA: true
|
|
115
|
+
}, {
|
|
116
|
+
name: 'subjectKeyIdentifier'
|
|
117
|
+
}, {
|
|
118
|
+
name: 'authorityKeyIdentifier'
|
|
119
|
+
}]);
|
|
120
|
+
|
|
121
|
+
try {
|
|
122
|
+
// self-sign certificate
|
|
123
|
+
cert.sign(keys.privateKey, _nodeForge.md.sha256.create()); // PEM-format keys and cert
|
|
124
|
+
|
|
125
|
+
const pem = {
|
|
126
|
+
privateKey: _nodeForge.pki.privateKeyToPem(keys.privateKey),
|
|
127
|
+
publicKey: _nodeForge.pki.publicKeyToPem(keys.publicKey),
|
|
128
|
+
certificate: _nodeForge.pki.certificateToPem(cert)
|
|
129
|
+
};
|
|
130
|
+
|
|
131
|
+
_fs.default.writeFileSync(tlsRootCaDir + '/ca.key', pem.privateKey, {
|
|
132
|
+
mode: 0o400
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
_fs.default.writeFileSync(tlsRootCaDir + '/ca.pub.key', pem.publicKey, {
|
|
136
|
+
mode: 0o640
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
_fs.default.writeFileSync(tlsRootCaDir + '/ca.crt', pem.certificate, {
|
|
140
|
+
mode: 0o640
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
console.log(_chalk.default.green(`✅ CA Certificate created at ${tlsRootCaDir}/ca.crt`));
|
|
144
|
+
console.log(_chalk.default.yellow(`⚠️ Importing a self-signed CA into a browser/truststore/keychain is not advisable ⚠️`));
|
|
145
|
+
} catch (e) {
|
|
146
|
+
throw new _errors.NavyError(e);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
async function createCert(opts) {
|
|
151
|
+
const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
|
|
152
|
+
|
|
153
|
+
const certName = opts.hostName || opts.serviceUrl.split('//')[1];
|
|
154
|
+
const certsPath = getCertsPath(true);
|
|
155
|
+
|
|
156
|
+
if (_fs.default.existsSync(`${certsPath}/${certName}.crt`)) {
|
|
157
|
+
debug(`Certificate for ${certName} already exists, skipping generation`);
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
await generateRootCa();
|
|
162
|
+
|
|
163
|
+
const caCertString = _fs.default.readFileSync(`${tlsRootCaDir}/ca.crt`, 'utf8');
|
|
164
|
+
|
|
165
|
+
const caKeyString = _fs.default.readFileSync(`${tlsRootCaDir}/ca.key`, 'utf8');
|
|
166
|
+
|
|
167
|
+
debug(`Generating cert for ${certName} in ${certsPath}`);
|
|
168
|
+
|
|
169
|
+
const privateCAKey = _nodeForge.pki.privateKeyFromPem(caKeyString);
|
|
170
|
+
|
|
171
|
+
const keys = _nodeForge.pki.rsa.generateKeyPair(2048);
|
|
172
|
+
|
|
173
|
+
const cert = _nodeForge.pki.createCertificate();
|
|
174
|
+
|
|
175
|
+
const caCert = _nodeForge.pki.certificateFromPem(caCertString);
|
|
176
|
+
|
|
177
|
+
cert.publicKey = keys.publicKey;
|
|
178
|
+
cert.serialNumber = Math.floor(Math.random() * (99 - 2) + 2).toString();
|
|
179
|
+
cert.validity.notBefore = new Date();
|
|
180
|
+
cert.validity.notBefore.setDate(cert.validity.notBefore.getDate() - 1);
|
|
181
|
+
cert.validity.notAfter = new Date();
|
|
182
|
+
cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 2);
|
|
183
|
+
const attrs = [{
|
|
184
|
+
name: 'commonName',
|
|
185
|
+
value: certName
|
|
186
|
+
}, {
|
|
187
|
+
name: 'organizationName',
|
|
188
|
+
value: 'navy-dev'
|
|
189
|
+
}];
|
|
190
|
+
|
|
191
|
+
try {
|
|
192
|
+
cert.setSubject(attrs);
|
|
193
|
+
cert.setIssuer(caCert.subject.attributes);
|
|
194
|
+
cert.setExtensions([{
|
|
195
|
+
name: 'extKeyUsage',
|
|
196
|
+
serverAuth: true
|
|
197
|
+
}]);
|
|
198
|
+
cert.sign(privateCAKey, _nodeForge.md.sha256.create()); // PEM-format keys and cert
|
|
199
|
+
|
|
200
|
+
const pem = {
|
|
201
|
+
privateKey: _nodeForge.pki.privateKeyToPem(keys.privateKey),
|
|
202
|
+
certificate: _nodeForge.pki.certificateToPem(cert) // publicKey: pki.publicKeyToPem(keys.publicKey),
|
|
203
|
+
|
|
204
|
+
};
|
|
205
|
+
|
|
206
|
+
_fs.default.writeFileSync(`${certsPath}/${certName}.key`, pem.privateKey);
|
|
207
|
+
|
|
208
|
+
_fs.default.writeFileSync(`${certsPath}/${certName}.crt`, pem.certificate); // fs.writeFileSync(`${certsPath}/${certName}.pub.key`, pem.publicKey)
|
|
209
|
+
|
|
210
|
+
} catch (e) {
|
|
211
|
+
throw new _errors.NavyError(e);
|
|
212
|
+
}
|
|
213
|
+
}
|
package/lib/util/service-host.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
@@ -7,6 +9,11 @@ exports.createHostForService = createHostForService;
|
|
|
7
9
|
exports.createUrlForService = createUrlForService;
|
|
8
10
|
exports.getNIPSubdomain = getNIPSubdomain;
|
|
9
11
|
exports.getUrlFromService = getUrlFromService;
|
|
12
|
+
|
|
13
|
+
var _https = require("./https");
|
|
14
|
+
|
|
15
|
+
var _fs = _interopRequireDefault(require("fs"));
|
|
16
|
+
|
|
10
17
|
const BASE = 'nip.io';
|
|
11
18
|
|
|
12
19
|
function isValidIpv4Addr(ip) {
|
|
@@ -27,7 +34,15 @@ async function createHostForService(service, navyNormalisedName, externalIP) {
|
|
|
27
34
|
}
|
|
28
35
|
|
|
29
36
|
async function createUrlForService(service, navyNormalisedName, externalIP) {
|
|
30
|
-
|
|
37
|
+
const certsPath = (0, _https.getCertsPath)();
|
|
38
|
+
let proto = 'http';
|
|
39
|
+
const baseUrl = await createHostForService(service, navyNormalisedName, externalIP);
|
|
40
|
+
|
|
41
|
+
if (_fs.default.existsSync(`${certsPath}/${baseUrl}.crt`)) {
|
|
42
|
+
proto = 'https';
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
return `${proto}://${await createHostForService(service, navyNormalisedName, externalIP)}`;
|
|
31
46
|
}
|
|
32
47
|
|
|
33
48
|
function getUrlFromService(service) {
|
|
@@ -36,10 +51,17 @@ function getUrlFromService(service) {
|
|
|
36
51
|
}
|
|
37
52
|
|
|
38
53
|
const env = service.raw.Config.Env;
|
|
54
|
+
const certsPath = (0, _https.getCertsPath)();
|
|
39
55
|
|
|
40
56
|
for (const envVar of env) {
|
|
41
57
|
if (envVar.indexOf('VIRTUAL_HOST=') === 0) {
|
|
42
|
-
|
|
58
|
+
let proto = 'http';
|
|
59
|
+
|
|
60
|
+
if (_fs.default.existsSync(`${certsPath}/${envVar.substring('VIRTUAL_HOST='.length)}.crt`)) {
|
|
61
|
+
proto = 'https';
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return proto + '://' + envVar.substring('VIRTUAL_HOST='.length);
|
|
43
65
|
}
|
|
44
66
|
}
|
|
45
67
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "navy",
|
|
3
|
-
"version": "5.0.0
|
|
3
|
+
"version": "5.0.0",
|
|
4
4
|
"description": "Quick and powerful development environments using Docker and Docker Compose",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
"js-yaml": "^3.14.1",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"mkdirp": "^0.5.5",
|
|
41
|
+
"node-forge": "^0.10.0",
|
|
41
42
|
"opn": "^5.5.0",
|
|
42
43
|
"pad": "^3.2.0",
|
|
43
44
|
"promise-retry": "^1.1.1",
|
|
@@ -45,6 +46,5 @@
|
|
|
45
46
|
"rimraf": "^2.7.1",
|
|
46
47
|
"simple-docker-registry-client": "^1.1.2",
|
|
47
48
|
"strip-ansi": "^3.0.1"
|
|
48
|
-
}
|
|
49
|
-
"gitHead": "93290babe5871ade8c29f1ae1dcc9ab202aef477"
|
|
49
|
+
}
|
|
50
50
|
}
|
package/LICENSE
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
The MIT License (MIT)
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2016 Momentum Financial Technology Ltd.
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|