Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Connect to Elasticsearch via SSL when starting kibana with --ssl #42840

Merged
merged 8 commits into from Aug 8, 2019
Merged

Connect to Elasticsearch via SSL when starting kibana with --ssl #42840

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0328cb
Initial work
mikecote Aug 7, 2019
0cd5741
Add check for elasticsearch.hosts
mikecote Aug 7, 2019
bb69162
Make --ssl apply default config values only
mikecote Aug 8, 2019
d1f98d4
Move @kbn/dev-utils to devDependencies
mikecote Aug 8, 2019
5526d38
Check elasticsearch url for localhost
mikecote Aug 8, 2019
26efc20
Cleanup
mikecote Aug 8, 2019
507007e
elasticsearch.hosts can be string too
mikecote Aug 8, 2019
eceb4c5
Merge branch 'master' of github.com:elastic/kibana into startup-with-ssl
mikecote Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -267,6 +267,7 @@
"@elastic/eslint-config-kibana": "0.15.0",
"@elastic/github-checks-reporter": "0.0.20b3",
"@elastic/makelogs": "^4.4.0",
"@kbn/dev-utils": "1.0.0",
"@kbn/es": "1.0.0",
"@kbn/eslint-import-resolver-kibana": "2.0.0",
"@kbn/eslint-plugin-eslint": "1.0.0",
Expand Down
29 changes: 26 additions & 3 deletions src/cli/serve/serve.js
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
import _ from 'lodash';
import { statSync } from 'fs';
import { resolve } from 'path';
import url from 'url';

import { fromRoot, IS_KIBANA_DISTRIBUTABLE } from '../../legacy/utils';
import { getConfig } from '../../legacy/server/path';
Expand Down Expand Up @@ -87,12 +88,34 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
}

if (opts.ssl) {
set('server.ssl.enabled', true);
}
// @kbn/dev-utils is part of devDependencies
const { CA_CERT_PATH } = require('@kbn/dev-utils');
const customElasticsearchHosts = opts.elasticsearch
? opts.elasticsearch.split(',')
: get('elasticsearch.hosts');

function ensureNotDefined(path) {
if (has(path)) {
throw new Error(`Can't use --ssl when "${path}" configuration is already defined.`);
}
}
ensureNotDefined('server.ssl.certificate');
ensureNotDefined('server.ssl.key');
ensureNotDefined('elasticsearch.ssl.certificateAuthorities');

const elasticsearchHosts = (customElasticsearchHosts || ['https://localhost:9200']).map(hostUrl => {
const parsedUrl = url.parse(hostUrl);
if (parsedUrl.hostname !== 'localhost') {
throw new Error(`Hostname "${parsedUrl.hostname}" can't be used with --ssl. Must be "localhost" to work with certificates.`);
}
return `https://localhost:${parsedUrl.port}`;
});

if (opts.ssl && !has('server.ssl.certificate') && !has('server.ssl.key')) {
set('server.ssl.enabled', true);
set('server.ssl.certificate', DEV_SSL_CERT_PATH);
set('server.ssl.key', DEV_SSL_KEY_PATH);
set('elasticsearch.hosts', elasticsearchHosts);
set('elasticsearch.ssl.certificateAuthorities', CA_CERT_PATH);
}
}

Expand Down