Browse Source

add the prod-back server ip to internal allowed ips

Olivier Massot 5 months ago
parent
commit
b5c058708a

+ 12 - 3
ot_admin/Classes/Http/ApiController.php

@@ -27,8 +27,10 @@ class ApiController implements LoggerAwareInterface
     use LoggerAwareTrait;
 
     const PROD_FRONT_IP = "172.16.0.68";
+    const PROD_BACK_IP = "172.16.0.70";
     const PROD_V2_IP = "172.16.0.35";
     const PUBLIC_PRODFRONT_IP = "141.94.117.38";
+    const PUBLIC_PROD_BACK_IP = "141.94.117.40";
     const PUBLIC_PROD_V2_IP = "141.94.117.35";
 
     const array ALLOWED_IPS = [
@@ -93,11 +95,18 @@ class ApiController implements LoggerAwareInterface
         if (
             $_SERVER &&
             (
-                ($_SERVER['SERVER_ADDR'] === self::PROD_FRONT_IP && $_SERVER['REMOTE_ADDR'] !== self::PROD_V2_IP) ||
-                ($_SERVER['SERVER_ADDR'] === self::PUBLIC_PRODFRONT_IP && $_SERVER['REMOTE_ADDR'] !== self::PUBLIC_PROD_V2_IP)
+                (
+                    $_SERVER['SERVER_ADDR'] === self::PROD_FRONT_IP
+                    && $_SERVER['REMOTE_ADDR'] !== self::PROD_V2_IP
+                    && $_SERVER['REMOTE_ADDR'] !== self::PROD_BACK_IP
+                ) || (
+                    $_SERVER['SERVER_ADDR'] === self::PUBLIC_PRODFRONT_IP
+                    && $_SERVER['REMOTE_ADDR'] !== self::PUBLIC_PROD_V2_IP
+                    && $_SERVER['REMOTE_ADDR'] !== self::PUBLIC_PROD_BACK_IP
+                )
             )
         ) {
-            throw new \RuntimeException("Invalid client ip");
+            throw new \RuntimeException("Invalid client ip : " . $_SERVER['REMOTE_ADDR']);
         }
     }
 

+ 1 - 1
ot_core/Classes/Middleware/OtBackendUserAuthenticator.php

@@ -30,7 +30,7 @@ class OtBackendUserAuthenticator extends BackendUserAuthenticator
                     return false;
                 } else {
                     throw new \RuntimeException('An unauthorized IP (' . $_SERVER['REMOTE_ADDR'] . ') ' .
-                                                        'tried to run the following ot-admin command: ' . $_SERVER['QUERY_STRING']);
+                                                        'tried to run the following ot-admin command: ' . $route->getPath());
                 }
             }
         }