maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Derive the port from the protocol in cases where it's not explicitly stated (#83583)

Browse source
This commit is contained in:
Joel Griffith 2020-11-18 08:19:41 -08:00 committed by GitHub
parent 7d9f460a9c
commit e07d6d0b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts
View file

@ -333,13 +333,32 @@ export class HeadlessChromiumDriver {
private _shouldUseCustomHeaders(conditions: ConditionalHeadersConditions, url: string) {
const { hostname, protocol, port, pathname } = parseUrl(url);
if (port === null) throw new Error(`URL missing port: ${url}`);
// `port` is null in URLs that don't explicitly state it,
// however we can derive the port from the protocol (http/https)
// IE: https://feeds-staging.elastic.co/kibana/v8.0.0.json
const derivedPort = (() => {
if (port) {
return port;
}
if (protocol === 'http:') {
return '80';
}
if (protocol === 'https:') {
return '443';
}
return null;
})();
if (derivedPort === null) throw new Error(`URL missing port: ${url}`);
if (pathname === null) throw new Error(`URL missing pathname: ${url}`);
return (
hostname === conditions.hostname &&
protocol === `${conditions.protocol}:` &&
this._shouldUseCustomHeadersForPort(conditions, port) &&
this._shouldUseCustomHeadersForPort(conditions, derivedPort) &&
pathname.startsWith(`${conditions.basePath}/`)
);
}