From 204790f1fe5c870e44ab3a555b30b30abac5159c Mon Sep 17 00:00:00 2001
From: Andy Vaughn <andyv@mindtouch.com>
Date: Tue, 19 Mar 2019 12:50:59 -0700
Subject: [PATCH] plug is not allowed uri with empty host

---
 src/ApiPlug.php                               |  2 +
 .../HttpPlugUriHostRequiredException.php      | 45 +++++++++++++++++++
 src/HttpPlug.php                              |  7 ++-
 tests/HttpPlug/__construct_Test.php           | 36 +++++++++++++++
 tests/XUri/newFromString_Test.php             |  1 -
 5 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 src/Exception/HttpPlugUriHostRequiredException.php
 create mode 100644 tests/HttpPlug/__construct_Test.php

diff --git a/src/ApiPlug.php b/src/ApiPlug.php
index a938c5a..5630160 100644
--- a/src/ApiPlug.php
+++ b/src/ApiPlug.php
@@ -22,6 +22,7 @@
 use Exception;
 use MindTouch\Http\Content\IContent;
 use MindTouch\Http\Exception\ApiResultException;
+use MindTouch\Http\Exception\HttpPlugUriHostRequiredException;
 use MindTouch\Http\Exception\HttpResultParserContentExceedsMaxContentLengthException;
 use MindTouch\Http\Parser\SerializedPhpArrayParser;
 
@@ -85,6 +86,7 @@ public static function urlEncode(string $string, bool $doubleEncode = false) : s
     /**
      * @param XUri $uri - target uri
      * @param string $format
+     * @throws HttpPlugUriHostRequiredException
      */
     public function __construct(XUri $uri, string $format = self::DREAM_FORMAT_PHP) {
         parent::__construct($uri);
diff --git a/src/Exception/HttpPlugUriHostRequiredException.php b/src/Exception/HttpPlugUriHostRequiredException.php
new file mode 100644
index 0000000..9a1f6cc
--- /dev/null
+++ b/src/Exception/HttpPlugUriHostRequiredException.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+/**
+ * MindTouch HTTP
+ * Copyright (C) 2006-2018 MindTouch, Inc.
+ * www.mindtouch.com  oss@mindtouch.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace MindTouch\Http\Exception;
+
+use Exception;
+use MindTouch\Http\XUri;
+
+class HttpPlugUriHostRequiredException extends Exception {
+
+    /**
+     * @var XUri
+     */
+    private $uri;
+
+    /**
+     * @param XUri $uri
+     */
+    public function __construct(XUri $uri) {
+        $this->uri = $uri;
+        parent::__construct('Uri does not contain a valid hostname: ' . $uri->toString());
+    }
+
+    /**
+     * @return XUri
+     */
+    private function getUri() : XUri {
+        return $this->uri;
+    }
+}
diff --git a/src/HttpPlug.php b/src/HttpPlug.php
index 8e6426d..4012b1e 100644
--- a/src/HttpPlug.php
+++ b/src/HttpPlug.php
@@ -22,6 +22,7 @@
 use InvalidArgumentException;
 use MindTouch\Http\Content\FileContent;
 use MindTouch\Http\Content\IContent;
+use MindTouch\Http\Exception\HttpPlugUriHostRequiredException;
 use MindTouch\Http\Exception\HttpResultParserContentExceedsMaxContentLengthException;
 use MindTouch\Http\Exception\MalformedPathQueryFragmentException;
 use MindTouch\Http\Exception\NotImplementedException;
@@ -89,9 +90,13 @@ class HttpPlug {
 
     /**
      * @param XUri $uri - target uri
+     * @throws HttpPlugUriHostRequiredException
      */
     public function __construct(XUri $uri) {
         $this->headers = new Headers();
+        if(StringUtil::isNullOrEmpty($uri->getHost())) {
+            throw new HttpPlugUriHostRequiredException($uri);
+        }
         $this->uri = $uri;
     }
 
@@ -212,7 +217,7 @@ public function withoutHeader(string $name) : object {
      */
     public function withUri(XUri $uri, bool $preserveHost = false) : object {
         $plug = clone $this;
-        $host = $plug->uri->getHost();
+        $host = StringUtil::stringify($plug->uri->getHost());
         $plug->uri = $uri;
         if($preserveHost) {
             $plug->uri = $plug->uri->withHost($host);
diff --git a/tests/HttpPlug/__construct_Test.php b/tests/HttpPlug/__construct_Test.php
new file mode 100644
index 0000000..1d2d180
--- /dev/null
+++ b/tests/HttpPlug/__construct_Test.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+/**
+ * MindTouch HTTP
+ * Copyright (C) 2006-2018 MindTouch, Inc.
+ * www.mindtouch.com  oss@mindtouch.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace MindTouch\Http\tests\HttpPlug;
+
+use MindTouch\Http\HttpPlug;
+use MindTouch\Http\tests\MindTouchHttpUnitTestCase;
+use MindTouch\Http\XUri;
+
+class __construct_Test extends MindTouchHttpUnitTestCase {
+
+    /**
+     * @test
+     * @expectedException \MindTouch\Http\Exception\HttpPlugUriHostRequiredException
+     */
+    public function Cannot_construct_plug_with_empty_host() {
+
+        // act
+        new HttpPlug(XUri::tryParse('file:///etc/passwd'));
+    }
+}
diff --git a/tests/XUri/newFromString_Test.php b/tests/XUri/newFromString_Test.php
index 151face..18d9b34 100644
--- a/tests/XUri/newFromString_Test.php
+++ b/tests/XUri/newFromString_Test.php
@@ -18,7 +18,6 @@
  */
 namespace MindTouch\Http\tests\XUri;
 
-use MindTouch\Http\Exception\MalformedUriException;
 use MindTouch\Http\tests\MindTouchHttpUnitTestCase;
 use MindTouch\Http\XUri;