tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Url: Always compare host and port to identify external urls

Browse Source 
(cherry picked from commit 2b08d88edff8381f513ad7138b2204953e1c406c)
This commit is contained in:
Johannes Meyer 2025-03-13 11:43:22 +01:00
parent 4a479e48db
commit 8e5b32aef3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Web/Url.php
View File

@ -179,10 +179,9 @@ class Url
}
$urlParts = parse_url($url);
if (isset($urlParts['scheme']) && (
$urlParts['scheme'] !== $request->getScheme()
if ((isset($urlParts['scheme']) && $urlParts['scheme'] !== $request->getScheme())
|| (isset($urlParts['host']) && $urlParts['host'] !== $request->getServer('SERVER_NAME'))
|| (isset($urlParts['port']) && $urlParts['port'] != $request->getServer('SERVER_PORT')))
|| (isset($urlParts['port']) && $urlParts['port'] != $request->getServer('SERVER_PORT'))
) {
$urlObject->setIsExternal();
}

5
test/php/library/Icinga/Web/UrlTest.php
View File

@ -71,6 +71,11 @@ class UrlTest extends BaseTestCase
);
}
public function testWhetherProtocolRelativeUrlsAreDetectedAsBeingExternal()
{
$this->assertTrue(Url::fromPath('//testhost/path/to/my/url.html')->isExternal());
}
public function testWhetherGetAbsoluteUrlReturnsTheGivenUsernameAndPassword()
{
$url = Url::fromPath('http://testusername:testpassword@testsite.com/path/to/my/url.html');