nextcloud / server

lib/private/Http/Client/DnsPinMiddleware.php

Indentation +104 added lines, -104 removed lines

@@ -28,108 +28,108 @@
 use Psr\Http\Message\RequestInterface;
 
 class DnsPinMiddleware {
-	/** @var NegativeDnsCache */
-	private $negativeDnsCache;
-	/** @var LocalAddressChecker */
-	private $localAddressChecker;
-
-	public function __construct(
-		NegativeDnsCache $negativeDnsCache,
-		LocalAddressChecker $localAddressChecker
-	) {
-		$this->negativeDnsCache = $negativeDnsCache;
-		$this->localAddressChecker = $localAddressChecker;
-	}
-
-	private function dnsResolve(string $target, int $recursionCount) : array {
-		if ($recursionCount >= 10) {
-			return [];
-		}
-
-		$recursionCount = $recursionCount++;
-		$targetIps = [];
-
-		$soaDnsEntry = dns_get_record($target, DNS_SOA);
-		if (isset($soaDnsEntry[0]) && isset($soaDnsEntry[0]['minimum-ttl'])) {
-			$dnsNegativeTtl = $soaDnsEntry[0]['minimum-ttl'];
-		} else {
-			$dnsNegativeTtl = null;
-		}
-
-		$dnsTypes = [DNS_A, DNS_AAAA, DNS_CNAME];
-		foreach ($dnsTypes as $key => $dnsType) {
-			if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) {
-				unset($dnsTypes[$key]);
-				continue;
-			}
-
-			$dnsResponses = dns_get_record($target, $dnsType);
-			$canHaveCnameRecord = true;
-			if (count($dnsResponses) > 0) {
-				foreach ($dnsResponses as $key => $dnsResponse) {
-					if (isset($dnsResponse['ip'])) {
-						$targetIps[] = $dnsResponse['ip'];
-						$canHaveCnameRecord = false;
-					} elseif (isset($dnsResponse['ipv6'])) {
-						$targetIps[] = $dnsResponse['ipv6'];
-						$canHaveCnameRecord = false;
-					} elseif (isset($dnsResponse['target']) && $canHaveCnameRecord) {
-						$targetIps = array_merge($targetIps, $this->dnsResolve($dnsResponse['target'], $recursionCount));
-						$canHaveCnameRecord = true;
-					}
-				}
-			} else {
-				if ($dnsNegativeTtl !== null) {
-					$this->negativeDnsCache->setNegativeCacheForDnsType($target, $dnsType, $dnsNegativeTtl);
-				}
-			}
-		}
-
-		return $targetIps;
-	}
-
-	public function addDnsPinning() {
-		return function (callable $handler) {
-			return function (
-				RequestInterface $request,
-				array $options
-			) use ($handler) {
-				if ($options['nextcloud']['allow_local_address'] === true) {
-					return $handler($request, $options);
-				}
-
-				$hostName = (string)$request->getUri()->getHost();
-				$port = $request->getUri()->getPort();
-
-				$ports = [
-					'80',
-					'443',
-				];
-
-				if ($port !== null) {
-					$ports[] = (string)$port;
-				}
-
-				$targetIps = $this->dnsResolve($hostName, 0);
-
-				$curlResolves = [];
-
-				foreach ($ports as $port) {
-					$curlResolves["$hostName:$port"] = [];
-
-					foreach ($targetIps as $ip) {
-						$this->localAddressChecker->ThrowIfLocalIp($ip);
-						$curlResolves["$hostName:$port"][] = $ip;
-					}
-				}
-
-				// Coalesce the per-host:port ips back into a comma separated list
-				foreach ($curlResolves as $hostport => $ips) {
-					$options['curl'][CURLOPT_RESOLVE][] = "$hostport:" . implode(',', $ips);
-				}
-
-				return $handler($request, $options);
-			};
-		};
-	}
+    /** @var NegativeDnsCache */
+    private $negativeDnsCache;
+    /** @var LocalAddressChecker */
+    private $localAddressChecker;
+
+    public function __construct(
+        NegativeDnsCache $negativeDnsCache,
+        LocalAddressChecker $localAddressChecker
+    ) {
+        $this->negativeDnsCache = $negativeDnsCache;
+        $this->localAddressChecker = $localAddressChecker;
+    }
+
+    private function dnsResolve(string $target, int $recursionCount) : array {
+        if ($recursionCount >= 10) {
+            return [];
+        }
+
+        $recursionCount = $recursionCount++;
+        $targetIps = [];
+
+        $soaDnsEntry = dns_get_record($target, DNS_SOA);
+        if (isset($soaDnsEntry[0]) && isset($soaDnsEntry[0]['minimum-ttl'])) {
+            $dnsNegativeTtl = $soaDnsEntry[0]['minimum-ttl'];
+        } else {
+            $dnsNegativeTtl = null;
+        }
+
+        $dnsTypes = [DNS_A, DNS_AAAA, DNS_CNAME];
+        foreach ($dnsTypes as $key => $dnsType) {
+            if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) {
+                unset($dnsTypes[$key]);
+                continue;
+            }
+
+            $dnsResponses = dns_get_record($target, $dnsType);
+            $canHaveCnameRecord = true;
+            if (count($dnsResponses) > 0) {
+                foreach ($dnsResponses as $key => $dnsResponse) {
+                    if (isset($dnsResponse['ip'])) {
+                        $targetIps[] = $dnsResponse['ip'];
+                        $canHaveCnameRecord = false;
+                    } elseif (isset($dnsResponse['ipv6'])) {
+                        $targetIps[] = $dnsResponse['ipv6'];
+                        $canHaveCnameRecord = false;
+                    } elseif (isset($dnsResponse['target']) && $canHaveCnameRecord) {
+                        $targetIps = array_merge($targetIps, $this->dnsResolve($dnsResponse['target'], $recursionCount));
+                        $canHaveCnameRecord = true;
+                    }
+                }
+            } else {
+                if ($dnsNegativeTtl !== null) {
+                    $this->negativeDnsCache->setNegativeCacheForDnsType($target, $dnsType, $dnsNegativeTtl);
+                }
+            }
+        }
+
+        return $targetIps;
+    }
+
+    public function addDnsPinning() {
+        return function (callable $handler) {
+            return function (
+                RequestInterface $request,
+                array $options
+            ) use ($handler) {
+                if ($options['nextcloud']['allow_local_address'] === true) {
+                    return $handler($request, $options);
+                }
+
+                $hostName = (string)$request->getUri()->getHost();
+                $port = $request->getUri()->getPort();
+
+                $ports = [
+                    '80',
+                    '443',
+                ];
+
+                if ($port !== null) {
+                    $ports[] = (string)$port;
+                }
+
+                $targetIps = $this->dnsResolve($hostName, 0);
+
+                $curlResolves = [];
+
+                foreach ($ports as $port) {
+                    $curlResolves["$hostName:$port"] = [];
+
+                    foreach ($targetIps as $ip) {
+                        $this->localAddressChecker->ThrowIfLocalIp($ip);
+                        $curlResolves["$hostName:$port"][] = $ip;
+                    }
+                }
+
+                // Coalesce the per-host:port ips back into a comma separated list
+                foreach ($curlResolves as $hostport => $ips) {
+                    $options['curl'][CURLOPT_RESOLVE][] = "$hostport:" . implode(',', $ips);
+                }
+
+                return $handler($request, $options);
+            };
+        };
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -89,8 +89,8 @@ 
 	}
 
 	public function addDnsPinning() {
-		return function (callable $handler) {
-			return function (
+		return function(callable $handler) {
+			return function(
 				RequestInterface $request,
 				array $options
 			) use ($handler) {
@@ -98,7 +98,7 @@ 
 					return $handler($request, $options);
 				}
 
-				$hostName = (string)$request->getUri()->getHost();
+				$hostName = (string) $request->getUri()->getHost();
 				$port = $request->getUri()->getPort();
 
 				$ports = [
@@ -107,7 +107,7 @@ 
 				];
 
 				if ($port !== null) {
-					$ports[] = (string)$port;
+					$ports[] = (string) $port;
 				}
 
 				$targetIps = $this->dnsResolve($hostName, 0);
@@ -125,7 +125,7 @@ 
 
 				// Coalesce the per-host:port ips back into a comma separated list
 				foreach ($curlResolves as $hostport => $ips) {
-					$options['curl'][CURLOPT_RESOLVE][] = "$hostport:" . implode(',', $ips);
+					$options['curl'][CURLOPT_RESOLVE][] = "$hostport:".implode(',', $ips);
 				}
 
 				return $handler($request, $options);