Skip to content

Commit

Permalink
[console] If using an https agent, set rejectUnauthorized in the agent (
Browse files Browse the repository at this point in the history
#11700)

* [console] If using an https agent, set rejectUnauthorized in the agent

* [console] Update tests to expect rejectUnauthorized in agent config

* [console] Check for null and undefined when setting rejectUnauthorized
  • Loading branch information
jbudz authored May 11, 2017
1 parent 45ea866 commit 563157c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/core_plugins/console/server/__tests__/proxy_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ describe('ProxyConfig', function () {
ca: [{ path: 'path/to/ca' }],
cert: undefined,
key: undefined,
rejectUnauthorized: true
});
});

Expand All @@ -68,6 +69,7 @@ describe('ProxyConfig', function () {
ca: undefined,
cert: { path: 'path/to/cert' },
key: { path: 'path/to/key' },
rejectUnauthorized: true
});
});

Expand All @@ -76,7 +78,8 @@ describe('ProxyConfig', function () {
ssl: {
ca: ['path/to/ca'],
cert: 'path/to/cert',
key: 'path/to/key'
key: 'path/to/key',
rejectUnauthorized: true
}
});

Expand All @@ -87,6 +90,7 @@ describe('ProxyConfig', function () {
ca: [{ path: 'path/to/ca' }],
cert: { path: 'path/to/cert' },
key: { path: 'path/to/key' },
rejectUnauthorized: true
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe('ProxyConfigCollection', function () {

it('verifies for config that produces ssl agent', function () {
const conf = makeCollection().configForUri('https://es.internal.org/_search');
expect(conf).to.have.property('rejectUnauthorized', true);
expect(conf.agent.options).to.have.property('rejectUnauthorized', true);
expect(conf.agent).to.be.an(HttpsAgent);
});

Expand Down
3 changes: 2 additions & 1 deletion src/core_plugins/console/server/proxy_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export class ProxyConfig {
};

if (values(sslAgentOpts).filter(Boolean).length) {
sslAgentOpts.rejectUnauthorized = this.verifySsl == null ? true : this.verifySsl;
return new HttpsAgent(sslAgentOpts);
}
}
Expand All @@ -58,7 +59,7 @@ export class ProxyConfig {
if (!match) return {};
return {
timeout: this.timeout,
rejectUnauthorized: this.sslAgent ? true : this.verifySsl,
rejectUnauthorized: this.sslAgent ? undefined : this.verifySsl,
agent: protocol === 'https:' ? this.sslAgent : undefined
};
}
Expand Down

0 comments on commit 563157c

Please sign in to comment.