Merge pull request #32990 from nextcloud/backport/32988/stable24

[stable24] Improve local domain detection
nextcloud · Jun 24, 2022 · ce9dfc2 · ce9dfc2
2 parents 39b8ea2 + fc1258c
commit ce9dfc2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php
@@ -66,8 +66,10 @@ public function ThrowIfLocalAddress(string $uri) : void {
 			$host = substr($host, 1, -1);
 		}
 
-		// Disallow localhost and local network
-		if ($host === 'localhost' || substr($host, -6) === '.local' || substr($host, -10) === '.localhost') {
+		// Disallow local network top-level domains from RFC 6762
+		$localTopLevelDomains = ['local','localhost','intranet','internal','private','corp','home','lan'];
+		$topLevelDomain = substr((strrchr($host, '.') ?: ''), 1);
+		if (in_array($topLevelDomain, $localTopLevelDomains)) {
 			$this->logger->warning("Host $host was not connected to because it violates local access rules");
 			throw new LocalServerException('Host violates local access rules');
 		}