Fix handling of no remoteAddress available (#4396)

joshkel · devinivy · DJMcK · web-flow · commit a0efdc471040 · 2022-11-30T21:24:12.000-05:00
* Fix handling of no remoteAddress available Fixes #4395 * Tidy tests Co-authored-by: David McKeown <DJMcK@users.noreply.github.com> * Lint Co-authored-by: devin ivy <devinivy@gmail.com> Co-authored-by: David McKeown <DJMcK@users.noreply.github.com>
diff --git a/lib/request.js b/lib/request.js
@@ -658,7 +658,7 @@ internals.Info = class {
         if (!this._remoteAddress) {
             const ipv6Prefix = '::ffff:';
             const socketAddress = this._request.raw.req.socket.remoteAddress;
-            if (socketAddress.startsWith(ipv6Prefix) && socketAddress.includes('.', ipv6Prefix.length)) {
+            if (socketAddress && socketAddress.startsWith(ipv6Prefix) && socketAddress.includes('.', ipv6Prefix.length)) {
                 // Normalize IPv4-mapped IPv6 address, e.g. ::ffff:127.0.0.1 -> 127.0.0.1
                 this._remoteAddress = socketAddress.slice(ipv6Prefix.length);
             }
diff --git a/test/request.js b/test/request.js
@@ -222,6 +222,43 @@ describe('Request', () => {
         expect(payload.toString()).to.equal('100.100.100.100');
     });
 
+    it('sets client address to nothing when not available', async (flags) => {
+
+        const server = Hapi.server();
+        const abortedReqTeam = new Teamwork.Team();
+        let remoteAddr = 'not executed';
+
+        server.route({
+            method: 'GET',
+            path: '/',
+            options: {
+                handler: async (request, h) => {
+
+                    req.destroy();
+
+                    while (request.active()) {
+                        await Hoek.wait(5);
+                    }
+
+                    abortedReqTeam.attend();
+
+                    remoteAddr = request.info.remoteAddress;
+                    return null;
+                }
+            }
+        });
+
+        await server.start();
+        flags.onCleanup = () => server.stop();
+
+        const req = Http.get(server.info.uri, Hoek.ignore);
+        req.on('error', Hoek.ignore);
+
+        await abortedReqTeam.work;
+
+        expect(remoteAddr).to.equal(undefined);
+    });
+
     it('sets port to nothing when not available', async () => {
 
         const server = Hapi.server({ debug: false });

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ internals.Info = class {`
`658`	`658`	`if (!this._remoteAddress) {`
`659`	`659`	`const ipv6Prefix = '::ffff:';`
`660`	`660`	`const socketAddress = this._request.raw.req.socket.remoteAddress;`
`661`		`- if (socketAddress.startsWith(ipv6Prefix) && socketAddress.includes('.', ipv6Prefix.length)) {`
	`661`	`+ if (socketAddress && socketAddress.startsWith(ipv6Prefix) && socketAddress.includes('.', ipv6Prefix.length)) {`
`662`	`662`	`// Normalize IPv4-mapped IPv6 address, e.g. ::ffff:127.0.0.1 -> 127.0.0.1`
`663`	`663`	`this._remoteAddress = socketAddress.slice(ipv6Prefix.length);`
`664`	`664`	`}`