Fix #363 - domain and subdomain wildcard (#364)

* test: private domain with subdomain wildcard

When a private domain is listed, with an additional wildcard on a subdomain, the private domain itself is not resolved.

Confirms #363

* fix: private domain with subdomain wildcard

When a private domain is listed, with an additional wildcard on a subdomain, the private domain itself is not resolved.

Fixes #363

Author: wikando-ck

src/Rules.php

@@ -8,8 +8,10 @@
 use SplTempFileObject;
 use Stringable;
 
+use function array_key_exists;
 use function array_pop;
 use function explode;
+use function in_array;
 use function preg_match;
 use function substr;
 
@@ -19,6 +21,8 @@ final class Rules implements PublicSuffixList
     private const PRIVATE_DOMAINS = 'PRIVATE_DOMAINS';
     private const UNKNOWN_DOMAINS = 'UNKNOWN_DOMAINS';
 
+    private const DOMAIN_RULE_MARKER = '?';
+
     private const REGEX_PSL_SECTION = ',^// ===(?<point>BEGIN|END) (?<type>ICANN|PRIVATE) DOMAINS===,';
     private const PSL_SECTION = [
         'ICANN' => [
@@ -134,7 +138,13 @@ private static function addRule(array $list, array $ruleParts): array
             $isDomain = false;
         }
 
-        $list[$rule] = $list[$rule] ?? ($isDomain ? [] : ['!' => '']);
+        if (isset($list[$rule]) && [] === $list[$rule]) {
+            $list[$rule] = [self::DOMAIN_RULE_MARKER => ''];
+        }
+        if (!isset($list[$rule])) {
+            $list[$rule] = $isDomain ? [] : ['!' => ''];
+        }
+
         if ($isDomain && [] !== $ruleParts) {
             /** @var array<array-key, array> $tmpList */
             $tmpList = $list[$rule];
@@ -264,6 +274,9 @@ private function getPublicSuffixLengthFromSection(DomainName $domain, string $se
             //no match found
             if (!array_key_exists($label, $rules)) {
                 // Suffix MUST be fully matched else no suffix is found for private domain
+                if (self::PRIVATE_DOMAINS === $section && array_key_exists(self::DOMAIN_RULE_MARKER, $rules)) {
+                    return $labelCount;
+                }
                 if (self::PRIVATE_DOMAINS === $section && self::hasRemainingRules($rules)) {
                     $labelCount = 0;
                 }

src/RulesTest.php

@@ -565,4 +565,39 @@ public function testWithMultiLevelPrivateDomain(): void
         self::assertTrue($domain->suffix()->isPrivate());
         self::assertSame('lt.eu.org', $domain->suffix()->value());
     }
+
+    #[DataProvider('privateDomainWithWildcardProvider')]
+    public function testWithPrivateDomainThatHasWildcardSubdomain(string $inputDomain, string $expectedSuffix): void
+    {
+        $domain = self::$rules->getPrivateDomain($inputDomain);
+
+        self::assertSame($expectedSuffix, $domain->suffix()->value());
+        self::assertFalse($domain->suffix()->isICANN());
+        self::assertTrue($domain->suffix()->isPrivate());
+    }
+
+    /**
+     * @return iterable<string, array{inputDomain: string, expectedSuffix: string}>
+     */
+    public static function privateDomainWithWildcardProvider(): iterable
+    {
+        return [
+            'appspot subdomain' => [
+                'inputDomain' => 'test-domain.de.r.appspot.com',
+                'expectedSuffix' => 'de.r.appspot.com',
+            ],
+            'appspot root domain' => [
+                'inputDomain' => 'test-domain.appspot.com',
+                'expectedSuffix' => 'appspot.com',
+            ],
+            'qcx subdomain' => [
+                'inputDomain' => 'test-domain.de.sys.qcx.io',
+                'expectedSuffix' => 'de.sys.qcx.io',
+            ],
+            'qcx root domain' => [
+                'inputDomain' => 'test-domain.qcx.io',
+                'expectedSuffix' => 'qcx.io',
+            ],
+        ];
+    }
 }