nextcloud / server

lib/private/Security/Normalizer/IpAddress.php

Indentation +90 added lines, -90 removed lines

@@ -17,94 +17,94 @@
  * @package OC\Security\Normalizer
  */
 class IpAddress {
-	/**
-	 * @param string $ip IP to normalize
-	 */
-	public function __construct(
-		private string $ip,
-	) {
-	}
-
-	/**
-	 * Return the given subnet for an IPv6 address
-	 * Rely on security.ipv6_normalized_subnet_size, defaults to 56
-	 */
-	private function getIPv6Subnet(string $ip): string {
-		if (str_starts_with($ip, '[') && str_ends_with($ip, ']')) {
-			$ip = substr($ip, 1, -1);
-		}
-
-		// Remove explicit interface if present (e.g., %enp2s0)
-		$pos = strpos($ip, '%');
-		if ($pos !== false) {
-			$ip = substr($ip, 0, $pos);
-		}
-
-		$config = \OCP\Server::get(IConfig::class);
-		$maskSize = min(64, max(32, $config->getSystemValueInt('security.ipv6_normalized_subnet_size', 56)));
-
-		$binary = inet_pton($ip);
-		if ($binary === false) {
-			return $ip . '/' . $maskSize;
-		}
-
-		if (PHP_INT_SIZE === 4) {
-			// 32-bit PHP
-			$value = match($maskSize) {
-				64 => -1,
-				63 => PHP_INT_MAX,
-				default => (1 << ($maskSize - 32)) - 1,
-			};
-			// as long as we support 32bit PHP we cannot use the `P` pack formatter (and not overflow 32bit integer)
-			$mask = pack('VVVV', -1, $value, 0, 0);
-		} else {
-			// 64-bit PHP
-			$mask = pack('VVP', (1 << 32) - 1, (1 << ($maskSize - 32)) - 1, 0);
-		}
-
-		return inet_ntop($binary & $mask) . '/' . $maskSize;
-	}
-
-	/**
-	 * Returns the IPv4 address embedded in an IPv6 if applicable.
-	 * The detected format is "::ffff:x.x.x.x" using the binary form.
-	 *
-	 * @return string|null embedded IPv4 string or null if none was found
-	 */
-	private function getEmbeddedIpv4(string $ipv6): ?string {
-		$binary = inet_pton($ipv6);
-		if ($binary === false) {
-			return null;
-		}
-
-		$mask = inet_pton('::FFFF:FFFF');
-		if (($binary & ~$mask) !== inet_pton('::FFFF:0.0.0.0')) {
-			return null;
-		}
-
-		return inet_ntop(substr($binary, -4));
-	}
-
-	/**
-	 * Gets either the /32 (IPv4) or the /56 (default for IPv6) subnet of an IP address
-	 */
-	public function getSubnet(): string {
-		if (filter_var($this->ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-			return $this->ip . '/32';
-		}
-
-		$ipv4 = $this->getEmbeddedIpv4($this->ip);
-		if ($ipv4 !== null) {
-			return $ipv4 . '/32';
-		}
-
-		return $this->getIPv6Subnet($this->ip);
-	}
-
-	/**
-	 * Returns the specified IP address
-	 */
-	public function __toString(): string {
-		return $this->ip;
-	}
+    /**
+     * @param string $ip IP to normalize
+     */
+    public function __construct(
+        private string $ip,
+    ) {
+    }
+
+    /**
+     * Return the given subnet for an IPv6 address
+     * Rely on security.ipv6_normalized_subnet_size, defaults to 56
+     */
+    private function getIPv6Subnet(string $ip): string {
+        if (str_starts_with($ip, '[') && str_ends_with($ip, ']')) {
+            $ip = substr($ip, 1, -1);
+        }
+
+        // Remove explicit interface if present (e.g., %enp2s0)
+        $pos = strpos($ip, '%');
+        if ($pos !== false) {
+            $ip = substr($ip, 0, $pos);
+        }
+
+        $config = \OCP\Server::get(IConfig::class);
+        $maskSize = min(64, max(32, $config->getSystemValueInt('security.ipv6_normalized_subnet_size', 56)));
+
+        $binary = inet_pton($ip);
+        if ($binary === false) {
+            return $ip . '/' . $maskSize;
+        }
+
+        if (PHP_INT_SIZE === 4) {
+            // 32-bit PHP
+            $value = match($maskSize) {
+                64 => -1,
+                63 => PHP_INT_MAX,
+                default => (1 << ($maskSize - 32)) - 1,
+            };
+            // as long as we support 32bit PHP we cannot use the `P` pack formatter (and not overflow 32bit integer)
+            $mask = pack('VVVV', -1, $value, 0, 0);
+        } else {
+            // 64-bit PHP
+            $mask = pack('VVP', (1 << 32) - 1, (1 << ($maskSize - 32)) - 1, 0);
+        }
+
+        return inet_ntop($binary & $mask) . '/' . $maskSize;
+    }
+
+    /**
+     * Returns the IPv4 address embedded in an IPv6 if applicable.
+     * The detected format is "::ffff:x.x.x.x" using the binary form.
+     *
+     * @return string|null embedded IPv4 string or null if none was found
+     */
+    private function getEmbeddedIpv4(string $ipv6): ?string {
+        $binary = inet_pton($ipv6);
+        if ($binary === false) {
+            return null;
+        }
+
+        $mask = inet_pton('::FFFF:FFFF');
+        if (($binary & ~$mask) !== inet_pton('::FFFF:0.0.0.0')) {
+            return null;
+        }
+
+        return inet_ntop(substr($binary, -4));
+    }
+
+    /**
+     * Gets either the /32 (IPv4) or the /56 (default for IPv6) subnet of an IP address
+     */
+    public function getSubnet(): string {
+        if (filter_var($this->ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            return $this->ip . '/32';
+        }
+
+        $ipv4 = $this->getEmbeddedIpv4($this->ip);
+        if ($ipv4 !== null) {
+            return $ipv4 . '/32';
+        }
+
+        return $this->getIPv6Subnet($this->ip);
+    }
+
+    /**
+     * Returns the specified IP address
+     */
+    public function __toString(): string {
+        return $this->ip;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 
 		$binary = inet_pton($ip);
 		if ($binary === false) {
-			return $ip . '/' . $maskSize;
+			return $ip.'/'.$maskSize;
 		}
 
 		if (PHP_INT_SIZE === 4) {
@@ -62,7 +62,7 @@ 
 			$mask = pack('VVP', (1 << 32) - 1, (1 << ($maskSize - 32)) - 1, 0);
 		}
 
-		return inet_ntop($binary & $mask) . '/' . $maskSize;
+		return inet_ntop($binary & $mask).'/'.$maskSize;
 	}
 
 	/**
@@ -90,12 +90,12 @@ 
 	 */
 	public function getSubnet(): string {
 		if (filter_var($this->ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-			return $this->ip . '/32';
+			return $this->ip.'/32';
 		}
 
 		$ipv4 = $this->getEmbeddedIpv4($this->ip);
 		if ($ipv4 !== null) {
-			return $ipv4 . '/32';
+			return $ipv4.'/32';
 		}
 
 		return $this->getIPv6Subnet($this->ip);