Merge branch 'master' into feat/add-br+sztd-with-priority-opts

Author: bricss

lib/request.js

@@ -630,7 +630,7 @@ internals.Info = class {
         this.received = received;
         this.referrer = req.headers.referrer || req.headers.referer || '';
         this.host = host;
-        this.hostname = host.split(':')[0];
+        this.hostname = /^(.*?)(?::\d+)?$/.exec(host)[1];
         this.id = `${received}:${request._core.info.id}:${request._core._counter()}`;
 
         this._remoteAddress = null;

lib/types/request.d.ts

@@ -89,6 +89,8 @@ export interface RequestAuth<
      * set to false.
      */
     isAuthorized: boolean;
+    /** true if the request has been authenticated via the `server.inject()` `auth` option, otherwise `undefined`. */
+    isInjected?: boolean | undefined;
     /** the route authentication mode. */
     mode: AuthMode;
     /** the name of the strategy used. */
@@ -250,7 +252,7 @@ export interface RequestLog {
 }
 
 export interface RequestQuery {
-    [key: string]: any;
+    [key: string]: string | string[] | undefined;
 }
 
 /**
@@ -269,9 +271,9 @@ export interface InternalRequestDefaults {
 
     Payload: stream.Readable | Buffer | string | object;
     Query: RequestQuery;
-    Params: Record<string, any>;
+    Params: Record<string, string>;
     Pres: Record<string, any>;
-    Headers: Record<string, any>;
+    Headers: Record<string, string | string[] | undefined>;
     RequestApp: RequestApplicationState;
 
     AuthUser: UserCredentials;
@@ -303,11 +305,7 @@ export type ReqRef = Partial<Record<keyof ReqRefDefaults, unknown>>;
 /**
  * Utilities for merging request refs and other things
  */
-export type MergeType<T, U> = {
-    [K in keyof T]: K extends keyof U
-        ? U[K]
-        : T[K];
-};
+export type MergeType<T, U> = Omit<T, keyof U> & U;
 
 export type MergeRefs<T extends ReqRef> = MergeType<ReqRefDefaults, T>;
 
@@ -441,7 +439,7 @@ export interface Request<Refs extends ReqRef = ReqRefDefaults> extends Podium {
     /**
      * Same as pre but represented as the response object created by the pre method.
      */
-    readonly preResponses: Record<string, any>;
+    readonly preResponses: Record<string, unknown>;
 
     /**
      * By default the object outputted from node's URL parse() method.
@@ -474,7 +472,7 @@ export interface Request<Refs extends ReqRef = ReqRefDefaults> extends Podium {
     /**
      * An object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition.
      */
-    readonly state: Record<string, any>;
+    readonly state: Record<string, unknown>;
 
     /**
      * The parsed request URI.

lib/types/route.d.ts

@@ -358,7 +358,7 @@ export interface RouteOptionsPreObject<Refs extends ReqRef = ReqRefDefaults> {
     /**
      * key name used to assign the response of the method to in request.pre and request.preResponses.
      */
-    assign?: keyof Refs['Pres'] | undefined;
+    assign?: keyof MergeRefs<Refs>['Pres'] | undefined;
     /**
      * A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
      */
@@ -978,5 +978,5 @@ export interface ServerRoute<Refs extends ReqRef = ReqRefDefaults> {
     /**
      * route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
      */
-    rules?: Refs['Rules'] | undefined;
+    rules?: MergeRefs<Refs>['Rules'] | undefined;
 }

package.json

@@ -2,7 +2,7 @@
   "name": "@hapi/hapi",
   "description": "HTTP Server framework",
   "homepage": "https://hapi.dev",
-  "version": "21.4.4",
+  "version": "21.4.6",
   "repository": "git://github.com/hapijs/hapi",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

test/request.js

@@ -123,6 +123,36 @@ describe('Request.Generator', () => {
 
 describe('Request', () => {
 
+    it('sets host and hostname', async () => {
+
+        const server = Hapi.server();
+
+        const handler = (request) => {
+
+            return [request.info.host, request.info.hostname].join('|');
+        };
+
+        server.route({ method: 'GET', path: '/', handler });
+
+        const res1 = await server.inject({ url: '/', headers: { host: 'host' } });
+        expect(res1.payload).to.equal('host|host');
+
+        const res2 = await server.inject({ url: '/', headers: { host: 'host:123' } });
+        expect(res2.payload).to.equal('host:123|host');
+
+        const res3 = await server.inject({ url: '/', headers: { host: '127.0.0.1' } });
+        expect(res3.payload).to.equal('127.0.0.1|127.0.0.1');
+
+        const res4 = await server.inject({ url: '/', headers: { host: '127.0.0.1:123' } });
+        expect(res4.payload).to.equal('127.0.0.1:123|127.0.0.1');
+
+        const res5 = await server.inject({ url: '/', headers: { host: '[::1]' } });
+        expect(res5.payload).to.equal('[::1]|[::1]');
+
+        const res6 = await server.inject({ url: '/', headers: { host: '[::1]:123' } });
+        expect(res6.payload).to.equal('[::1]:123|[::1]');
+    });
+
     it('sets client address (default)', async (flags) => {
 
         const server = Hapi.server();