Skip to content

fix: forceGlobalSecureRequests break URI schemes other than HTTP #5730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 2 commits into from
Feb 24, 2022
Merged

fix: forceGlobalSecureRequests break URI schemes other than HTTP #5730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97640c9
fix: forceGlobalSecureRequests break URI schemes other than HTTP
kenjis Feb 24, 2022
7c74eae
refactor: extract the logic to be deprecated
kenjis Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion system/HTTP/URI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '/');
Expand Down
16 changes: 16 additions & 0 deletions tests/system/HTTP/URITest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}