fix: forceGlobalSecureRequests break URI schemes other than HTTP

codeigniter4 · Feb 24, 2022 · 97640c9 · 97640c9
1 parent b343d33
commit 97640c9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
@@ -586,7 +586,10 @@ public function __toString(): string
  $baseUri = new self($config->baseURL);
 
  // If the hosts matches then assume this should be relative to baseURL
- if ($this->getHost() === $baseUri->getHost()) {
+ if (
+ substr($this->getScheme(), 0, 4) === 'http'
+ && $this->getHost() === $baseUri->getHost()
+ ) {
  // Check for additional segments
  $basePath = trim($baseUri->getPath(), '/') . '/';
  $trimPath = ltrim($path, '/');

diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
@@ -985,4 +985,20 @@ public function testCreateURIString()
 
  $this->assertSame($expected, $uri);
  }
+
+ /**
+ * @see https://github.com/codeigniter4/CodeIgniter4/issues/5728
+ */
+ public function testForceGlobalSecureRequestsAndNonHTTPProtocol()
+ {
+ $config = new App();
+ $config->forceGlobalSecureRequests = true;
+ $config->baseURL = 'https://localhost/';
+ Factories::injectMock('config', 'App', $config);
+
+ $expected = 'ftp://localhost/path/to/test.txt';
+ $uri = new URI($expected);
+
+ $this->assertSame($expected, (string) $uri);
+ }
 }