platine-php / framework

src/Security/SecurityPolicy.php

Indentation +3 added lines, -3 removed lines

@@ -206,7 +206,7 @@ 
             return [];

         }

 

-         $policy = new FeaturePermissionPolicy($config);

+            $policy = new FeaturePermissionPolicy($config);

 

         return ['Permissions-Policy' => $policy->headers()];

     }

@@ -223,7 +223,7 @@ 
             return [];

         }

 

-         $policy = new StrictTransportSecurityPolicy($config);

+            $policy = new StrictTransportSecurityPolicy($config);

 

         return ['Strict-Transport-Security' => $policy->headers()];

     }

@@ -241,7 +241,7 @@ 
             return [];

         }

 

-         $policy = new ClearSiteDataPolicy($config);

+            $policy = new ClearSiteDataPolicy($config);

 

         return ['Clear-Site-Data' => $policy->headers()];

     }

Braces +12 added lines, -13 removed lines

@@ -61,8 +61,7 @@ 
  * @package Platine\Framework\Security

  * @template T

  */

-class SecurityPolicy

-{

+class SecurityPolicy {
     /**

      * The application configuration

      * @var Config<T>

@@ -101,7 +100,7 @@ 
         Config $config,

         Router $router,

         array $configurations = []

-    ) {

+    ) {
         $this->config = $config;

         $this->router = $router;

         $this->configurations = $configurations;

@@ -145,18 +144,18 @@ 
     {

         $config = $this->configurations['csp'] ?? [];

         $isEnabled = $config['enable'] ?? false;

-        if ($isEnabled === false) {

+        if ($isEnabled === false) {
             return [];

         }

 

         $config['script-src']['nonces'] = $this->nonces['script'];

         $config['style-src']['nonces'] = $this->nonces['style'];

 

-        if (count($config['report-uri'] ?? []) > 0) {

+        if (count($config['report-uri'] ?? []) > 0) {
             $routes = $this->router->routes();

             $reportUri = [];

-            foreach ($config['report-uri'] as $url) {

-                if ($routes->has($url)) {

+            foreach ($config['report-uri'] as $url) {
+                if ($routes->has($url)) {
                     $url = $this->config->get('app.host') . $this->router->getUri($url)->getPath();

                 }

 

@@ -176,13 +175,13 @@ 
         $headers = [$header => $policy->headers()];

 

         $reportTo = [];

-        if ($config['report-to'] ?? false) {

-            if (count($config['report-uri'] ?? []) > 0) {

+        if ($config['report-to'] ?? false) {
+            if (count($config['report-uri'] ?? []) > 0) {
                 $reportTo['group'] = $config['report-to'];

                 $reportTo['max_age'] = 1800; // TODO use configuration

 

                 $reportTo['endpoints'] = [];

-                foreach ($config['report-uri'] as $url) {

+                foreach ($config['report-uri'] as $url) {
                     $reportTo['endpoints'][] = [

                         'url' => $url

                     ];

@@ -202,7 +201,7 @@ 
     {

         $config = $this->configurations['features-permissions'] ?? [];

         $isEnabled = $config['enable'] ?? false;

-        if ($isEnabled === false) {

+        if ($isEnabled === false) {
             return [];

         }

 

@@ -219,7 +218,7 @@ 
     {

         $config = $this->configurations['hsts'] ?? [];

         $isEnabled = $config['enable'] ?? false;

-        if ($isEnabled === false) {

+        if ($isEnabled === false) {
             return [];

         }

 

@@ -237,7 +236,7 @@ 
     {

         $config = $this->configurations['clear-site-data'] ?? [];

         $isEnabled = $config['enable'] ?? false;

-        if ($isEnabled === false) {

+        if ($isEnabled === false) {
             return [];

         }

 

src/Security/Csrf/CsrfStorageInterface.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
  * @class CsrfStorageInterface

  * @package Platine\Framework\Security\Csrf

  */

-interface CsrfStorageInterface

-{

+interface CsrfStorageInterface {
     /**

      * Return the token information from storage

      * @param string $name

src/Security/Csrf/Storage/CsrfUserSessionStorage.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
  * @class CsrfUserSessionStorage

  * @package Platine\Framework\Security\Csrf\Storage

  */

-class CsrfUserSessionStorage extends CsrfSessionStorage

-{

+class CsrfUserSessionStorage extends CsrfSessionStorage {
     /**

      * {@inheritdoc}

      */

src/Security/Csrf/Storage/CsrfNullStorage.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      */

     public function set(string $name, string $token, int $expire): void

     {

-         $this->data[$name] = $token;

+            $this->data[$name] = $token;

     }

 

     /**

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
  * @class CsrfNullStorage

  * @package Platine\Framework\Security\Csrf\Storage

  */

-class CsrfNullStorage implements CsrfStorageInterface

-{

+class CsrfNullStorage implements CsrfStorageInterface {
     /**

      * The CSRF data

      * @var array<string, string>

src/Security/Csrf/Storage/CsrfSessionStorage.php

Braces +3 added lines, -5 removed lines

@@ -54,8 +54,7 @@ 
  * @class CsrfSessionStorage

  * @package Platine\Framework\Security\Csrf\Storage

  */

-class CsrfSessionStorage implements CsrfStorageInterface

-{

+class CsrfSessionStorage implements CsrfStorageInterface {
     /**

      * The session key used to store CSRF data

      */

@@ -72,8 +71,7 @@ 
      * Create new instance

      * @param Session $session

      */

-    public function __construct(Session $session)

-    {

+    public function __construct(Session $session) {
         $this->session = $session;

     }

 

@@ -86,7 +84,7 @@ 
         $key = $this->getKeyName($name);

         $data = $this->session->get($key, []);

 

-        if (count($data) === 0 || $data['expire'] <= time()) {

+        if (count($data) === 0 || $data['expire'] <= time()) {
             return null;

         }

 

src/Security/Csrf/CsrfManager.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
         ?CsrfStorageInterface $storage = null

     ) {

         $this->config = $config;

-        $this->storage = $storage ??  new CsrfNullStorage();

+        $this->storage = $storage ?? new CsrfNullStorage();

     }

 

     /**

Braces +11 added lines, -13 removed lines

@@ -59,8 +59,7 @@ 
  * @package Platine\Framework\Security\Csrf

  * @template T

  */

-class CsrfManager

-{

+class CsrfManager {
     /**

      * The application configuration class

      * @var Config<T>

@@ -81,7 +80,7 @@ 
     public function __construct(

         Config $config,

         ?CsrfStorageInterface $storage = null

-    ) {

+    ) {
         $this->config = $config;

         $this->storage = $storage ??  new CsrfNullStorage();

     }

@@ -94,18 +93,18 @@ 
      */

     public function validate(ServerRequestInterface $request, ?string $key = null): bool

     {

-        if ($key === null) {

+        if ($key === null) {
             $key = $this->getConfigValue('key');

         }

 

         $storageToken = $this->storage->get($key);

-        if ($storageToken === null) {

+        if ($storageToken === null) {
             return false;

         }

 

         $token = $this->getRequestToken($request, $key);

 

-        if ($token === null || $token !== $storageToken) {

+        if ($token === null || $token !== $storageToken) {
             return false;

         }

 

@@ -119,12 +118,12 @@ 
      */

     public function getToken(?string $key = null): string

     {

-        if ($key === null) {

+        if ($key === null) {
             $key = $this->getConfigValue('key');

         }

 

         $value = $this->storage->get($key);

-        if ($value === null) {

+        if ($value === null) {
             // Generate the token

             $value = sha1(Str::randomToken(24));

             $expire = $this->getConfigValue('expire') ?? 300;

@@ -145,7 +144,7 @@ 
     {

         $token = $this->getToken($key);

 

-        if ($key === null) {

+        if ($key === null) {
             $key = (string) $this->getConfigValue('key');

         }

 

@@ -171,11 +170,11 @@ 
     {

         $param = new RequestData($request);

         $token = $param->post($key);

-        if ($token === null) {

+        if ($token === null) {
             $token = $param->get($key);

         }

 

-        if ($token === null) {

+        if ($token === null) {
             $token = $request->getHeaderLine('X-Csrf-Token');

         }

 

@@ -188,8 +187,7 @@ 
      * @param string $key

      * @return mixed

      */

-    private function getConfigValue(string $key)

-    {

+    private function getConfigValue(string $key) {
         $config = $this->config->get('security.csrf', []);

 

         return $config[$key] ?? null;

src/Security/Policy/FeaturePermissionPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         // ensure indexes are numerically

         $urls = array_values($values);

 

-        return array_map(function (string $url) {

+        return array_map(function(string $url) {

             return sprintf('"%s"', $url);

         }, $urls);

     }

Braces +7 added lines, -8 removed lines

@@ -52,16 +52,15 @@ 
  * @class FeaturePermissionPolicy

  * @package Platine\Framework\Security\Policy

  */

-class FeaturePermissionPolicy extends AbstractPolicy

-{

+class FeaturePermissionPolicy extends AbstractPolicy {
     /**

      * {@inheritdoc}

      */

     public function headers(): string

     {

         $headers = [];

-        foreach ($this->configurations as $name => $config) {

-            if ($name === 'enable') {

+        foreach ($this->configurations as $name => $config) {
+            if ($name === 'enable') {
                 continue;

             }

 

@@ -80,14 +79,14 @@ 
      */

     public function directive(array $config): string

     {

-        if ($config['none'] ?? false) {

+        if ($config['none'] ?? false) {
             return '()';

-        } elseif ($config['*'] ?? false) {

+        } elseif ($config['*'] ?? false) {
             return '*';

         }

 

         $origins = $this->origins($config['origins'] ?? []);

-        if ($config['self'] ?? false) {

+        if ($config['self'] ?? false) {
             array_unshift($origins, 'self');

         }

 

@@ -111,7 +110,7 @@ 
         // ensure indexes are numerically

         $urls = array_values($values);

 

-        return array_map(function (string $url) {

+        return array_map(function (string $url) {
             return sprintf('"%s"', $url);

         }, $urls);

     }

src/Security/Policy/ClearSiteDataPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
         $directives = array_intersect_key($config, $this->whitelist);

         $values = array_filter($directives);

 

-        $results = array_map(function (string $directive) {

+        $results = array_map(function(string $directive) {

             if ($directive === 'execution-contexts') {

                 $directive = 'executionContexts';

             }

Braces +4 added lines, -5 removed lines

@@ -52,8 +52,7 @@ 
  * @class ClearSiteDataPolicy

  * @package Platine\Framework\Security\Policy

  */

-class ClearSiteDataPolicy extends AbstractPolicy

-{

+class ClearSiteDataPolicy extends AbstractPolicy {
     /**

      * Clear Site Data white list directives.

      * @var array<string, bool>

@@ -72,15 +71,15 @@ 
     {

         $config = $this->configurations;

 

-        if ($config['all'] ?? false) {

+        if ($config['all'] ?? false) {
             return '"*"';

         }

 

         $directives = array_intersect_key($config, $this->whitelist);

         $values = array_filter($directives);

 

-        $results = array_map(function (string $directive) {

-            if ($directive === 'execution-contexts') {

+        $results = array_map(function (string $directive) {
+            if ($directive === 'execution-contexts') {
                 $directive = 'executionContexts';

             }

 

src/Security/Policy/ContentSecurityPolicy.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
 

         $filtered = $this->filter($config, $whitelist);

 

-        return array_map(function (string $keyword) {

+        return array_map(function(string $keyword) {

             return sprintf('\'%s\'', $keyword);

         }, $filtered);

     }

@@ -157,7 +157,7 @@ 
      */

     public function schemes(array $schemes): array

     {

-        return array_map(function (string $scheme) {

+        return array_map(function(string $scheme) {

             $clean = trim($scheme);

 

             if (substr($clean, -1) === ':') {

@@ -175,7 +175,7 @@ 
      */

     public function nonces(array $nonces): array

     {

-        return array_map(function (string $nonce) {

+        return array_map(function(string $nonce) {

             $clean = trim($nonce);

 

             if (base64_decode($clean, true) === false) {

@@ -222,7 +222,7 @@ 
     {

         $pluginTypes = $this->configurations['plugin-types'] ?? [];

 

-        $filtered = array_filter($pluginTypes, function (string $mime) {

+        $filtered = array_filter($pluginTypes, function(string $mime) {

             return preg_match('/^[a-z\-]+\/[a-z\-]+$/i', $mime);

         });

 

Braces +25 added lines, -26 removed lines

@@ -52,8 +52,7 @@ 
  * @class ContentSecurityPolicy

  * @package Platine\Framework\Security\Policy

  */

-class ContentSecurityPolicy extends AbstractPolicy

-{

+class ContentSecurityPolicy extends AbstractPolicy {
     /**

      * Content Security Policy white list directives.

      * @var array<string, bool>

@@ -109,7 +108,7 @@ 
      */

     public function directive(array $config): string

     {

-        if ($config['none'] ?? false) {

+        if ($config['none'] ?? false) {
             return '\'none\'';

         }

 

@@ -145,7 +144,7 @@ 
 

         $filtered = $this->filter($config, $whitelist);

 

-        return array_map(function (string $keyword) {

+        return array_map(function (string $keyword) {
             return sprintf('\'%s\'', $keyword);

         }, $filtered);

     }

@@ -157,10 +156,10 @@ 
      */

     public function schemes(array $schemes): array

     {

-        return array_map(function (string $scheme) {

+        return array_map(function (string $scheme) {
             $clean = trim($scheme);

 

-            if (substr($clean, -1) === ':') {

+            if (substr($clean, -1) === ':') {
                 return $clean;

             }

 

@@ -175,10 +174,10 @@ 
      */

     public function nonces(array $nonces): array

     {

-        return array_map(function (string $nonce) {

+        return array_map(function (string $nonce) {
             $clean = trim($nonce);

 

-            if (base64_decode($clean, true) === false) {

+            if (base64_decode($clean, true) === false) {
                 return '';

             }

 

@@ -195,15 +194,15 @@ 
     {

         $result = [];

 

-        foreach ($groups as $hash => $items) {

-            if (!in_array($hash, ['sha256', 'sha384', 'sha512'], true)) {

+        foreach ($groups as $hash => $items) {
+            if (!in_array($hash, ['sha256', 'sha384', 'sha512'], true)) {
                 continue;

             }

 

-            foreach ($items as $item) {

+            foreach ($items as $item) {
                 $clean = trim($item);

 

-                if (base64_decode($clean, true) === false) {

+                if (base64_decode($clean, true) === false) {
                     continue;

                 }

 

@@ -222,11 +221,11 @@ 
     {

         $pluginTypes = $this->configurations['plugin-types'] ?? [];

 

-        $filtered = array_filter($pluginTypes, function (string $mime) {

+        $filtered = array_filter($pluginTypes, function (string $mime) {
             return preg_match('/^[a-z\-]+\/[a-z\-]+$/i', $mime);

         });

 

-        if (count($filtered) > 0) {

+        if (count($filtered) > 0) {
             array_unshift($filtered, 'plugin-types');

         }

 

@@ -241,7 +240,7 @@ 
     {

         $sandbox = $this->configurations['sandbox'] ?? [];

 

-        if (!($sandbox['enable'] ?? false)) {

+        if (!($sandbox['enable'] ?? false)) {
             return '';

         }

 

@@ -276,7 +275,7 @@ 
     {

         $config = $this->configurations['require-trusted-types-for'] ?? [];

 

-        if (!($config['script'] ?? false)) {

+        if (!($config['script'] ?? false)) {
             return '';

         }

 

@@ -291,17 +290,17 @@ 
     {

         $trustedTypes = $this->configurations['trusted-types'] ?? [];

 

-        if (!($trustedTypes['enable'] ?? false)) {

+        if (!($trustedTypes['enable'] ?? false)) {
             return '';

         }

 

         $policies = array_map('trim', $trustedTypes['policies'] ?? []);

 

-        if ($trustedTypes['default'] ?? false) {

+        if ($trustedTypes['default'] ?? false) {
             $policies[] = 'default';

         }

 

-        if ($trustedTypes['allow-duplicates'] ?? false) {

+        if ($trustedTypes['allow-duplicates'] ?? false) {
             $policies[] = '\'allow-duplicates\'';

         }

 

@@ -316,7 +315,7 @@ 
      */

     public function blockAllMixedContent(): string

     {

-        if (!($this->configurations['block-all-mixed-content'] ?? false)) {

+        if (!($this->configurations['block-all-mixed-content'] ?? false)) {
             return '';

         }

 

@@ -329,7 +328,7 @@ 
      */

     public function upgradeInsecureRequests(): string

     {

-        if (!($this->configurations['upgrade-insecure-requests'] ?? false)) {

+        if (!($this->configurations['upgrade-insecure-requests'] ?? false)) {
             return '';

         }

 

@@ -342,7 +341,7 @@ 
      */

     public function reportTo(): string

     {

-        if (empty($this->configurations['report-to'])) {

+        if (empty($this->configurations['report-to'])) {
             return '';

         }

 

@@ -355,7 +354,7 @@ 
      */

     public function reportUri(): string

     {

-        if (empty($this->configurations['report-uri'])) {

+        if (empty($this->configurations['report-uri'])) {
             return '';

         }

 

@@ -397,14 +396,14 @@ 
     protected function directives(): string

     {

         $result = [];

-        foreach ($this->configurations as $name => $config) {

-            if (!($this->whitelist[$name] ?? false)) {

+        foreach ($this->configurations as $name => $config) {
+            if (!($this->whitelist[$name] ?? false)) {
                 continue;

             }

 

             $value = $this->directive($config);

 

-            if (empty($value)) {

+            if (empty($value)) {
                 continue;

             }