Remove unused IP blocking code, part 2

mozilla · Apr 8, 2024 · a97f160 · a97f160
1 parent 92c51c4
commit a97f160
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 42 deletions.
diff --git a/app/inc/config.php b/app/inc/config.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use ReleaseInsights\Data;
+use function Sentry\init;
 
 // We always work with UTF8 encoding
 mb_internal_encoding('UTF-8');
@@ -68,5 +69,14 @@
 // Define a Nonce for inline scripts
 define('NONCE', bin2hex(random_bytes(10)));
 
+// Set up Sentry endpoint, don't send errors while in dev mode
+if (STAGING) {
+    init(['dsn' => 'https://e17dcdc892db4ee08a6937603e407f76@o1069899.ingest.sentry.io/4505243444772864']);
+}
+
+if (PRODUCTION) {
+    init(['dsn' => 'https://20bef71984594e16add1d2c69146ad88@o1069899.ingest.sentry.io/4505243430092800']);
+}
+
 // Clean up temp variables from global space
 unset($firefox_versions, $http_host);
diff --git a/app/inc/init.php b/app/inc/init.php
@@ -3,8 +3,7 @@
 declare(strict_types=1);
 
 use ReleaseInsights\Request;
-
-use function Sentry\{captureLastError, init};
+use function Sentry\captureLastError;
 
 // Catch errors via Ignition library in dev mode only
 if (getenv('TESTING_CONTEXT') === false  && LOCALHOST) {
@@ -15,15 +14,6 @@
     }
 }
 
-// Set up Sentry endpoint, don't send errors while in dev mode
-if (STAGING) {
-    init(['dsn' => 'https://e17dcdc892db4ee08a6937603e407f76@o1069899.ingest.sentry.io/4505243444772864']);
-}
-
-if (PRODUCTION) {
-    init(['dsn' => 'https://20bef71984594e16add1d2c69146ad88@o1069899.ingest.sentry.io/4505243430092800']);
-}
-
 // Send HTTP security headers
 header('X-Content-Type-Options: nosniff');
 

diff --git a/tests/Unit/ReleaseInsights/UtilsTest.php b/tests/Unit/ReleaseInsights/UtilsTest.php
@@ -164,37 +164,6 @@
         ->not->toBeEmpty();
 });
 
-test('Utils::getIP', function () {
-    expect(U::getIP())->toBeNull();
-
-    $_SERVER['HTTP_CLIENT_IP'] = '1.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('1.1.1.1');
-    unset($_SERVER['HTTP_CLIENT_IP']);
-
-    $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('2.1.1.1');
-    unset($_SERVER['HTTP_X_FORWARDED_FOR']);
-
-    $_SERVER['HTTP_X_FORWARDED'] = '3.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('3.1.1.1');
-    unset($_SERVER['HTTP_X_FORWARDED']);
-
-    $_SERVER['HTTP_FORWARDED_FOR'] = '4.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('4.1.1.1');
-    unset($_SERVER['HTTP_FORWARDED_FOR']);
-
-    $_SERVER['HTTP_FORWARDED'] = '5.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('5.1.1.1');
-    unset($_SERVER['HTTP_FORWARDED']);
-
-    $_SERVER['REMOTE_ADDR'] = '6.1.1.1';
-    expect(U::getIP())->toBeString()->toEqual('6.1.1.1');
-    unset($_SERVER['REMOTE_ADDR']);
-
-    expect(U::getIP())->toBeNull();
-});
-
-
 test('Utils::isJson', function () {
     $this->assertFalse(U::isJson('1'));
     $this->assertFalse(U::isJson('[1:]'));