Removing depreciated XSSMode middleware and cleanup test config

Treblle · May 15, 2023 · cafdfcc · cafdfcc
1 parent 8751910
commit cafdfcc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 83 deletions.
diff --git a/README.md b/README.md
@@ -70,8 +70,6 @@ return [
 
     'referrer-policy' => 'no-referrer-when-downgrade',
 
-    'xss-mode' => '1; mode=block',
-
     'strict-transport-security' => 'max-age=31536000; includeSubDomains',
 
     'certificate-transparency' => 'enforce, max-age=30',

diff --git a/config/headers.php b/config/headers.php
@@ -12,8 +12,6 @@
 
     'referrer-policy' => 'no-referrer-when-downgrade',
 
-    'xss-mode' => '1; mode=block',
-
     'strict-transport-security' => 'max-age=31536000; includeSubDomains',
 
     'certificate-transparency' => 'enforce, max-age=30',

diff --git a/src/Http/Middleware/XSSMode.php b/src/Http/Middleware/XSSMode.php
diff --git a/src/Providers/PackageServiceProvider.php b/src/Providers/PackageServiceProvider.php
@@ -11,7 +11,7 @@ final class PackageServiceProvider extends ServiceProvider
     public function boot(): void
     {
         $this->publishes([
-            __DIR__ . '/../../config/headers.php' => config_path('headers.php'),
+            __DIR__.'/../../config/headers.php' => config_path('headers.php'),
         ], 'security-headers');
     }
 }
diff --git a/tests/Http/Middleware/XSSModeTest.php b/tests/Http/Middleware/XSSModeTest.php
diff --git a/tests/PackageTestCase.php b/tests/PackageTestCase.php
@@ -24,36 +24,25 @@ protected function getPackageProviders($app): array
 
     protected function defineEnvironment($app): void
     {
-        tap($app->make('config'), function (Repository $config): void {
-            $config->set('headers.remove', [
-                'X-Powered-By',
-                'Server',
-            ]);
+        tap($app->make('config'), static function (Repository $config): void {
+            $config->set('headers', [
+                'remove' => [
+                    'X-Powered-By',
+                    'x-powered-by',
+                    'Server',
+                    'server',
+                ],
+
+                'referrer-policy' => 'no-referrer-when-downgrade',
+
+                'strict-transport-security' => 'max-age=31536000; includeSubDomains',
 
-            $config->set(
-                'headers.referrer-policy',
-                'no-referrer-when-downgrade',
-            );
-            $config->set(
-                'headers.xss-mode',
-                '1; mode=block',
-            );
-            $config->set(
-                'headers.strict-transport-security',
-                'max-age=31536000; includeSubDomains',
-            );
-            $config->set(
-                'headers.certificate-transparency',
-                'enforce, max-age=30',
-            );
-            $config->set(
-                'headers.permissions-policy',
-                'autoplay=(self), camera=(), encrypted-media=(self), fullscreen=(), geolocation=(self), gyroscope=(self), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=(self), usb=()'
-            );
-            $config->set(
-                'headers.content-type-options',
-                'nosniff',
-            );
+                'certificate-transparency' => 'enforce, max-age=30',
+
+                'permissions-policy' => 'autoplay=(self), camera=(), encrypted-media=(self), fullscreen=(), geolocation=(self), gyroscope=(self), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=(self), usb=()',
+
+                'content-type-options' => 'nosniff',
+            ]);
         });
     }
 }