Logger: allow to pass the original REMOTE_ADDR by ENV variable for CLI use #7871

Author: stissot

src/Log/EventCompleter.php

@@ -48,7 +48,7 @@ private function getEnvData(): array
         if (PHP_SAPI === 'cli') {
             global $argv;
             $request = $argv;
-            $ip = 'script';
+            $ip = !empty(getenv('REMOTE_ADDR')) ? getenv('REMOTE_ADDR') : 'script';
             $url = implode(' ', $argv);
             $referer = '';
         } else {

src/Repository/Traits/LogRepository.php

@@ -68,7 +68,7 @@ public function registerOften(): bool
     private function failedOften(string $success, string $failed, int $maxFailureCount = 20): bool
     {
         if (PHP_SAPI === 'cli') {
-            $ip = 'script';
+            $ip = !empty(getenv('REMOTE_ADDR')) ? getenv('REMOTE_ADDR') : 'script';
         } else {
             $ip = $_SERVER['REMOTE_ADDR'] ?? '';
         }

tests/Log/EventCompleterTest.php

@@ -40,21 +40,20 @@ public function testProcess(): void
             ->willReturn('my login');
 
         CurrentUser::set($user);
+        putenv('REMOTE_ADDR=127.0.0.1');
         $completed = new EventCompleter('https://example.com');
-
         $actual = $completed->process([
             'message' => '',
             'extra' => [
                 'errno' => 1,
             ],
         ]);
-
         self::assertStringContainsString('Stacktrace:', $actual['message']);
         self::assertSame(123, $actual['creator_id']);
         self::assertSame('my login', $actual['login']);
         self::assertIsString($actual['url']);
         self::assertIsString($actual['referer']);
         self::assertIsString($actual['request']);
-        self::assertSame('script', $actual['ip']);
+        self::assertSame('127.0.0.1', $actual['ip']);
     }
 }