Merge branch 'master' of https://github.com/zf-fr/zfr-eb-worker

zf-fr · Aug 30, 2017 · cf0dfb2 · cf0dfb2
2 parents 4b3efd1 + 353cad4
commit cf0dfb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Middleware/WorkerMiddleware.php b/src/Middleware/WorkerMiddleware.php
@@ -154,7 +154,7 @@ private function assertLocalhost(ServerRequestInterface $request)
         $remoteAddr   = $serverParams['REMOTE_ADDR'] ?? 'unknown IP address';
 
         // If request is not originating from localhost or from Docker local IP, we throw an RuntimeException
-        if (!in_array($remoteAddr, self::LOCALHOST_ADDRESSES) && !fnmatch('172.1*.*', $remoteAddr)) {
+        if (!in_array($remoteAddr, self::LOCALHOST_ADDRESSES) && !fnmatch('172.*', $remoteAddr)) {
             throw new RuntimeException(sprintf(
                 'Worker requests must come from localhost, request originated from %s given',
                 $remoteAddr

diff --git a/test/Middleware/WorkerMiddlewareTest.php b/test/Middleware/WorkerMiddlewareTest.php
@@ -77,6 +77,8 @@ public function provideIpAddresses(): array
             ['127.0.0.1', true],
             ['::1', true],
             ['172.17.42.1', true],
+            ['172.20.42.1', true],
+            ['172.18.42.1', true],
             ['172.17.0.1', true],
             ['189.55.56.131', false]
         ];