@anonympins/fingerprint 0.5.1 → 0.5.4

package/src/php/Challenge/ChallengeUtils.php

@@ -638,6 +638,55 @@ class ChallengeUtils
     /**
      * Vérifie une solution de PoW mémoire.
      */
+    private static function getChallengedIndices(string $seed, int $solution, int $numBlocks, int $k = 4): array
+    {
+        $indices = [];
+        $h = (int)bcmod(\Anonympins\Fingerprint\FingerprintBuilder::cyrb53($seed . ":" . $solution), '4294967296');
+        for ($i = 0; $i < $k; $i++) {
+            $h = self::gmp_imul($h ^ $i, 1597334677);
+            $indices[] = abs($h) % $numBlocks;
+        }
+        return $indices;
+    }
+
+    private static function verifyMerkleProof(string $leafHash, int $index, array $proof, string $root): bool
+    {
+        $currentHash = $leafHash;
+        $idx = $index;
+        foreach ($proof as $sibling) {
+            $combined = ($idx % 2 === 0) ? $currentHash . $sibling : $sibling . $currentHash;
+            $currentHash = hash('sha256', hex2bin($combined));
+            $idx = (int)floor($idx / 2);
+        }
+        return $currentHash === $root;
+    }
+
+    private static function verifyMemoryPoWLegacy(string $nonce, int $solution, int $difficulty, string $clientSecret): bool
+    {
+        $size = $difficulty * 1024 * 1024;
+        $iterations = (int)floor($size / 16);
+        $buffer = new \SplFixedArray((int)floor($size / 4));
+
+        $seed = ":{$nonce}:{$clientSecret}";
+        $h = 0;
+        foreach (unpack('C*', $seed) as $byte) {
+            $h += $byte;
+        }
+
+        for ($i = 0; $i < count($buffer); $i++) {
+            $buffer[$i] = $h = self::gmp_imul($h ^ $i, 1597334677);
+        }
+
+        $finalHash = 0;
+        $addr = count($buffer) > 0 ? $buffer[0] % count($buffer) : 0;
+        for ($i = 0; $i < $iterations; $i++) {
+            $addr = $buffer[$addr] % count($buffer);
+            $finalHash ^= $addr;
+        }
+
+        return $finalHash === $solution;
+    }
+
     public static function verifyMemoryPoW(
         string $nonce,
         string $solution,
@@ -654,37 +703,69 @@ class ChallengeUtils
             return false;
         }
 
-        // If difficulty is high (production workloads), we treat memory PoW purely as a client-side cost.
-        // Cryptographic integrity is already fully enforced by the chained CPU PoW verification.
-        if ($difficulty > 4) {
-            return true;
+        $data = json_decode($solution, true);
+        if (json_last_error() !== JSON_ERROR_NONE || !isset($data['solution']) || !isset($data['merkleRoot']) || !isset($data['proofs'])) {
+            if ($difficulty <= 4 && preg_match('/^\d+$/', $solution)) {
+                return self::verifyMemoryPoWLegacy($nonce, (int)$solution, $difficulty, $clientSecret);
+            }
+            return false;
         }
 
-        $size = $difficulty * 1024 * 1024;
-        if ($size <= 0) {
-            return true; // Pas de challenge mémoire si la difficulté est nulle ou négative.
-        }
-        $iterations = (int)floor($size / 16);
-        $buffer = new \SplFixedArray((int)floor($size / 4));
+        $sol = $data['solution'];
+        $merkleRoot = $data['merkleRoot'];
+        $proofs = $data['proofs'];
 
+        $numBlocks = $difficulty * 256;
         $seed = ":{$nonce}:{$clientSecret}";
-        $h = 0;
-        foreach (unpack('C*', $seed) as $byte) {
-            $h += $byte;
-        }
 
-        for ($i = 0; $i < count($buffer); $i++) {
-            $buffer[$i] = $h = self::gmp_imul($h ^ $i, 1597334677);
+        $challengedIndices = self::getChallengedIndices($seed, (int)$sol, $numBlocks, 4);
+
+        foreach ($challengedIndices as $b) {
+            $proof = $proofs[$b] ?? $proofs[(string)$b] ?? null;
+            if ($proof === null) return false;
+
+            $blockBytes = '';
+            $h = (int)bcmod(\Anonympins\Fingerprint\FingerprintBuilder::cyrb53($seed . ":" . $b), '4294967296');
+            for ($i = 0; $i < 1024; $i++) {
+                $h = self::gmp_imul($h ^ $i, 1597334677);
+                $blockBytes .= pack('V', $h);
+            }
+
+            $expectedLeaf = hash('sha256', $blockBytes);
+
+            if (!self::verifyMerkleProof($expectedLeaf, $b, $proof, $merkleRoot)) {
+                return false;
+            }
         }
 
-        $finalHash = 0;
-        $addr = count($buffer) > 0 ? $buffer[0] % count($buffer) : 0;
+        $blockCache = [];
+        $getBlockElement = function (int $blockIdx, int $elementIdx) use (&$blockCache, $seed): int {
+            if (!isset($blockCache[$blockIdx])) {
+                $block = [];
+                $h = (int)bcmod(\Anonympins\Fingerprint\FingerprintBuilder::cyrb53($seed . ":" . $blockIdx), '4294967296');
+                for ($i = 0; $i < 1024; $i++) {
+                    $h = self::gmp_imul($h ^ $i, 1597334677);
+                    $block[$i] = $h;
+                }
+                $blockCache[$blockIdx] = $block;
+            }
+            return $blockCache[$blockIdx][$elementIdx];
+        };
+
+        $totalElements = $numBlocks * 1024;
+        $addr = $totalElements > 0 ? $getBlockElement(0, 0) % $totalElements : 0;
+        $addr = $addr & 0xffffffff;
+        $expectedSolution = 0;
+        $iterations = 1024;
         for ($i = 0; $i < $iterations; $i++) {
-            $addr = $buffer[$addr] % count($buffer);
-            $finalHash ^= $addr;
+            $blockIdx = (int)floor($addr / 1024);
+            $elementIdx = $addr % 1024;
+            $addr = $getBlockElement($blockIdx, $elementIdx) % $totalElements;
+            $addr = $addr & 0xffffffff;
+            $expectedSolution ^= $addr;
         }
 
-        return $finalHash === (int)$solution;
+        return $expectedSolution === (int)$sol;
     }
 
     /**
@@ -758,17 +839,23 @@ class ChallengeUtils
 
         $solverCode = self::getPowSolverCode();
         $queriesJson = json_encode($queries);
+        $coopTimeout = $securityConfig['pospace']['coopTimeout'] ?? 15;
+
+        $safePath = json_encode($path, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
+        $safeNonce = json_encode($nonce, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
+        $safeClientSecret = json_encode($clientSecret, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
 
         $challengeScript = <<<JS
           async function solve() {
-            const nonce = "{$nonce}";
-            const path = "{$path}";
-            const clientSecret = "{$clientSecret}";
+            const nonce = {$safeNonce};
+            const path = {$safePath};
+            const clientSecret = {$safeClientSecret};
             const queries = {$queriesJson};
             const sizeMb = {$sizeMb};
             const nodeId = "{$nodeId}";
             const peerId = "{$peerId}";
             const peerBlockIdx = {$peerBlockIdx};
+            const coopTimeout = {$coopTimeout};
             
             document.getElementById('loader').innerText = '⚙️ Checking persistent local storage...';
             await new Promise(r => setTimeout(r, 10));
@@ -804,7 +891,7 @@ class ChallengeUtils
                     await fetch(window.location.pathname + "?coop_op=request_peer_block&node_id=" + nodeId + "&peer_id=" + peerId + "&block_idx=" + peerBlockIdx + "&req_id=" + reqId);
                     
                     let attempts = 0;
-                    while (attempts < 15) {
+                    while (attempts < coopTimeout) {
                         const res = await fetch(window.location.pathname + "?coop_op=poll_response&node_id=" + nodeId + "&req_id=" + reqId);
                         const data = await res.json();
                         if (data.status === 'ready') {
@@ -859,18 +946,33 @@ JS;
         $baseBlock = self::createCpuChallengeBaseBlock($nonce, $clientSecret, $originalFingerprint);
         $baseBlockBytes = '[' . implode(',', array_values(unpack('C*', $baseBlock))) . ']';
 
-        $trapLinksHtml = implode(' ', array_map(
-            fn($url, $index) => "<a href=\"{$url}\" tabindex=\"-1\"><span>&gt; " . ($index + 1) . "</span></a>",
-            $trapUrls,
-            array_keys($trapUrls)
-        ));
-        $trapContainerHtml = "<div style=\"position:absolute;left:-9999px;top:-9999px;transform:scale(0);pointer-events:none;\" aria-hidden=\"true\">{$trapLinksHtml}</div>";
+        $trapTags = ['div', 'span', 'p', 'section'];
+        $selectedTrapTag = $trapTags[array_rand($trapTags)];
+        $layoutProps = [
+            'position:absolute;left:-9999px;top:-9999px;transform:scale(0);pointer-events:none;',
+            'position:fixed;left:-8888px;top:-8888px;opacity:0;pointer-events:none;width:0;height:0;overflow:hidden;',
+            'display:none;visibility:hidden;pointer-events:none;'
+        ];
+        $selectedLayout = $layoutProps[array_rand($layoutProps)];
+
+        $trapLinks = [];
+        foreach ($trapUrls as $index => $url) {
+            $nestingType = rand(0, 2);
+            $innerHtml = ($nestingType === 1) ? "<b>&gt; " . ($index + 1) . "</b>" : (($nestingType === 2) ? "<i>&gt; " . ($index + 1) . "</i>" : "<span>&gt; " . ($index + 1) . "</span>");
+            $trapLinks[] = "<a href=\"{$url}\" tabindex=\"-1\">{$innerHtml}</a>";
+        }
+        $trapLinksHtml = implode(' ', $trapLinks);
+        $trapContainerHtml = "<{$selectedTrapTag} style=\"{$selectedLayout}\" aria-hidden=\"true\">{$trapLinksHtml}</{$selectedTrapTag}>";
+
+        $safePath = json_encode($path, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
+        $safeNonce = json_encode($nonce, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
+        $safeClientSecret = json_encode($clientSecret, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES);
 
         $challengeScript = <<<JS
           async function solve() {
-            const nonce = "{$nonce}";
-            const path = "{$path}";
-            const clientSecret = "{$clientSecret}";
+            const nonce = {$safeNonce};
+            const path = {$safePath};
+            const clientSecret = {$safeClientSecret};
             const cpuTarget = BigInt("0x" + "{$target}");
             const memDifficulty = {$memoryDifficulty};
             const baseBlock = new Uint8Array({$baseBlockBytes});
@@ -891,7 +993,7 @@ JS;
                 return;
             }
 
-            const finalUrl = path + "?pow_type=cpu_mem&pow_nonce=" + nonce + "&pow_solution_cpu=" + cpuSolution + "&pow_solution_mem=" + memSolution;
+        const finalUrl = path + "?pow_type=cpu_mem&pow_nonce=" + nonce + "&pow_solution_cpu=" + cpuSolution + "&pow_solution_mem=" + encodeURIComponent(JSON.stringify(memSolution));
             window.location.href = finalUrl;
           }
           solve();

package/src/php/FingerprintClient.php

@@ -77,13 +77,30 @@ class FingerprintClient
             $this->clientConfig['honeypots'][] = $fieldName;
         }
 
-        // Styles CSS pour cacher le champ de manière robuste.
-        $styles = 'position:absolute; left:-9999px; top:-9999px; transform:scale(0); opacity:0; pointer-events:none;';
+        // Styles CSS polymorphiques pour cacher le champ de manière robuste.
+        $styleOptions = [
+            'position:absolute; left:-9999px; top:-9999px; transform:scale(0); opacity:0; pointer-events:none;',
+            'position:fixed; left:-8888px; top:-8888px; width:0; height:0; overflow:hidden; opacity:0; pointer-events:none;',
+            'display:none; visibility:hidden; pointer-events:none;'
+        ];
+        $styles = $styleOptions[array_rand($styleOptions)];
+
+        $containerTags = ['div', 'span', 'p', 'section'];
+        $tag = $containerTags[array_rand($containerTags)];
+
+        $nestingType = rand(0, 1);
+        if ($nestingType === 1) {
+            return '<' . $tag . ' style="' . $styles . '" aria-hidden="true">'
+                . '<label for="' . htmlspecialchars($fieldName) . '">' . htmlspecialchars($fieldName) 
+                . '<input type="text" id="' . htmlspecialchars($fieldName) . '" name="' . htmlspecialchars($fieldName) . '" tabindex="-1" autocomplete="off">'
+                . '</label>'
+                . '</' . $tag . '>';
+        }
 
-        return '<div style="' . $styles . '" aria-hidden="true">'
-            . '<label for="' . htmlspecialchars($fieldName) . '">' . $fieldName . '</label>'
+        return '<' . $tag . ' style="' . $styles . '" aria-hidden="true">'
+            . '<label for="' . htmlspecialchars($fieldName) . '">' . htmlspecialchars($fieldName) . '</label>'
             . '<input type="text" id="' . htmlspecialchars($fieldName) . '" name="' . htmlspecialchars($fieldName) . '" tabindex="-1" autocomplete="off">'
-            . '</div>';
+            . '</' . $tag . '>';
     }
 
     /**