Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix: correct path parsing in `SiteURIFactory::parseRequestURI()` by michalsn · Pull Request #9613 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions system/HTTP/SiteURIFactory.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,15 @@ private function parseRequestURI(): string
$path = implode('/', $keep);
}

// Cleanup: if indexPage is still visible in the path, remove it
if ($this->appConfig->indexPage !== '' && str_starts_with($path, $this->appConfig->indexPage)) {
$remainingPath = substr($path, strlen($this->appConfig->indexPage));
Comment thread
michalsn marked this conversation as resolved.
// Only remove if followed by '/' (route) or nothing (root)
if ($remainingPath === '' || str_starts_with($remainingPath, '/')) {
$path = ltrim($remainingPath, '/');
}
}

// This section ensures that even on servers that require the URI to
// contain the query string (Nginx) a correct URI is found, and also
// fixes the QUERY_STRING Server var and $_GET array.
Expand Down
93 changes: 93 additions & 0 deletions tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,4 +311,97 @@ public static function provideExtensionPHP(): iterable
],
];
}

#[DataProvider('provideRequestURIRewrite')]
public function testRequestURIRewrite(
string $requestUri,
string $scriptName,
string $indexPage,
string $expected,
): void {
$server = [];
$server['REQUEST_URI'] = $requestUri;
$server['SCRIPT_NAME'] = $scriptName;

$appConfig = new App();
$appConfig->indexPage = $indexPage;

$factory = $this->createSiteURIFactory($server, $appConfig);

$this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI'));
}

/**
* @return iterable<string, array{
* requestUri: string,
* scriptName: string,
* indexPage: string,
* expected: string
* }>
*/
public static function provideRequestURIRewrite(): iterable
{
return [
'rewrite_with_route' => [
'requestUri' => '/ci/index.php/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => 'sample/method',
],
'rewrite_root' => [
'requestUri' => '/ci/index.php',
'scriptName' => '/ci/public/index.php',
'indexPage' => 'index.php',
'expected' => '/',
],
'rewrite_no_index_page' => [
'requestUri' => '/ci/sample/method',
'scriptName' => '/ci/public/index.php',
'indexPage' => '',
'expected' => 'sample/method',
],
'rewrite_nested_subfolder' => [
'requestUri' => '/projects/index.php/api/users/list',
'scriptName' => '/projects/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'api/users/list',
],
'rewrite_multiple_public_folders' => [
'requestUri' => '/public-sites/myapp/index.php/content/view',
'scriptName' => '/public-sites/myapp/public/index.php',
'indexPage' => 'index.php',
'expected' => 'content/view',
],
'rewrite_custom_app_folder' => [
'requestUri' => '/myapp/index.php/products/category/electronics',
'scriptName' => '/myapp/web/index.php',
'indexPage' => 'index.php',
'expected' => 'products/category/electronics',
],
'multiple_index_php_in_path' => [
'requestUri' => '/app/index.php/user/index.php/profile',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'user/index.php/profile',
],
'custom_index_page_name' => [
'requestUri' => '/ci/app.php/users/list',
'scriptName' => '/ci/public/app.php',
'indexPage' => 'app.php',
'expected' => 'users/list',
],
'custom_index_page_root' => [
'requestUri' => '/project/main.php',
'scriptName' => '/project/web/main.php',
'indexPage' => 'main.php',
'expected' => '/',
],
'partial_match_should_not_remove' => [
'requestUri' => '/app/myindex.php/route',
'scriptName' => '/app/public/index.php',
'indexPage' => 'index.php',
'expected' => 'myindex.php/route',
],
];
}
}
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.6.2.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Bugs Fixed
- **Email:** Fixed a bug where ``Email::getHostname()`` failed to use ``$_SERVER['SERVER_ADDR']`` when ``$_SERVER['SERVER_NAME']`` was not set.
- **Security:** Fixed a bug where the ``sanitize_filename()`` function from the Security helper would throw an error when used in CLI requests.
- **Session:** Fixed a bug where using the ``DatabaseHandler`` with an unsupported database driver (such as ``SQLSRV``, ``OCI8``, or ``SQLite3``) did not throw an appropriate error.
- **SiteURI:** Fixed a bug in ``SiteURIFactory::parseRequestURI()`` where serving the app from a subfolder using ``mod_rewrite`` while preserving the ``index.php`` file would cause incorrect route path detection.
- **URI:** Fixed a bug in ``URI::getAuthority()`` where schemes without defined default ports (like ``rtsp://``) would cause issues due to missing array key handling.

See the repo's
Expand Down