diff --git a/test/serverConfig.js b/test/serverConfig.js index e88daa58e9785..ea3438e728bb2 100644 --- a/test/serverConfig.js +++ b/test/serverConfig.js @@ -1,3 +1,5 @@ +var shield = require('./shield'); + var kibanaURL = '/app/kibana'; module.exports = { @@ -11,13 +13,13 @@ module.exports = { protocol: process.env.TEST_UI_KIBANA_PROTOCOL || 'http', hostname: process.env.TEST_UI_KIBANA_HOSTNAME || 'localhost', port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620, - auth: 'user:notsecure' + auth: shield.kibanaUser.username + ':' + shield.kibanaUser.password }, elasticsearch: { protocol: process.env.TEST_UI_ES_PROTOCOL || 'http', hostname: process.env.TEST_UI_ES_HOSTNAME || 'localhost', port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220, - auth: 'admin:notsecure' + auth: shield.admin.username + ':' + shield.admin.password } }, apps: { diff --git a/test/shield.js b/test/shield.js new file mode 100644 index 0000000000000..826945be5a22a --- /dev/null +++ b/test/shield.js @@ -0,0 +1,16 @@ +const env = process.env; + +exports.kibanaUser = { + username: env.SHIELD_KIBANA_USER || 'user', + password: env.SHIELD_KIBANA_USER_PASS || 'notsecure' +}; + +exports.kibanaServer = { + username: env.SHIELD_KIBANA_SERVER || 'kibana', + password: env.SHIELD_KIBANA_SERVER_PASS || 'notsecure' +}; + +exports.admin = { + username: env.SHIELD_ADMIN || 'admin', + password: env.SHIELD_ADMIN_PASS || 'notsecure' +}; diff --git a/test/utils/kbn_server.js b/test/utils/kbn_server.js index d97d586e7a79e..35a0bc3aa1c59 100644 --- a/test/utils/kbn_server.js +++ b/test/utils/kbn_server.js @@ -1,6 +1,7 @@ import { defaultsDeep, set } from 'lodash'; import requirefrom from 'requirefrom'; import { header as basicAuthHeader } from './base_auth'; +import { kibanaUser, kibanaServer } from '../shield'; const src = requirefrom('src'); const KbnServer = src('server/KbnServer'); @@ -26,8 +27,8 @@ const SERVER_DEFAULTS = { }, elasticsearch: { url: 'http://localhost:9210', - username: 'kibana', - password: 'notsecure' + username: kibanaServer.username, + password: kibanaServer.password } }; @@ -46,7 +47,8 @@ export function createServer(params = {}) { * Creates request configuration with a basic auth header */ export function authOptions() { - const authHeader = basicAuthHeader('user', 'notsecure'); + const { username, password } = kibanaUser; + const authHeader = basicAuthHeader(username, password); return set({}, 'headers.Authorization', authHeader); };