feat: add validation for baseURL

codeigniter4 · Feb 16, 2023 · e9b6734 · e9b6734
1 parent f08b98d
commit e9b6734
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\HTTP;
 
 use BadMethodCallException;
+use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
 
@@ -75,6 +76,13 @@ public function __construct(App $configApp)
         // baseURL, so let's help them out.
         $baseURL = rtrim($configApp->baseURL, '/ ') . '/';
 
+        // Validate baseURL
+        if (filter_var($baseURL, FILTER_VALIDATE_URL) === false) {
+            throw new ConfigException(
+                'Config\App::$baseURL is invalid.'
+            );
+        }
+
         $this->baseURL   = $baseURL;
         $this->indexPage = $configApp->indexPage;
 

diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\HTTP;
 
 use BadMethodCallException;
+use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
@@ -68,6 +69,16 @@ public function testConstructorIndexPageEmpty()
         $this->assertSame('http://example.com/', (string) $uri);
     }
 
+    public function testConstructorInvalidBaseURL()
+    {
+        $this->expectException(ConfigException::class);
+
+        $config          = new App();
+        $config->baseURL = 'invalid';
+
+        new SiteURI($config);
+    }
+
     public function testSetPath()
     {
         $config = new App();