@anonympins/fingerprint 0.3.7 → 0.4.0

package/src/php/Store/InMemoryStore.php

@@ -1,67 +1,67 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Store;
-
-/**
- * Implémentation en mémoire de l'interface IStore.
- * Utile pour le développement ou les applications à instance unique sans persistance externe.
- */
-class InMemoryStore implements IStore
-{
-    /**
-     * @var array<string, array{value: mixed, expiresAt: int|null}>
-     */
-    private array $data = [];
-
-    public function get(string $key)
-    {
-        if (!isset($this->data[$key])) {
-            return null;
-        }
-
-        $item = $this->data[$key];
-        if ($item['expiresAt'] !== null && $item['expiresAt'] < time()) {
-            $this->delete($key); // Supprime l'élément expiré
-            return null;
-        }
-
-        return $item['value'];
-    }
-
-    public function set(string $key, $value, ?int $ttl = null): void
-    {
-        $expiresAt = $ttl !== null ? time() + $ttl : null;
-
-        $this->data[$key] = ['value' => $value, 'expiresAt' => $expiresAt];
-    }
-
-    public function has(string $key): bool
-    {
-        if (!isset($this->data[$key])) {
-            return false;
-        }
-
-        $item = $this->data[$key];
-        if ($item['expiresAt'] !== null && $item['expiresAt'] < time()) {
-            $this->delete($key);
-            return false;
-        }
-
-        return true;
-    }
-
-    public function delete(string $key): void
-    {
-        unset($this->data[$key]);
-    }
-
-    /**
-     * Efface toutes les données du store. Utile pour les tests.
-     */
-    public function clear(): void
-    {
-        $this->data = [];
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Store;
+
+/**
+ * Implémentation en mémoire de l'interface IStore.
+ * Utile pour le développement ou les applications à instance unique sans persistance externe.
+ */
+class InMemoryStore implements IStore
+{
+    /**
+     * @var array<string, array{value: mixed, expiresAt: int|null}>
+     */
+    private array $data = [];
+
+    public function get(string $key)
+    {
+        if (!isset($this->data[$key])) {
+            return null;
+        }
+
+        $item = $this->data[$key];
+        if ($item['expiresAt'] !== null && $item['expiresAt'] < time()) {
+            $this->delete($key); // Supprime l'élément expiré
+            return null;
+        }
+
+        return $item['value'];
+    }
+
+    public function set(string $key, $value, ?int $ttl = null): void
+    {
+        $expiresAt = $ttl !== null ? time() + $ttl : null;
+
+        $this->data[$key] = ['value' => $value, 'expiresAt' => $expiresAt];
+    }
+
+    public function has(string $key): bool
+    {
+        if (!isset($this->data[$key])) {
+            return false;
+        }
+
+        $item = $this->data[$key];
+        if ($item['expiresAt'] !== null && $item['expiresAt'] < time()) {
+            $this->delete($key);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function delete(string $key): void
+    {
+        unset($this->data[$key]);
+    }
+
+    /**
+     * Efface toutes les données du store. Utile pour les tests.
+     */
+    public function clear(): void
+    {
+        $this->data = [];
+    }
 }

package/src/php/Store/MongoDbStore.php

@@ -1,105 +1,105 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Store;
-
-/**
- * Adaptateur de stockage MongoDB pour le moteur Fingerprint.
- * Utilise la bibliothèque officielle mongodb/mongodb.
- */
-class MongoDbStore implements IStore
-{
-    /**
-     * @var \MongoDB\Collection
-     */
-    private $collection;
-
-    /**
-     * @param \MongoDB\Collection $collection Collection dédiée au stockage des empreintes
-     */
-    public function __construct($collection)
-    {
-        $this->collection = $collection;
-    }
-
-    public function get(string $key)
-    {
-        $doc = $this->collection->findOne(['_id' => $key]);
-        if (!$doc) {
-            return null;
-        }
-
-        // Vérification d'expiration active pour bypasser le délai de 60s du démon de MongoDB
-        if (isset($doc['expiresAt'])) {
-            $expiresAt = $doc['expiresAt'];
-            if ($expiresAt instanceof \MongoDB\BSON\UTCDateTime) {
-                $expiresAtMs = $expiresAt->toDateTime()->getTimestamp() * 1000;
-                $nowMs = (int)(microtime(true) * 1000);
-                if ($expiresAtMs < $nowMs) {
-                    $this->delete($key);
-                    return null;
-                }
-            }
-        }
-
-        return isset($doc['value']) ? json_decode($doc['value'], true) : null;
-    }
-
-    public function set(string $key, $value, ?int $ttl = null): void
-    {
-        $doc = [
-            '_id' => $key,
-            'value' => json_encode($value),
-        ];
-
-        if ($ttl !== null && $ttl > 0) {
-            $doc['expiresAt'] = new \MongoDB\BSON\UTCDateTime((time() + $ttl) * 1000);
-        }
-
-        $this->collection->replaceOne(
-            ['_id' => $key],
-            $doc,
-            ['upsert' => true]
-        );
-    }
-
-    public function has(string $key): bool
-    {
-        $doc = $this->collection->findOne(
-            ['_id' => $key],
-            ['projection' => ['expiresAt' => 1]]
-        );
-
-        if (!$doc) {
-            return false;
-        }
-
-        if (isset($doc['expiresAt']) && $doc['expiresAt'] instanceof \MongoDB\BSON\UTCDateTime) {
-            $expiresAtMs = $doc['expiresAt']->toDateTime()->getTimestamp() * 1000;
-            $nowMs = (int)(microtime(true) * 1000);
-            if ($expiresAtMs < $nowMs) {
-                $this->delete($key);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public function delete(string $key): void
-    {
-        $this->collection->deleteOne(['_id' => $key]);
-    }
-
-    /**
-     * Automatise la configuration de l'index TTL nécessaire dans MongoDB.
-     */
-    public function init(): void
-    {
-        $this->collection->createIndex(
-            ['expiresAt' => 1],
-            ['expireAfterSeconds' => 0]
-        );
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Store;
+
+/**
+ * Adaptateur de stockage MongoDB pour le moteur Fingerprint.
+ * Utilise la bibliothèque officielle mongodb/mongodb.
+ */
+class MongoDbStore implements IStore
+{
+    /**
+     * @var \MongoDB\Collection
+     */
+    private $collection;
+
+    /**
+     * @param \MongoDB\Collection $collection Collection dédiée au stockage des empreintes
+     */
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+    }
+
+    public function get(string $key)
+    {
+        $doc = $this->collection->findOne(['_id' => $key]);
+        if (!$doc) {
+            return null;
+        }
+
+        // Vérification d'expiration active pour bypasser le délai de 60s du démon de MongoDB
+        if (isset($doc['expiresAt'])) {
+            $expiresAt = $doc['expiresAt'];
+            if ($expiresAt instanceof \MongoDB\BSON\UTCDateTime) {
+                $expiresAtMs = $expiresAt->toDateTime()->getTimestamp() * 1000;
+                $nowMs = (int)(microtime(true) * 1000);
+                if ($expiresAtMs < $nowMs) {
+                    $this->delete($key);
+                    return null;
+                }
+            }
+        }
+
+        return isset($doc['value']) ? json_decode($doc['value'], true) : null;
+    }
+
+    public function set(string $key, $value, ?int $ttl = null): void
+    {
+        $doc = [
+            '_id' => $key,
+            'value' => json_encode($value),
+        ];
+
+        if ($ttl !== null && $ttl > 0) {
+            $doc['expiresAt'] = new \MongoDB\BSON\UTCDateTime((time() + $ttl) * 1000);
+        }
+
+        $this->collection->replaceOne(
+            ['_id' => $key],
+            $doc,
+            ['upsert' => true]
+        );
+    }
+
+    public function has(string $key): bool
+    {
+        $doc = $this->collection->findOne(
+            ['_id' => $key],
+            ['projection' => ['expiresAt' => 1]]
+        );
+
+        if (!$doc) {
+            return false;
+        }
+
+        if (isset($doc['expiresAt']) && $doc['expiresAt'] instanceof \MongoDB\BSON\UTCDateTime) {
+            $expiresAtMs = $doc['expiresAt']->toDateTime()->getTimestamp() * 1000;
+            $nowMs = (int)(microtime(true) * 1000);
+            if ($expiresAtMs < $nowMs) {
+                $this->delete($key);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function delete(string $key): void
+    {
+        $this->collection->deleteOne(['_id' => $key]);
+    }
+
+    /**
+     * Automatise la configuration de l'index TTL nécessaire dans MongoDB.
+     */
+    public function init(): void
+    {
+        $this->collection->createIndex(
+            ['expiresAt' => 1],
+            ['expireAfterSeconds' => 0]
+        );
+    }
 }

package/src/php/Store/RedisStore.php

@@ -1,54 +1,54 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Store;
-
-/**
- * Adaptateur de stockage Redis pour le moteur Fingerprint.
- * Compatible avec phpredis et predis.
- */
-class RedisStore implements IStore
-{
-    /**
-     * @var mixed Une instance de \Redis ou de \Predis\Client
-     */
-    private $redis;
-
-    /**
-     * @param mixed $redis Client Redis déjà configuré et connecté
-     */
-    public function __construct($redis)
-    {
-        $this->redis = $redis;
-    }
-
-    public function get(string $key)
-    {
-        $value = $this->redis->get($key);
-        if ($value === false || $value === null) {
-            return null;
-        }
-        return json_decode($value, true);
-    }
-
-    public function set(string $key, $value, ?int $ttl = null): void
-    {
-        $stringValue = json_encode($value);
-        if ($ttl !== null && $ttl > 0) {
-            $this->redis->setex($key, $ttl, $stringValue);
-        } else {
-            $this->redis->set($key, $stringValue);
-        }
-    }
-
-    public function has(string $key): bool
-    {
-        return (bool)$this->redis->exists($key);
-    }
-
-    public function delete(string $key): void
-    {
-        $this->redis->del($key);
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Store;
+
+/**
+ * Adaptateur de stockage Redis pour le moteur Fingerprint.
+ * Compatible avec phpredis et predis.
+ */
+class RedisStore implements IStore
+{
+    /**
+     * @var mixed Une instance de \Redis ou de \Predis\Client
+     */
+    private $redis;
+
+    /**
+     * @param mixed $redis Client Redis déjà configuré et connecté
+     */
+    public function __construct($redis)
+    {
+        $this->redis = $redis;
+    }
+
+    public function get(string $key)
+    {
+        $value = $this->redis->get($key);
+        if ($value === false || $value === null) {
+            return null;
+        }
+        return json_decode($value, true);
+    }
+
+    public function set(string $key, $value, ?int $ttl = null): void
+    {
+        $stringValue = json_encode($value);
+        if ($ttl !== null && $ttl > 0) {
+            $this->redis->setex($key, $ttl, $stringValue);
+        } else {
+            $this->redis->set($key, $stringValue);
+        }
+    }
+
+    public function has(string $key): bool
+    {
+        return (bool)$this->redis->exists($key);
+    }
+
+    public function delete(string $key): void
+    {
+        $this->redis->del($key);
+    }
 }

package/src/php/Tests/ChallengeUtilsTest.php

@@ -1,82 +1,82 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Tests;
-
-use Anonympins\Fingerprint\Challenge\ChallengeUtils;
-use Anonympins\Fingerprint\Utils\BigInt;
-use PHPUnit\Framework\TestCase;
-
-class ChallengeUtilsTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        // Définir une clé secrète pour les tests
-        $_ENV['POW_SECRET'] = 'test-secret-key-that-is-long-enough-for-hmac';
-    }
-
-    public function testIsTicketValid(): void
-    {
-        $ip = '127.0.0.1';
-        $expiry = (int)floor(microtime(true) * 1000) + 3600000; // 1 heure
-        $signature = hash_hmac('sha256', "{$ip}:{$expiry}", $_ENV['POW_SECRET']);
-        $validTicket = "{$expiry}:{$signature}";
-
-        $this->assertTrue(ChallengeUtils::isTicketValid($ip, $validTicket));
-        $this->assertFalse(ChallengeUtils::isTicketValid('192.168.1.1', $validTicket), "Le ticket ne doit pas être valide pour une autre IP.");
-
-        $expiredExpiry = (int)floor(microtime(true) * 1000) - 1000;
-        $expiredSignature = hash_hmac('sha256', "{$ip}:{$expiredExpiry}", $_ENV['POW_SECRET']);
-        $expiredTicket = "{$expiredExpiry}:{$expiredSignature}";
-        $this->assertFalse(ChallengeUtils::isTicketValid($ip, $expiredTicket), "Un ticket expiré doit être invalide.");
-
-        $this->assertFalse(ChallengeUtils::isTicketValid($ip, 'invalid-ticket-format'), "Un format de ticket invalide doit être rejeté.");
-    }
-
-    public function testCpuTargetCalculation(): void
-    {
-        $config = ['cpu' => ['minDifficultyBits' => 8, 'maxDifficultyBits' => 24]];
-
-        // Low suspicion -> minimum difficulty
-        $targetLow = ChallengeUtils::calculateCpuTarget(0.0, $config);
-        $expectedTargetLow = (new BigInt(1))->shiftLeft(256 - 8);
-        $this->assertEquals(0, BigInt::fromHex($targetLow)->compareTo($expectedTargetLow), "Target for 0.0 suspicion should correspond to 8 bits of difficulty.");
-
-        // High suspicion -> maximum difficulty
-        $targetHigh = ChallengeUtils::calculateCpuTarget(1.0, $config);
-        $expectedTargetHigh = (new BigInt(1))->shiftLeft(256 - 24);
-        $this->assertEquals(0, BigInt::fromHex($targetHigh)->compareTo($expectedTargetHigh), "Target for 1.0 suspicion should correspond to 24 bits of difficulty.");
-
-        // Medium suspicion -> intermediate difficulty
-        $targetMid = ChallengeUtils::calculateCpuTarget(0.5, $config);
-        $expectedBits = 8 + 0.5 * (24 - 8); // 16 bits
-        $expectedTargetMid = (new BigInt(1))->shiftLeft(256 - (int)$expectedBits);
-        $this->assertEquals(0, BigInt::fromHex($targetMid)->compareTo($expectedTargetMid), "Target for 0.5 suspicion should correspond to 16 bits of difficulty.");
-    }
-
-    public function testVerifyCpuTargetPoW(): void
-    {
-        $ip = '127.0.0.1';
-        $nonce = 'test-nonce';
-        $fingerprint = 'ua:test-fp';
-        $clientSecret = 'test-secret';
-        $baseBlock = ChallengeUtils::createCpuChallengeBaseBlock($nonce, $clientSecret, $fingerprint);
-
-        // Cible facile pour un test rapide (ex: 4 zéros hexadécimaux -> 16 bits)
-        $targetHex = '0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
-        $challengeContext = ['cpuTarget' => $targetHex, 'baseBlock' => $baseBlock];
-
-        // Trouver une solution valide
-        $solution = 0;
-        while (true) {
-            $hash = hash('sha256', $baseBlock . $solution);
-            if (strcmp($hash, $targetHex) < 0) break;
-            $solution++;
-        }
-
-        $ticket = ChallengeUtils::verifyCpuTargetPoWAndGenerateTicket($ip, 3600, $nonce, (string)$solution, $challengeContext);
-        $this->assertNotNull($ticket, "Un ticket valide aurait dû être généré.");
-        $this->assertTrue(ChallengeUtils::isTicketValid($ip, $ticket));
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Tests;
+
+use Anonympins\Fingerprint\Challenge\ChallengeUtils;
+use Anonympins\Fingerprint\Utils\BigInt;
+use PHPUnit\Framework\TestCase;
+
+class ChallengeUtilsTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        // Définir une clé secrète pour les tests
+        $_ENV['POW_SECRET'] = 'test-secret-key-that-is-long-enough-for-hmac';
+    }
+
+    public function testIsTicketValid(): void
+    {
+        $ip = '127.0.0.1';
+        $expiry = (int)floor(microtime(true) * 1000) + 3600000; // 1 heure
+        $signature = hash_hmac('sha256', "{$ip}:{$expiry}", $_ENV['POW_SECRET']);
+        $validTicket = "{$expiry}:{$signature}";
+
+        $this->assertTrue(ChallengeUtils::isTicketValid($ip, $validTicket));
+        $this->assertFalse(ChallengeUtils::isTicketValid('192.168.1.1', $validTicket), "Le ticket ne doit pas être valide pour une autre IP.");
+
+        $expiredExpiry = (int)floor(microtime(true) * 1000) - 1000;
+        $expiredSignature = hash_hmac('sha256', "{$ip}:{$expiredExpiry}", $_ENV['POW_SECRET']);
+        $expiredTicket = "{$expiredExpiry}:{$expiredSignature}";
+        $this->assertFalse(ChallengeUtils::isTicketValid($ip, $expiredTicket), "Un ticket expiré doit être invalide.");
+
+        $this->assertFalse(ChallengeUtils::isTicketValid($ip, 'invalid-ticket-format'), "Un format de ticket invalide doit être rejeté.");
+    }
+
+    public function testCpuTargetCalculation(): void
+    {
+        $config = ['cpu' => ['minDifficultyBits' => 8, 'maxDifficultyBits' => 24]];
+
+        // Low suspicion -> minimum difficulty
+        $targetLow = ChallengeUtils::calculateCpuTarget(0.0, $config);
+        $expectedTargetLow = (new BigInt(1))->shiftLeft(256 - 8);
+        $this->assertEquals(0, BigInt::fromHex($targetLow)->compareTo($expectedTargetLow), "Target for 0.0 suspicion should correspond to 8 bits of difficulty.");
+
+        // High suspicion -> maximum difficulty
+        $targetHigh = ChallengeUtils::calculateCpuTarget(1.0, $config);
+        $expectedTargetHigh = (new BigInt(1))->shiftLeft(256 - 24);
+        $this->assertEquals(0, BigInt::fromHex($targetHigh)->compareTo($expectedTargetHigh), "Target for 1.0 suspicion should correspond to 24 bits of difficulty.");
+
+        // Medium suspicion -> intermediate difficulty
+        $targetMid = ChallengeUtils::calculateCpuTarget(0.5, $config);
+        $expectedBits = 8 + 0.5 * (24 - 8); // 16 bits
+        $expectedTargetMid = (new BigInt(1))->shiftLeft(256 - (int)$expectedBits);
+        $this->assertEquals(0, BigInt::fromHex($targetMid)->compareTo($expectedTargetMid), "Target for 0.5 suspicion should correspond to 16 bits of difficulty.");
+    }
+
+    public function testVerifyCpuTargetPoW(): void
+    {
+        $ip = '127.0.0.1';
+        $nonce = 'test-nonce';
+        $fingerprint = 'ua:test-fp';
+        $clientSecret = 'test-secret';
+        $baseBlock = ChallengeUtils::createCpuChallengeBaseBlock($nonce, $clientSecret, $fingerprint);
+
+        // Cible facile pour un test rapide (ex: 4 zéros hexadécimaux -> 16 bits)
+        $targetHex = '0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
+        $challengeContext = ['cpuTarget' => $targetHex, 'baseBlock' => $baseBlock];
+
+        // Trouver une solution valide
+        $solution = 0;
+        while (true) {
+            $hash = hash('sha256', $baseBlock . $solution);
+            if (strcmp($hash, $targetHex) < 0) break;
+            $solution++;
+        }
+
+        $ticket = ChallengeUtils::verifyCpuTargetPoWAndGenerateTicket($ip, 3600, $nonce, (string)$solution, $challengeContext);
+        $this->assertNotNull($ticket, "Un ticket valide aurait dû être généré.");
+        $this->assertTrue(ChallengeUtils::isTicketValid($ip, $ticket));
+    }
 }