symfony · SpacePossum · Nov 2, 2016 · Nov 4, 2016 · Nov 5, 2016 · Nov 5, 2016
diff --git a/src/Symfony/Component/HttpFoundation/Exception/AbstractHostException.php b/src/Symfony/Component/HttpFoundation/Exception/AbstractHostException.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Exception;
+
+/**
+ * The HTTP request contains incorrect host data.
+ *
+ * @internal
+ *
+ * @author SpacePossum
+ */
+abstract class AbstractHostException extends \UnexpectedValueException implements ExceptionInterface
+{
+    private $host;
+
+    /**
+     * @param string $host
+     * @param string $message
+     */
+    public function __construct($host, $message)
+    {
+        parent::__construct($message);
+        $this->host = $host;
+    }
+
+    public function getHost()
+    {
+        return $this->host;
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Exception/ConflictingHeadersException.php b/src/Symfony/Component/HttpFoundation/Exception/ConflictingHeadersException.php
@@ -18,6 +18,6 @@
  *
  * @author Magnus Nordlander <magnus@fervo.se>
  */
-class ConflictingHeadersException extends \RuntimeException
+class ConflictingHeadersException extends \UnexpectedValueException implements ExceptionInterface
 {
 }
diff --git a/src/Symfony/Component/HttpFoundation/Exception/ExceptionInterface.php b/src/Symfony/Component/HttpFoundation/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Exception;
+
+/**
+ * Base ExceptionInterface for the Request component.
+ *
+ * @author SpacePossum
+ */
+interface ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/HttpFoundation/Exception/InvalidHostException.php b/src/Symfony/Component/HttpFoundation/Exception/InvalidHostException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Exception;
+
+/**
+ * The HTTP request contains invalid host data.
+ *
+ * @author SpacePossum
+ */
+final class InvalidHostException extends AbstractHostException
+{
+}
diff --git a/src/Symfony/Component/HttpFoundation/Exception/UntrustedHostException.php b/src/Symfony/Component/HttpFoundation/Exception/UntrustedHostException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Exception;
+
+/**
+ * The HTTP request contains host data which is not trusted.
+ *
+ * @author SpacePossum
+ */
+final class UntrustedHostException extends AbstractHostException
+{
+}
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\HttpFoundation;
 
 use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
+use Symfony\Component\HttpFoundation\Exception\InvalidHostException;
+use Symfony\Component\HttpFoundation\Exception\UntrustedHostException;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
@@ -788,6 +790,8 @@ public function setSession(SessionInterface $session)
      *
      * @return array The client IP addresses
      *
+     * @throws ConflictingHeadersException
+     *
      * @see getClientIp()
      */
     public function getClientIps()
@@ -819,7 +823,7 @@ public function getClientIps()
         }
 
         if ($hasTrustedForwardedHeader && $hasTrustedClientIpHeader && $forwardedClientIps !== $xForwardedForClientIps) {
-            throw new ConflictingHeadersException('The request has both a trusted Forwarded header and a trusted Client IP header, conflicting with each other with regards to the originating IP addresses of the request. This is the result of a misconfiguration. You should either configure your proxy only to send one of these headers, or configure Symfony to distrust one of them.');
+            throw new ConflictingHeadersException('The request has both a trusted Forwarded header and a trusted Client IP header, conflicting with each other with regards to the originating IP addresses of the request. This is the result of a misconfiguration. You should either configure your proxy only to send one of these headers, or configure your project to distrust one of them.');
         }
 
         if (!$hasTrustedForwardedHeader && !$hasTrustedClientIpHeader) {
@@ -1198,7 +1202,8 @@ public function isSecure()
      *
      * @return string
      *
-     * @throws \UnexpectedValueException when the host name is invalid
+     * @throws InvalidHostException   when the host name is invalid
+     * @throws UntrustedHostException when the host is not trusted
      */
     public function getHost()
     {
@@ -1220,7 +1225,7 @@ public function getHost()
         // check that it does not contain forbidden characters (see RFC 952 and RFC 2181)
         // use preg_replace() instead of preg_match() to prevent DoS attacks with long host names
         if ($host && '' !== preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $host)) {
-            throw new \UnexpectedValueException(sprintf('Invalid Host "%s"', $host));
+            throw new InvalidHostException($host, sprintf('Invalid Host "%s".', $host));
         }
 
         if (count(self::$trustedHostPatterns) > 0) {
@@ -1238,7 +1243,7 @@ public function getHost()
                 }
             }
 
-            throw new \UnexpectedValueException(sprintf('Untrusted Host "%s"', $host));
+            throw new UntrustedHostException($host, sprintf('Untrusted Host "%s".', $host));
         }
 
         return $host;
@@ -1515,7 +1520,7 @@ public function getContent($asResource = false)
     {
         $currentContentIsResource = is_resource($this->content);
         if (PHP_VERSION_ID < 50600 && false === $this->content) {
-            throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
+            throw new \LogicException(sprintf('Method %s can only be called once when using the resource return type and PHP below 5.6.', __METHOD__));
         }
 
         if (true === $asResource) {
@@ -1940,7 +1945,12 @@ private static function createRequestFromFactory(array $query = array(), array $
             $request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
 
             if (!$request instanceof self) {
-                throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
+                throw new \LogicException(
+                    sprintf(
+                        'The Request factory must return an instance of %s. Got %s.',
+                        self::class, is_object($request) ? get_class($request) : (null === $request ? 'null' : gettype($request))
+                    )
+                );
             }
 
             return $request;

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\Tests;
 
+use Symfony\Component\HttpFoundation\Exception\InvalidHostException;
+use Symfony\Component\HttpFoundation\Exception\UntrustedHostException;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Request;
@@ -1872,8 +1874,8 @@ public function testTrustedHosts()
         try {
             $request->getHost();
             $this->fail('Request::getHost() should throw an exception when host is not trusted.');
-        } catch (\UnexpectedValueException $e) {
-            $this->assertEquals('Untrusted Host "evil.com"', $e->getMessage());
+        } catch (UntrustedHostException $e) {
+            $this->assertEquals('Untrusted Host "evil.com".', $e->getMessage());
         }
 
         // trusted hosts
@@ -1936,7 +1938,7 @@ public function testHostValidity($host, $isValid, $expectedHost = null, $expecte
                 $this->assertSame($expectedPort, $request->getPort());
             }
         } else {
-            $this->setExpectedException('UnexpectedValueException', 'Invalid Host');
+            $this->setExpectedException(InvalidHostException::class, 'Invalid Host');
             $request->getHost();
         }
     }