Security fix

Spomky-Labs · Nov 17, 2023 · 09dd5f7 · 09dd5f7
1 parent c1cd440
commit 09dd5f7
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 457 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -20,12 +20,6 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
-#        admin:
-#            pattern: ^/admin
-#            provider: app_admin_provider
-#            x509:
-#                user_identifier: CN
-
         main:
             pattern: ^/
             lazy: true
@@ -34,7 +28,7 @@ security:
             logout:
                 path: app_logout
                 # where to redirect after logout
-                # target: app_any_route
+                target: app_homepage
 
             # activate different ways to authenticate
             # https://symfony.com/doc/current/security.html#the-firewall

diff --git a/src/Entity/Admin.php b/src/Entity/Admin.php
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -43,7 +43,7 @@ public function __construct(
         $this->accessTokens = new ArrayCollection();
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return sprintf('%s (%s)', $this->username, $this->email);
     }

diff --git a/src/Repository/CityRepository.php b/src/Repository/CityRepository.php
@@ -59,7 +59,9 @@ public function flush(): void
     public function findByNameLike(string $query): array
     {
         return $this->createQueryBuilder('c')
-            ->andWhere('(LOWER(c.name) LIKE :query) OR (LOWER(c.zipCode) LIKE :query) OR (LOWER(c.inseeCode) LIKE :query)')
+            ->andWhere(
+                '(LOWER(c.name) LIKE :query) OR (LOWER(c.zipCode) LIKE :query) OR (LOWER(c.inseeCode) LIKE :query)'
+            )
             ->setParameter('query', sprintf('%%%s%%', mb_strtolower($query)))
             ->orderBy('c.name', Criteria::ASC)
             ->setMaxResults(50)

diff --git a/src/Security/AdminProvider.php b/src/Security/AdminProvider.php
diff --git a/tests/Benchmark/Argon2Bench.php b/tests/Benchmark/Argon2Bench.php
@@ -5,7 +5,8 @@
 namespace App\Tests\Benchmark;
 
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use const PASSWORD_BCRYPT;
+use const PASSWORD_ARGON2I;
+use const PASSWORD_ARGON2ID;
 
 final class Argon2Bench
 {

diff --git a/tests/Benchmark/PBKDF2Bench.php b/tests/Benchmark/PBKDF2Bench.php
@@ -5,7 +5,6 @@
 namespace App\Tests\Benchmark;
 
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use const PASSWORD_BCRYPT;
 
 final class PBKDF2Bench
 {
@@ -16,6 +15,7 @@ public function benchPBKDF2_MinimumNISTRecommendation(): void
     {
         hash_pbkdf2('sha256', 'this is a very secret password', random_bytes(16), 1_000, 64, true);
     }
+
     /**
      * @Revs(1)
      */

diff --git a/tests/Benchmark/ShaBench.php b/tests/Benchmark/ShaBench.php
@@ -5,7 +5,6 @@
 namespace App\Tests\Benchmark;
 
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
-use const PASSWORD_BCRYPT;
 
 final class ShaBench
 {