hiro/apollo-server
1
0
Fork 0
mirror of https://github.com/vale981/apollo-server synced 2025-03-06 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't expect request.url to be a well-formed URL

Browse source
This commit is contained in:
Martijn Walraven 2018-06-28 18:29:26 +02:00
parent 49015f9bf7
commit 43c36c4d60
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/apollo-engine-reporting/src/extension.ts
View file

@ -67,14 +67,27 @@ export class EngineReportingExtension<TContext = any>
this.queryString = o.queryString;
this.documentAST = o.parsedQuery;
const u = new URL(o.request.url);
let host: string | null;
let path: string;
// On Node's HTTP module, message.url only includes the path
// (see https://nodejs.org/api/http.html#http_message_url)
// The same is true on Lambda (where we pass event.path)
// That isn't a URL and parsing will fail, so we just set the path directly.
if (o.request.url.startsWith('/')) {
host = null;
path = o.request.url;
} else {
const url = new URL(o.request.url);
host = url.hostname;
path = url.pathname;
}
this.trace.http = new Trace.HTTP({
method:
Trace.HTTP.Method[o.request.method as keyof typeof Trace.HTTP.Method] ||
Trace.HTTP.Method.UNKNOWN,
host: u.hostname, // XXX Includes port; is this right?
path: u.pathname,
host,
path,
});
if (this.options.privateHeaders !== true) {
for (const [key, value] of o.request.headers) {