@anonympins/fingerprint 0.5.2 → 0.5.4

package/src/php/Utils/BigInt.php

@@ -1,203 +1,203 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Utils;
-
-class BigInt
-{
-    private static ?bool $useGmp = null;
-    /** @var \GMP|string */
-    private $value;
-
-    private static function useGmp(): bool
-    {
-        if (self::$useGmp === null) {
-            self::$useGmp = extension_loaded('gmp');
-        }
-        return self::$useGmp;
-    }
-
-    /**
-     * @param \GMP|string|int $number Le nombre initial.
-     */
-    public function __construct($number)
-    {
-        if (self::useGmp()) {
-            if ($number instanceof \GMP) {
-                $this->value = $number;
-            } else {
-                $str = (string)$number;
-                if (($dot = strpos($str, '.')) !== false) {
-                    $str = substr($str, 0, $dot);
-                }
-                $this->value = gmp_init($str);
-            }
-        } else {
-            if ($number instanceof BigInt) {
-                $this->value = $number->value;
-            } else {
-                $str = (string)$number;
-                if (($dot = strpos($str, '.')) !== false) {
-                    $str = substr($str, 0, $dot);
-                }
-                $this->value = $str;
-            }
-        }
-    }
-
-    /**
-     * Crée une instance à partir d'une chaîne hexadécimale.
-     */
-    public static function fromHex(string $hex): BigInt
-    {
-        $hex = trim(strtolower($hex));
-        if (substr($hex, 0, 2) === '0x') {
-            $hex = substr($hex, 2);
-        }
-        if (self::useGmp()) {
-            return new self(gmp_init($hex, 16));
-        } else {
-            $dec = '0';
-            $len = strlen($hex);
-            for ($i = 0; $i < $len; $i++) {
-                $dec = bcadd(bcmul($dec, '16', 0), (string)hexdec($hex[$i]), 0);
-            }
-            return new self($dec);
-        }
-    }
-
-    /**
-     * Compare cette instance avec une autre.
-     * @return int < 0 si this < other, 0 si this == other, > 0 si this > other.
-     */
-    public function compareTo(BigInt $other): int
-    {
-        if (self::useGmp()) {
-            return gmp_cmp($this->value, $other->value);
-        } else {
-            return bccomp($this->value, $other->value, 0);
-        }
-    }
-
-    /**
-     * Effectue un décalage de bits vers la gauche (<<).
-     */
-    public function shiftLeft(int $bits): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_mul($this->value, gmp_pow("2", $bits)));
-        } else {
-            return new self(bcmul($this->value, bcpow("2", (string)$bits, 0), 0));
-        }
-    }
-
-    /**
-     * Effectue un décalage de bits vers la droite (>>).
-     */
-    public function shiftRight(int $bits): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_div_q($this->value, gmp_pow("2", $bits)));
-        } else {
-            return new self(bcdiv($this->value, bcpow("2", (string)$bits, 0), 0));
-        }
-    }
-
-    /**
-     * Retourne la représentation en chaîne de caractères.
-     */
-    public function __toString(): string
-    {
-        if (self::useGmp()) {
-            return gmp_strval($this->value);
-        } else {
-            return $this->value;
-        }
-    }
-
-    /**
-     * Retourne la représentation hexadécimale.
-     */
-    public function toHex(): string
-    {
-        if (self::useGmp()) {
-            return gmp_strval($this->value, 16);
-        } else {
-            $hex = '';
-            $dec = $this->value;
-            while (bccomp($dec, '0', 0) > 0) {
-                $rem = bcmod($dec, '16', 0);
-                $hex = dechex((int)$rem) . $hex;
-                $dec = bcdiv($dec, '16', 0);
-            }
-            return $hex ?: '0';
-        }
-    }
-
-    /**
-     * Crée une instance à partir d'une puissance de 2.
-     */
-    public static function pow(int $base, int $exp): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_pow((string)$base, $exp));
-        } else {
-            return new self(bcpow((string)$base, (string)$exp, 0));
-        }
-    }
-
-    /**
-     * Soustrait un autre BigInt.
-     */
-    public function sub(BigInt $other): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_sub($this->value, $other->value));
-        } else {
-            return new self(bcsub($this->value, $other->value, 0));
-        }
-    }
-
-    /**
-     * Computes ($this ^ $exponent) % $modulus
-     */
-    public function modPow(BigInt $exponent, BigInt $modulus): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_powm($this->value, $exponent->value, $modulus->value));
-        } else {
-            return new self(bcpowmod((string)$this->value, (string)$exponent->value, (string)$modulus->value, 0));
-        }
-    }
-
-    /**
-     * Computes $this % $modulus
-     */
-    public function mod(BigInt $modulus): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_mod($this->value, $modulus->value));
-        } else {
-            return new self(bcmod((string)$this->value, (string)$modulus->value, 0));
-        }
-    }
-
-    public function add(BigInt $other): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_add($this->value, $other->value));
-        } else {
-            return new self(bcadd((string)$this->value, (string)$other->value, 0));
-        }
-    }
-
-    public function mul(BigInt $other): BigInt
-    {
-        if (self::useGmp()) {
-            return new self(gmp_mul($this->value, $other->value));
-        } else {
-            return new self(bcmul((string)$this->value, (string)$other->value, 0));
-        }
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Utils;
+
+class BigInt
+{
+    private static ?bool $useGmp = null;
+    /** @var \GMP|string */
+    private $value;
+
+    private static function useGmp(): bool
+    {
+        if (self::$useGmp === null) {
+            self::$useGmp = extension_loaded('gmp');
+        }
+        return self::$useGmp;
+    }
+
+    /**
+     * @param \GMP|string|int $number Le nombre initial.
+     */
+    public function __construct($number)
+    {
+        if (self::useGmp()) {
+            if ($number instanceof \GMP) {
+                $this->value = $number;
+            } else {
+                $str = (string)$number;
+                if (($dot = strpos($str, '.')) !== false) {
+                    $str = substr($str, 0, $dot);
+                }
+                $this->value = gmp_init($str);
+            }
+        } else {
+            if ($number instanceof BigInt) {
+                $this->value = $number->value;
+            } else {
+                $str = (string)$number;
+                if (($dot = strpos($str, '.')) !== false) {
+                    $str = substr($str, 0, $dot);
+                }
+                $this->value = $str;
+            }
+        }
+    }
+
+    /**
+     * Crée une instance à partir d'une chaîne hexadécimale.
+     */
+    public static function fromHex(string $hex): BigInt
+    {
+        $hex = trim(strtolower($hex));
+        if (substr($hex, 0, 2) === '0x') {
+            $hex = substr($hex, 2);
+        }
+        if (self::useGmp()) {
+            return new self(gmp_init($hex, 16));
+        } else {
+            $dec = '0';
+            $len = strlen($hex);
+            for ($i = 0; $i < $len; $i++) {
+                $dec = bcadd(bcmul($dec, '16', 0), (string)hexdec($hex[$i]), 0);
+            }
+            return new self($dec);
+        }
+    }
+
+    /**
+     * Compare cette instance avec une autre.
+     * @return int < 0 si this < other, 0 si this == other, > 0 si this > other.
+     */
+    public function compareTo(BigInt $other): int
+    {
+        if (self::useGmp()) {
+            return gmp_cmp($this->value, $other->value);
+        } else {
+            return bccomp($this->value, $other->value, 0);
+        }
+    }
+
+    /**
+     * Effectue un décalage de bits vers la gauche (<<).
+     */
+    public function shiftLeft(int $bits): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_mul($this->value, gmp_pow("2", $bits)));
+        } else {
+            return new self(bcmul($this->value, bcpow("2", (string)$bits, 0), 0));
+        }
+    }
+
+    /**
+     * Effectue un décalage de bits vers la droite (>>).
+     */
+    public function shiftRight(int $bits): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_div_q($this->value, gmp_pow("2", $bits)));
+        } else {
+            return new self(bcdiv($this->value, bcpow("2", (string)$bits, 0), 0));
+        }
+    }
+
+    /**
+     * Retourne la représentation en chaîne de caractères.
+     */
+    public function __toString(): string
+    {
+        if (self::useGmp()) {
+            return gmp_strval($this->value);
+        } else {
+            return $this->value;
+        }
+    }
+
+    /**
+     * Retourne la représentation hexadécimale.
+     */
+    public function toHex(): string
+    {
+        if (self::useGmp()) {
+            return gmp_strval($this->value, 16);
+        } else {
+            $hex = '';
+            $dec = $this->value;
+            while (bccomp($dec, '0', 0) > 0) {
+                $rem = bcmod($dec, '16', 0);
+                $hex = dechex((int)$rem) . $hex;
+                $dec = bcdiv($dec, '16', 0);
+            }
+            return $hex ?: '0';
+        }
+    }
+
+    /**
+     * Crée une instance à partir d'une puissance de 2.
+     */
+    public static function pow(int $base, int $exp): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_pow((string)$base, $exp));
+        } else {
+            return new self(bcpow((string)$base, (string)$exp, 0));
+        }
+    }
+
+    /**
+     * Soustrait un autre BigInt.
+     */
+    public function sub(BigInt $other): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_sub($this->value, $other->value));
+        } else {
+            return new self(bcsub($this->value, $other->value, 0));
+        }
+    }
+
+    /**
+     * Computes ($this ^ $exponent) % $modulus
+     */
+    public function modPow(BigInt $exponent, BigInt $modulus): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_powm($this->value, $exponent->value, $modulus->value));
+        } else {
+            return new self(bcpowmod((string)$this->value, (string)$exponent->value, (string)$modulus->value, 0));
+        }
+    }
+
+    /**
+     * Computes $this % $modulus
+     */
+    public function mod(BigInt $modulus): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_mod($this->value, $modulus->value));
+        } else {
+            return new self(bcmod((string)$this->value, (string)$modulus->value, 0));
+        }
+    }
+
+    public function add(BigInt $other): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_add($this->value, $other->value));
+        } else {
+            return new self(bcadd((string)$this->value, (string)$other->value, 0));
+        }
+    }
+
+    public function mul(BigInt $other): BigInt
+    {
+        if (self::useGmp()) {
+            return new self(gmp_mul($this->value, $other->value));
+        } else {
+            return new self(bcmul((string)$this->value, (string)$other->value, 0));
+        }
+    }
 }

package/src/php/Utils/RequestUtils.php

@@ -1175,14 +1175,39 @@ class RequestUtils
             $networkBinary = $ipBinary & $mask;
             return inet_ntop($networkBinary) . '/' . $ipv4Prefix;
         } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            $ipBinary = inet_pton($ip);
-            if ($ipBinary === false) return null;
-
-            $mask = self::generateMask($ipv6Prefix, 16);
-            if ($mask === null) return null;
-
-            $networkBinary = $ipBinary & $mask;
-            return inet_ntop($networkBinary) . '/' . $ipv6Prefix; // FIX: Use the provided ipv6Prefix
+            $normalized = trim(strtolower($ip));
+            if (str_contains($normalized, '::')) {
+                $parts = explode('::', $normalized, 2);
+                $left = $parts[0] !== '' ? explode(':', $parts[0]) : [];
+                $right = $parts[1] !== '' ? explode(':', $parts[1]) : [];
+                $missing = 8 - (count($left) + count($right));
+                $middle = array_fill(0, $missing, '0000');
+                $groups = array_merge($left, $middle, $right);
+            } else {
+                $groups = explode(':', $normalized);
+                if (count($groups) !== 8) {
+                    return null;
+                }
+            }
+            foreach ($groups as $i => &$g) {
+                $val = hexdec($g);
+                $g = str_pad(dechex($val), 4, '0', STR_PAD_LEFT);
+            }
+            unset($g);
+            for ($i = 0; $i < 8; $i++) {
+                $startBit = $i * 16;
+                if ($ipv6Prefix >= ($i + 1) * 16) {
+                    continue;
+                } elseif ($ipv6Prefix <= $startBit) {
+                    $groups[$i] = '0000';
+                } else {
+                    $bitsToKeep = $ipv6Prefix - $startBit;
+                    $val = hexdec($groups[$i]);
+                    $mask = (0xffff << (16 - $bitsToKeep)) & 0xffff;
+                    $groups[$i] = str_pad(dechex($val & $mask), 4, '0', STR_PAD_LEFT);
+                }
+            }
+            return implode(':', $groups) . '/' . $ipv6Prefix;
         }
         return null;
     }
@@ -1382,29 +1407,62 @@ class RequestUtils
             return [];
         }
 
-        $tempSanitized = [];
+        $suspiciousLogs = [];
+        $passedLogs = [];
         $deviceCounts = [];
         $ipCounts = [];
         $subnetCounts = [];
+        $hardwareClusterCounts = [];
+        $hwClusterCache = [];
 
         $totalCount = count($trafficData);
         $maxLogsPerDevice = max(3, (int)floor($totalCount * 0.02)); // Max 2% contribution per device
         $maxLogsPerIp = max(3, (int)floor($totalCount * 0.02));      // Max 2% par adresse IP individuelle
         $maxLogsPerSubnet = max(5, (int)floor($totalCount * 0.05));  // Max 5% par bloc réseau (anti-proxy-rotation)
+        $maxLogsPerHardwareCluster = max(3, (int)floor($totalCount * 0.02)); // Max 2% par cluster matériel stable
+
+        $getHardwareCluster = function (array $log) use (&$hwClusterCache): string {
+            $fp = $log['deviceHash'] ?? $log['fingerprint'] ?? $log['deviceFingerprint'] ?? '';
+            if (!empty($fp) && is_string($fp)) {
+                if (isset($hwClusterCache[$fp])) {
+                    return $hwClusterCache[$fp];
+                }
+                $parts = explode('|', $fp);
+                $hwComponents = [];
+                foreach ($parts as $part) {
+                    $pair = explode(':', $part, 2);
+                    if (count($pair) === 2 && in_array($pair[0], ['gpu', 'cvs', 'hw'], true)) {
+                        $hwComponents[] = $part;
+                    }
+                }
+                if (!empty($hwComponents)) {
+                    sort($hwComponents);
+                    $result = implode('|', $hwComponents);
+                } else {
+                    $result = $log['deviceId'] ?? 'anonymous-cluster';
+                }
+                $hwClusterCache[$fp] = $result;
+                return $result;
+            }
+            return $log['deviceId'] ?? 'anonymous-cluster';
+        };
 
         foreach ($trafficData as $log) {
             $devId = $log['deviceId'] ?? 'anonymous';
             $ip = $log['clientIp'] ?? $log['ip'] ?? 'unknown';
             $subnet = self::getIpSubnet($ip) ?? 'unknown-subnet';
+            $hwCluster = $getHardwareCluster($log);
 
             $currentDeviceCount = $deviceCounts[$devId] ?? 0;
             $currentIpCount = $ipCounts[$ip] ?? 0;
             $currentSubnetCount = $subnetCounts[$subnet] ?? 0;
+            $currentHwClusterCount = $hardwareClusterCounts[$hwCluster] ?? 0;
 
             if (
                 $currentDeviceCount < $maxLogsPerDevice &&
                 ($ip === 'unknown' || $currentIpCount < $maxLogsPerIp) &&
-                ($subnet === 'unknown-subnet' || $currentSubnetCount < $maxLogsPerSubnet)
+                ($subnet === 'unknown-subnet' || $currentSubnetCount < $maxLogsPerSubnet) &&
+                $currentHwClusterCount < $maxLogsPerHardwareCluster
             ) {
                 $deviceCounts[$devId] = $currentDeviceCount + 1;
                 if ($ip !== 'unknown') {
@@ -1413,17 +1471,12 @@ class RequestUtils
                 if ($subnet !== 'unknown-subnet') {
                     $subnetCounts[$subnet] = $currentSubnetCount + 1;
                 }
-                $tempSanitized[] = $log;
-            }
-        }
-
-        $passedLogs = [];
-        $suspiciousLogs = [];
-        foreach ($tempSanitized as $log) {
-            if (($log['type'] ?? '') === 'request_passed') {
-                $passedLogs[] = $log;
-            } else {
-                $suspiciousLogs[] = $log;
+                $hardwareClusterCounts[$hwCluster] = $currentHwClusterCount + 1;
+                if (($log['type'] ?? '') === 'request_passed') {
+                    $passedLogs[] = $log;
+                } else {
+                    $suspiciousLogs[] = $log;
+                }
             }
         }