more tests yiisoft#119

kamarton · Nov 24, 2019 · 8afc22a · 8afc22a
1 parent 3d8f1c7
commit 8afc22a
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/src/Middleware/TrustedHostsNetworkResolver.php b/src/Middleware/TrustedHostsNetworkResolver.php
@@ -139,6 +139,9 @@ public function withAddedTrustedHosts(
 
             throw new \InvalidArgumentException("Not supported IP header type: $type");
         }
+        if (count($hosts) === 0) {
+            throw new \InvalidArgumentException("Empty hosts not allowed");
+        }
         $data = [
             self::DATA_KEY_HOSTS => $hosts,
             self::DATA_KEY_IP_HEADERS => $ipHeaders,

diff --git a/tests/Middleware/TrustedHostsNetworkResolverTest.php b/tests/Middleware/TrustedHostsNetworkResolverTest.php
@@ -164,7 +164,8 @@ public function testNotTrustedMiddleware(): void
 
         $middleware = new TrustedHostsNetworkResolver(new Psr17Factory());
         $content = 'Another branch.';
-        $middleware = $middleware->withNotTrustedBranch(new class($content) implements MiddlewareInterface {
+        $middleware = $middleware->withNotTrustedBranch(new class($content) implements MiddlewareInterface
+        {
             private $content;
 
             public function __construct(string $content)
@@ -188,4 +189,49 @@ public function process(
         $body->rewind();
         $this->assertSame($content, $body->getContents());
     }
+
+    public function addedTrustedHostsInvalidParameterDataProvider(): array
+    {
+        return [
+            'hostsEmpty' => ['hosts' => []],
+            'hostsEmptyString' => ['hosts' => ['']],
+            'hostsNumeric' => ['hosts' => [888]],
+            'hostsSpaces' => ['hosts' => ['    ']],
+            'hostsNotDomain' => ['host' => ['-apple']],
+            'urlHeadersEmpty' => ['urlHeaders' => ['']],
+            'urlHeadersNumeric' => ['urlHeaders' => [888]],
+            'urlHeadersSpaces' => ['urlHeaders' => ['   ']],
+            'trustedHeadersEmpty' => ['trustedHeaders' => ['']],
+            'trustedHeadersNumeric' => ['trustedHeaders' => [888]],
+            'trustedHeadersSpaces' => ['trustedHeaders' => ['   ']],
+            'protocolHeadersNumeric' => ['protocolHeaders' => ['http' => 888]],
+            'ipHeadersEmptyString' => ['ipHeaders' => [' ']],
+            'ipHeadersNumeric' => ['ipHeaders' => [888]],
+            'ipHeadersInvalidType' => ['ipHeaders' => [['---', 'aaa']]],
+            'ipHeadersInvalidTypeValue' => [
+                'ipHeaders' => [
+                    [
+                        TrustedHostsNetworkResolver::IP_HEADER_TYPE_RFC7239,
+                        888
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider addedTrustedHostsInvalidParameterDataProvider
+     */
+    public function testAddedTrustedHostsInvalidParameter(array $data): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        (new TrustedHostsNetworkResolver(new Psr17Factory()))
+            ->withAddedTrustedHosts($data['hosts'] ?? [],
+                $data['ipHeaders'] ?? null,
+                $data['protocolHeaders'] ?? null,
+                $data['hostHeaders'] ?? null,
+                $data['urlHeaders'] ?? null,
+                $data['trustedHeaders'] ?? null
+            );
+    }
 }