Doctrine (#26)

* Better Doctrine support * Simplified Credential Source
web-auth · Mar 6, 2019 · 09f3efa · 09f3efa
1 parent 82f3a7c
commit 09f3efa
Show file tree

Hide file tree

Showing 29 changed files with 965 additions and 283 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ This framework contains PHP libraries and Symfony bundle to allow developpers to
 - Extensions
   - [x] registration and authentication support without extension
   - [x] extension support
-  - [ ] appid extension support (optional)
+  - [x] appid extension support (optional)
 - Cose Algorithms
   - [x] RS1, RS256, RS384, RS512
   - [x] PS256, PS384, PS512

diff --git a/composer.json b/composer.json
@@ -75,6 +75,8 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.9",
+        "doctrine/doctrine-bundle": "^1.10",
+        "doctrine/orm": "^2.6",
         "php-coveralls/php-coveralls": "^2.0",
         "php-http/httplug": "^1.0",
         "php-http/httplug-bundle": "^1.0",

diff --git a/phpstan.neon b/phpstan.neon
@@ -6,14 +6,16 @@ parameters:
         - %currentWorkingDirectory%/src/*/tests/*
         - %currentWorkingDirectory%/src/*/var/*
     ignoreErrors:
-        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::addDefaultsIfNotSet\(\)#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::(.*)\(\)#'
         - '#Cannot call method scalarNode() on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface|null\.#'
         - '#Call to function method_exists\(\) with Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder and (.*) will always evaluate to true\.#'
         - '#Parameter \#1 \$serialized \(string\) of method (.*)::unserialize\(\) should be contravariant with parameter \$serialized \(mixed\) of method Symfony\\Component\\Security\\Core\\Authentication\\Token\\AbstractToken::unserialize\(\)#'
         - '#Offset (.*) does not exist on array\(\)|array\((.*)\)\.#'
         - '#Instantiation of deprecated class Jose\\Component\\Core\\Converter\\StandardConverter\.#'
         - '#Call to method find\(\) of deprecated class Http\\Discovery\\MessageFactoryDiscovery\.#'
         - '#Parameter (.*) of class FG\\ASN1\\Universal\\Integer constructor expects int, string given\.#'
+        - '#Fetching class constant class of deprecated class Webauthn\\CredentialRepository\.#'
+        - '#Interface Webauthn\\PublicKeyCredentialSourceRepository extends deprecated interface Webauthn\\CredentialRepository\.#'
 includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon

diff --git a/src/symfony-security/tests/config/config.yml b/src/symfony-security/tests/config/config.yml
@@ -1,3 +1,6 @@
+parameters:
+    env(DATABASE_URL): ''
+
 framework:
     test: ~
     secret: 'test'
@@ -34,7 +37,7 @@ services:
 
     httplug.client.default: '@httplug.client.mock'
 
-    Webauthn\Bundle\Tests\Functional\CredentialRepository:
+    Webauthn\SecurityBundle\Tests\Functional\PublicKeyCredentialSourceRepository:
         autowire: true
 
 httplug:
@@ -48,11 +51,34 @@ twig:
     paths:
         '%kernel.project_dir%/tests/templates': ~
 
+doctrine:
+    dbal:
+        # configure these for your database server
+        driver: 'pdo_mysql'
+        server_version: '5.7'
+        charset: utf8mb4
+        default_table_options:
+            charset: utf8mb4
+            collate: utf8mb4_unicode_ci
+
+        url: '%env(resolve:DATABASE_URL)%'
+    orm:
+        auto_generate_proxy_classes: true
+        naming_strategy: doctrine.orm.naming_strategy.underscore
+        auto_mapping: true
+        mappings:
+            App:
+                is_bundle: false
+                type: annotation
+                dir: '%kernel.project_dir%/'
+                prefix: 'Webauthn\SecurityBundle\Tests\Functional'
+                alias: App
+
 webauthn_security:
     http_message_factory: 'Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory'
 
 webauthn:
-    credential_repository: 'Webauthn\SecurityBundle\Tests\Functional\CredentialRepository'
+    credential_repository: 'Webauthn\SecurityBundle\Tests\Functional\PublicKeyCredentialSourceRepository'
     android_safetynet:
         enabled: true
         api_key: 'api_key'

diff --git a/src/symfony-security/tests/functional/AppKernel.php b/src/symfony-security/tests/functional/AppKernel.php
@@ -13,6 +13,7 @@
 
 namespace Webauthn\SecurityBundle\Tests\Functional;
 
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Http\HttplugBundle\HttplugBundle;
 use SpomkyLabs\CborBundle\SpomkyLabsCborBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -38,6 +39,7 @@ public function registerBundles(): array
             new SecurityBundle(),
             new TwigBundle(),
             new HttplugBundle(),
+            new DoctrineBundle(),
 
             new WebauthnBundle(),
             new WebauthnSecurityBundle(),

diff --git a/src/symfony-security/tests/functional/CredentialRepository.php b/src/symfony-security/tests/functional/CredentialRepository.php
diff --git a/src/symfony-security/tests/functional/PublicKeyCredentialSourceRepository.php b/src/symfony-security/tests/functional/PublicKeyCredentialSourceRepository.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2018 Spomky-Labs
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace Webauthn\SecurityBundle\Tests\Functional;
+
+use Webauthn\AttestationStatement\AttestationStatement;
+use Webauthn\AttestedCredentialData;
+use Webauthn\PublicKeyCredentialDescriptor;
+use Webauthn\PublicKeyCredentialSource;
+use Webauthn\PublicKeyCredentialSourceRepository as PublicKeyCredentialSourceRepositoryInterface;
+use Webauthn\TrustPath\EmptyTrustPath;
+
+final class PublicKeyCredentialSourceRepository implements PublicKeyCredentialSourceRepositoryInterface
+{
+    /**
+     * @var PublicKeyCredentialSource[]
+     */
+    private $credentials;
+
+    public function __construct()
+    {
+        $pkcs1 = new PublicKeyCredentialSource(
+            \Safe\base64_decode('eHouz/Zi7+BmByHjJ/tx9h4a1WZsK4IzUmgGjkhyOodPGAyUqUp/B9yUkflXY3yHWsNtsrgCXQ3HjAIFUeZB+w==', true),
+            PublicKeyCredentialDescriptor::CREDENTIAL_TYPE_PUBLIC_KEY,
+            [],
+            AttestationStatement::TYPE_NONE,
+            new EmptyTrustPath(),
+            \Safe\base64_decode('AAAAAAAAAAAAAAAAAAAAAA==', true),
+            \Safe\base64_decode('pQECAyYgASFYIJV56vRrFusoDf9hm3iDmllcxxXzzKyO9WruKw4kWx7zIlgg/nq63l8IMJcIdKDJcXRh9hoz0L+nVwP1Oxil3/oNQYs=', true),
+            'foo',
+            100
+        );
+        $this->save($pkcs1);
+    }
+
+    public function find(string $credentialId): ?PublicKeyCredentialSource
+    {
+        if (!array_key_exists(base64_encode($credentialId), $this->credentials)) {
+            return null;
+        }
+
+        return $this->credentials[base64_encode($credentialId)];
+    }
+
+    public function save(PublicKeyCredentialSource $publicKeyCredentialSource): void
+    {
+        $this->credentials[base64_encode($publicKeyCredentialSource->getPublicKeyCredentialId())] = $publicKeyCredentialSource;
+    }
+
+    public function has(string $credentialId): bool
+    {
+        return null !== $this->find($credentialId);
+    }
+
+    public function get(string $credentialId): AttestedCredentialData
+    {
+        $credential = $this->find($credentialId);
+        if (null === $credential) {
+            throw new \InvalidArgumentException('Invalid credential ID');
+        }
+
+        return $credential->getAttestedCredentialData();
+    }
+
+    public function getUserHandleFor(string $credentialId): string
+    {
+        $credential = $this->find($credentialId);
+        if (null === $credential) {
+            throw new \InvalidArgumentException('Invalid credential ID');
+        }
+
+        return $credential->getUserHandle();
+    }
+
+    public function getCounterFor(string $credentialId): int
+    {
+        $credential = $this->find($credentialId);
+        if (null === $credential) {
+            throw new \InvalidArgumentException('Invalid credential ID');
+        }
+
+        return $credential->getCounter();
+    }
+
+    public function updateCounterFor(string $credentialId, int $newCounter): void
+    {
+        $credential = $this->find($credentialId);
+        if (null === $credential) {
+            throw new \InvalidArgumentException('Invalid credential ID');
+        }
+
+        $credential->setCounter($newCounter);
+        $this->save($credential);
+    }
+}
diff --git a/src/symfony/src/DependencyInjection/WebauthnExtension.php b/src/symfony/src/DependencyInjection/WebauthnExtension.php
@@ -108,8 +108,10 @@ public function prepend(ContainerBuilder $container): void
         }
         $config['dbal']['types'] += [
             'attested_credential_data' => DbalType\AttestedCredentialDataType::class,
+            'base64' => DbalType\Base64BinaryDataType::class,
             'public_key_credential_descriptor' => DbalType\PublicKeyCredentialDescriptorType::class,
             'public_key_credential_descriptor_collection' => DbalType\PublicKeyCredentialDescriptorCollectionType::class,
+            'trust_path' => DbalType\TrustPathDataType::class,
         ];
         $container->prependExtensionConfig('doctrine', $config);
     }

diff --git a/src/symfony/src/Doctrine/Type/Base64BinaryDataType.php b/src/symfony/src/Doctrine/Type/Base64BinaryDataType.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2018 Spomky-Labs
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace Webauthn\Bundle\Doctrine\Type;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+final class Base64BinaryDataType extends Type
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    {
+        return base64_encode($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToPHPValue($value, AbstractPlatform $platform)
+    {
+        return \Safe\base64_decode($value, true);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    {
+        return $platform->getClobTypeDeclarationSQL($fieldDeclaration);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'base64';
+    }
+}