WIP

config/openconext/parameters.yaml.dist

@@ -7,7 +7,7 @@ parameters:
     app_secret: SeTW1ThY0uR0WnS3cR37
     # The Symfony app secret. For more details see:
     # https://symfony.com/doc/current/reference/configuration/framework.html#secret
-    database_url: "mysql://webauthn:webauthn_secret@mariadb:3306/webauthn"
+    database_url: 'mysql://webauthn_user:webauthn_secret@mariadb:3306/webauthn'
     support_url:
         en_GB: "https://support.example.org/faq-strong-authentication"
         nl_NL: "https://support.example.org/faq-sterke-authenticatie"

config/packages/doctrine_migrations.yaml

@@ -1,2 +1,3 @@
 doctrine_migrations:
-    migrations_paths: ['%kernel.project_dir%/src/Migrations']
+    migrations_paths:
+        DoctrineMigrations: '%kernel.project_dir%/src/Migrations'

config/packages/monolog.yaml

@@ -13,3 +13,12 @@ monolog:
         console:
             type: console
             process_psr_3_messages: false
+
+when@dev:
+    monolog:
+        handlers:
+            prod-signaler:
+                channels: ['!event']
+                type: fingers_crossed
+                action_level: INFO
+                passthru_level: INFO

config/packages/webauthn.yaml

@@ -5,6 +5,7 @@ webauthn:
         default:
             public_key_credential_parameters:
                 - !php/const Cose\Algorithms::COSE_ALGORITHM_ES256
+                - !php/const Cose\Algorithms::COSE_ALGORITHM_RS256
             rp:
                 name: '%webauthn_name%'
                 icon: '%webauthn_logo%'

src/Controller/AssertionResponseController.php

@@ -20,6 +20,7 @@
 
 namespace Surfnet\Webauthn\Controller;
 
+use Psr\Http\Message\RequestInterface;
 use Surfnet\Webauthn\Exception\NoActiveAuthenrequestException;
 use Surfnet\Webauthn\PublicKeyCredentialRequestOptionsStore;
 use Surfnet\Webauthn\ValidationJsonResponse;
@@ -54,7 +55,7 @@ public function __construct(
      * Handles the assertion public key response.
      */
     #[Route(path: '/verify-assertion', name: 'verify-assertion', methods: ['POST'])]
-    public function action(ServerRequestInterface $psr7Request, Request $request): Response
+    public function action(RequestInterface $psr7Request, Request $request): Response
     {
         $this->logger->info('Verifying if there is a pending authentication from SP');
 

src/Entity/User.php

@@ -20,9 +20,10 @@
 
 namespace Surfnet\Webauthn\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\ArrayCollection as ArrayCollectionAlias;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\JoinColumn;
+use Surfnet\Webauthn\Entity\PublicKeyCredentialSource as PublicKeyCredentialSourceEntity;
 use Surfnet\Webauthn\Repository\UserRepository;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -44,20 +45,20 @@ class User extends PublicKeyCredentialUserEntity implements UserInterface
     public readonly string $displayName;
 
     /**
-     * @var ArrayCollection<PublicKeyCredentialSource>
+     * @var ArrayCollectionAlias<PublicKeyCredentialSourceEntity>
      */
-    #[ORM\ManyToMany(targetEntity:PublicKeyCredentialSource::class)]
+    #[ORM\ManyToMany(targetEntity: PublicKeyCredentialSourceEntity::class)]
     #[ORM\JoinTable(
         name: "users_user_handles",
         joinColumns:[new JoinColumn(name: "user_id", referencedColumnName: "id")],
         inverseJoinColumns:[new JoinColumn(name:"user_handle", referencedColumnName: "id", unique: true)]
     )]
-    protected ArrayCollection $publicKeyCredentialSources;
+    protected ArrayCollectionAlias $publicKeyCredentialSources;
 
     public function __construct(string $id, string $name, string $displayName)
     {
         parent::__construct($name, $id, $displayName);
-        $this->publicKeyCredentialSources = new ArrayCollection();
+        $this->publicKeyCredentialSources = new ArrayCollectionAlias();
     }
 
     /**

src/Kernel.php

@@ -51,7 +51,7 @@ public function getProjectDir(): string
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug);
+        $container->setParameter('.container.dumper.inline_class_loader', PHP_VERSION_ID < 70400 || $this->debug);
         $container->setParameter('.container.dumper.inline_factories', true);
         $confDir = $this->getProjectDir().'/config';
 

templates/base.html.twig

@@ -61,7 +61,5 @@
     </div>
 {% endblock %}
 
-{% block javascripts %}{% endblock %}
-
 </body>
 </html>