Skip to content

Make "legacy" Kibana server aware of connection protocol. #20756

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

Merged
azasypkin merged 2 commits into from
Jul 13, 2018
Merged

Make "legacy" Kibana server aware of connection protocol. #20756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9509670
Make "legacy" Kibana server aware of connection protocol.
azasypkin Jul 13, 2018
99f12e8
Clarify that `tls` property is an exception.
azasypkin Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/server/http/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,17 @@ export default async function (kbnServer, server, config) {

// Note that all connection options configured here should be exactly the same
// as in `getServerOptions()` in the new platform (see `src/core/server/http/http_tools`).
//
// The only exception is `tls` property: TLS is entirely handled by the new
// platform and we don't have to duplicate all TLS related settings here, we just need
// to indicate to Hapi connection that TLS is used so that it can use correct protocol
// name in `server.info` and `request.connection.info` that are used throughout Kibana.
//
// Any change SHOULD BE applied in both places.
server.connection({
host: config.get('server.host'),
port: config.get('server.port'),
tls: config.get('server.ssl.enabled'),
Copy link
Copy Markdown
Contributor

@epixa epixa Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment above says that these values are the same as the new platform configuration, but that's not the case with this tls config. Here tls is a boolean, but in the new platform it's an object with properties. Can you either make them the same or update the comment so this doesn't look like a bug in the future?

Copy link
Copy Markdown
Contributor Author

@azasypkin azasypkin Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, sure, I'll update comment

listener: kbnServer.newPlatform.proxyListener,
state: {
strictHeader: false,
Expand Down