Internal URI handling#4646

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
MGatner merged 2 commits into from
May 5, 2021
Merged

Internal URI handling #4646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89d588f
Improve URI handling
MGatner May 4, 2021
584bcd1
Fix test config type
MGatner May 4, 2021
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
43 changes: 20 additions & 23 deletions system/HTTP/IncomingRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
/**
* Constructor
*
* @param object $config
* @param App $config
* @param URI $uri
* @param string|null $body
* @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

$this->populateHeaders();

// Get our current URI.
// Determine the current URI
// NOTE: This WILL NOT match the actual URL in the browser since for
// everything this cares about (and the router, etc) is the portion
// AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

$this->detectURI($config->uriProtocol, $config->baseURL);

// Check if the baseURL scheme needs to be coerced into its secure version
if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
{
$this->uri->setScheme('https');
}

$this->validLocales = $config->supportedLocales;

$this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

// It's possible the user forgot a trailing slash on their
// baseURL, so let's help them out.
$baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
$baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

// Based on our baseURL provided by the developer
// set our current domain name, scheme
if (! empty($baseURL))
if ($baseURL !== '')
{
$this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

parse_str($_SERVER['QUERY_STRING'], $_GET);

if ($uri === '/' || $uri === '')
{
return '/';
}
$uri = URI::removeDotSegments($uri);

return $this->removeRelativeDirectory($uri);
return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
}

//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

parse_str($_SERVER['QUERY_STRING'], $_GET);

return $this->removeRelativeDirectory($uri);
$uri = URI::removeDotSegments($uri);

return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
}

//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
* @param string $uri
*
* @return string
*
* @deprecated Use URI::removeDotSegments() directly
*/
protected function removeRelativeDirectory(string $uri): string
{
$uris = [];
$tok = strtok($uri, '/');
while ($tok !== false)
{
if ((! empty($tok) || $tok === '0') && $tok !== '..')
{
$uris[] = $tok;
}
$tok = strtok('/');
}
$uri = URI::removeDotSegments($uri);

return implode('/', $uris);
return $uri === '/' ? $uri : ltrim($uri, '/');
}

// --------------------------------------------------------------------
}
55 changes: 33 additions & 22 deletions system/HTTP/URI.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
$uri .= $authority;
}

if ($path !== '')
if (isset($path) && $path !== '')
{
$uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
}
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
*/
public function getHost(): string
{
return $this->host;
return $this->host ?? '';
}

//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
//--------------------------------------------------------------------

/**
* Allow the URI to be output as a string by simply casting it to a string
* or echoing out.
* Formats the URI as a string.
*
* Warning: For backwards-compatability this method
* assumes URIs with the same host as baseURL should
* be relative to the project's configuration.
* This aspect of __toString() is deprecated and should be avoided.
*
* @return string
*/
public function __toString(): string
{
// If hosted in a sub-folder, we will have additional
// segments that show up prior to the URI path we just
// grabbed from the request, so add it on if necessary.
$config = config(App::class);
$baseUri = new self($config->baseURL);
$basePath = trim($baseUri->getPath(), '/') . '/';
$path = $this->getPath();
$trimPath = ltrim($path, '/');

if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
{
$path = $basePath . $trimPath;
}
$path = $this->getPath();
$scheme = $this->getScheme();

// Check if this is an internal URI
$config = config('App');
$baseUri = new self($config->baseURL);

// force https if needed
if ($config->forceGlobalSecureRequests)
// If the hosts matches then assume this should be relative to baseURL
if ($this->getHost() === $baseUri->getHost())
{
$this->setScheme('https');
// Check for additional segments
$basePath = trim($baseUri->getPath(), '/') . '/';
$trimPath = ltrim($path, '/');

if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
{
$path = $basePath . $trimPath;
}

// Check for forced HTTPS
if ($config->forceGlobalSecureRequests)
{
$scheme = 'https';
}
}

return static::createURIString(
$this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
$scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
$this->getQuery(), $this->getFragment()
);
}
Expand Down
23 changes: 15 additions & 8 deletions tests/system/API/ResponseTraitTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
{
$config = [
$config = new App();
foreach ([
'baseURL' => 'http://example.com/',
'uriProtocol' => 'REQUEST_URI',
'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
'cookieHTTPOnly' => false,
'proxyIPs' => [],
'cookieSameSite' => 'Lax',
];

$config = array_merge($config, $userConfig);
] as $key => $value)
{
$config->$key = $value;
}

if (is_null($this->request))
{
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
{
$config = [
$config = new App();
foreach ([
'baseURL' => 'http://example.com/',
'uriProtocol' => 'REQUEST_URI',
'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
'cookieHTTPOnly' => false,
'proxyIPs' => [],
'cookieSameSite' => 'Lax',
];
] as $key => $value)
{
$config->$key = $value;
}

$request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
$response = new MockResponse((object) $config);
$request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
$response = new MockResponse($config);

$controller = new class($request, $response)
{
Expand Down
10 changes: 5 additions & 5 deletions tests/system/HTTP/URITest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

Factories::injectMock('config', 'App', $config);

$request = Services::request($config);
$request->uri = new URI('http://example.com/ci/v4/controller/method');
$uri= new URI('http://example.com/ci/v4/controller/method');
$request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

Services::injectMock('request', $request);

// going through request
// Detected by request
$this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

// standalone
// Standalone
$uri = new URI('http://example.com/ci/v4/controller/method');
$this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

$this->assertEquals($uri->getPath(), $request->uri->getPath());
$this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
}

public function testZeroAsURIPath()
Expand Down
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/v4.1.2.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Internal URI handling#4646

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

MGatner
merged 2 commits into

from

May 5, 2021
 Merged


Internal URI handling
#4646
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
89d588f

Improve URI handling


MGatner May 4, 2021
584bcd1

Fix test config type


MGatner May 4, 2021

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


43 changes: 20 additions & 23 deletions
system/HTTP/IncomingRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
use CodeIgniter\HTTP\Exceptions\HTTPException;
use CodeIgniter\HTTP\Files\FileCollection;
use CodeIgniter\HTTP\Files\UploadedFile;
use CodeIgniter\HTTP\URI;
use Config\App;
use Config\Services;
use InvalidArgumentException;
Expand DownExpand Up@@ -123,7 +124,7 @@ class IncomingRequest extends Request
	/**
 * Constructor
 *
 * @param object $config
 * @param App  $config
 * @param URI $uri
 * @param string|null $body
 * @param UserAgent $userAgent
Expand All@@ -149,7 +150,7 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->populateHeaders();

 // Get our current URI.
 // Determine the current URI
 // NOTE: This WILL NOT match the actual URL in the browser since for
 // everything this cares about (and the router, etc) is the portion
 // AFTER the script name. So, if hosted in a sub-folder this will
Expand All@@ -158,6 +159,12 @@ public function __construct($config, URI $uri = null, $body = 'php://input', Use

 $this->detectURI($config->uriProtocol, $config->baseURL);

 // Check if the baseURL scheme needs to be coerced into its secure version
 if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
 {
 $this->uri->setScheme('https');
 }

 $this->validLocales = $config->supportedLocales;

 $this->detectLocale($config);
Expand DownExpand Up@@ -610,11 +617,11 @@ protected function detectURI(string $protocol, string $baseURL)

 // It's possible the user forgot a trailing slash on their
 // baseURL, so let's help them out.
 $baseURL = ! empty($baseURL) ? rtrim($baseURL, '/ ') . '/' : $baseURL;
 $baseURL = $baseURL === '' ? $baseURL : rtrim($baseURL, '/ ') . '/';

 // Based on our baseURL provided by the developer
 // set our current domain name, scheme
 if (! empty($baseURL))
 if ($baseURL !== '')
 {
 $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
 $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
Expand DownExpand Up@@ -758,12 +765,9 @@ protected function parseRequestURI(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 if ($uri === '/' || $uri === '')
 {
 return '/';
 }
 $uri = URI::removeDotSegments($uri);

 return $this->removeRelativeDirectory($uri);
 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -793,7 +797,9 @@ protected function parseQueryString(): string

 parse_str($_SERVER['QUERY_STRING'], $_GET);

 return $this->removeRelativeDirectory($uri);
 $uri = URI::removeDotSegments($uri);

 return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
	}

	//--------------------------------------------------------------------
Expand All@@ -806,22 +812,13 @@ protected function parseQueryString(): string
 * @param string $uri
 *
 * @return string
 *
 * @deprecated Use URI::removeDotSegments() directly
 */
	protected function removeRelativeDirectory(string $uri): string
	{
 $uris = [];
 $tok = strtok($uri, '/');
 while ($tok !== false)
 {
 if ((! empty($tok) || $tok === '0') && $tok !== '..')
 {
 $uris[] = $tok;
 }
 $tok = strtok('/');
 }
 $uri = URI::removeDotSegments($uri);

 return implode('/', $uris);
 return $uri === '/' ? $uri : ltrim($uri, '/');
	}

	// --------------------------------------------------------------------
}

55 changes: 33 additions & 22 deletions
system/HTTP/URI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
namespace CodeIgniter\HTTP;

use CodeIgniter\HTTP\Exceptions\HTTPException;
use Config\App;
use InvalidArgumentException;

/**
Expand DownExpand Up@@ -166,7 +165,7 @@ public static function createURIString(string $scheme = null, string $authority
 $uri .= $authority;
 }

 if ($path !== '')
 if (isset($path) && $path !== '')
 {
 $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
 }
Expand DownExpand Up@@ -465,7 +464,7 @@ public function showPassword(bool $val = true)
 */
	public function getHost(): string
	{
 return $this->host;
 return $this->host ?? '';
	}

	//--------------------------------------------------------------------
Expand DownExpand Up@@ -665,33 +664,45 @@ public function getTotalSegments(): int
	//--------------------------------------------------------------------

	/**
 * Allow the URI to be output as a string by simply casting it to a string
 * or echoing out.
 * Formats the URI as a string.
 *
 * Warning: For backwards-compatability this method
 * assumes URIs with the same host as baseURL should
 * be relative to the project's configuration.
 * This aspect of __toString() is deprecated and should be avoided.
 *
 * @return string
 */
	public function __toString(): string
	{
 // If hosted in a sub-folder, we will have additional
 // segments that show up prior to the URI path we just
 // grabbed from the request, so add it on if necessary.
 $config = config(App::class);
 $baseUri = new self($config->baseURL);
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $path = $this->getPath();
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }
 $path = $this->getPath();
 $scheme = $this->getScheme();

 // Check if this is an internal URI
 $config = config('App');
 $baseUri = new self($config->baseURL);

 // force https if needed
 if ($config->forceGlobalSecureRequests)
 // If the hosts matches then assume this should be relative to baseURL
 if ($this->getHost() === $baseUri->getHost())
 {
 $this->setScheme('https');
 // Check for additional segments
 $basePath = trim($baseUri->getPath(), '/') . '/';
 $trimPath = ltrim($path, '/');

 if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
 {
 $path = $basePath . $trimPath;
 }

 // Check for forced HTTPS
 if ($config->forceGlobalSecureRequests)
 {
 $scheme = 'https';
 }
 }

 return static::createURIString(
 $this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
 $this->getQuery(), $this->getFragment()
 );
	}
Expand Down

23 changes: 15 additions & 8 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\Mock\MockIncomingRequest;
use CodeIgniter\Test\Mock\MockResponse;
use Config\App;
use stdClass;

class ResponseTraitTest extends CIUnitTestCase
Expand All@@ -30,7 +31,8 @@ protected function setUp(): void

	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -44,9 +46,10 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];

 $config = array_merge($config, $userConfig);
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 if (is_null($this->request))
 {
Expand DownExpand Up@@ -472,7 +475,8 @@ public function testXMLFormatter()

	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
	{
 $config = [
 $config = new App();
 foreach ([
 'baseURL' => 'http://example.com/',
 'uriProtocol' => 'REQUEST_URI',
 'defaultLocale' => 'en',
Expand All@@ -486,10 +490,13 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
 'cookieHTTPOnly' => false,
 'proxyIPs' => [],
 'cookieSameSite' => 'Lax',
 ];
 ] as $key => $value)
 {
 $config->$key = $value;
 }

 $request = new MockIncomingRequest((object) $config, new URI($config['baseURL']), null, new UserAgent());
 $response = new MockResponse((object) $config);
 $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
 $response = new MockResponse($config);

 $controller = new class($request, $response)
 {
Expand Down

10 changes: 5 additions & 5 deletions
tests/system/HTTP/URITest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,19 +1007,19 @@ public function testForceGlobalSecureRequests()

 Factories::injectMock('config', 'App', $config);

 $request = Services::request($config);
 $request->uri = new URI('http://example.com/ci/v4/controller/method');
 $uri= new URI('http://example.com/ci/v4/controller/method');
 $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());

 Services::injectMock('request', $request);

 // going through request
 // Detected by request
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);

 // standalone
 // Standalone
 $uri = new URI('http://example.com/ci/v4/controller/method');
 $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);

 $this->assertEquals($uri->getPath(), $request->uri->getPath());
 $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
	}

	public function testZeroAsURIPath()
Expand Down

1 change: 1 addition & 0 deletions
user_guide_src/source/changelogs/v4.1.2.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ Deprecations:
- Deprecated ``ControllerTester`` to use the ``ControllerTestTrait`` instead.
- Consolidated and deprecated ``ControllerResponse`` and ``FeatureResponse`` in favor of ``TestResponse``.
- Deprecated ``Time::instance()``, use ``Time::createFromInstance()`` instead (now accepts ``DateTimeInterface``).
- Deprecated ``IncomingRequest::removeRelativeDirectory()``, use ``URI::removeDotSegments()`` instead

Bugs Fixed:

Expand Down