tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX: improve Director::makeRelative() to ignore SSL changes.

Browse Source 
See http://open.silverstripe.org/ticket/6672. Expanded on initial patch with test coverage. Fixes another one of the commented out cases in the test by picking up URL's which do not include a protocol.
This commit is contained in:
Tim Klein 2012-07-01 22:07:07 +12:00 committed by Will Rossiter
parent 23ed5335e6
commit a67b964267
2 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
control/Director.php
View File

@ -485,27 +485,41 @@ class Director implements TemplateGlobalProvider {
} }
/** /**
* Turns an absolute URL or folder into one that's relative to the root of the site. * Turns an absolute URL or folder into one that's relative to the root of
* This is useful when turning a URL into a filesystem reference, or vice versa. * the site. This is useful when turning a URL into a filesystem reference,
* * or vice versa.
* @todo Implement checking across http/https protocols
* *
* @param string $url Accepts both a URL or a filesystem path * @param string $url Accepts both a URL or a filesystem path
* @return string Either a relative URL if the checks succeeded, or the original (possibly absolute) URL. * @return string Either a relative URL if the checks succeeded, or the
* original (possibly absolute) URL.
*/ */
static function makeRelative($url) { public static function makeRelative($url) {
// Allow for the accidental inclusion of a // in the URL // Allow for the accidental inclusion whitespace and // in the URL
$url = preg_replace('#([^:])//#', '\\1/', $url); $url = trim(preg_replace('#([^:])//#', '\\1/', $url));
$url = trim($url);
$base1 = self::absoluteBaseURL();
$baseDomain = substr($base1, strlen(self::protocol()));
// Only bother comparing the URL to the absolute version if $url looks like a URL. // Only bother comparing the URL to the absolute version if $url looks like a URL.
if(preg_match('/^https?[^:]*:\/\//',$url)) { if(preg_match('/^https?[^:]*:\/\//',$url,$matches)) {
$base1 = self::absoluteBaseURL(); $urlProtocol = $matches[0];
$urlWithoutProtocol = substr($url, strlen($urlProtocol));
// If we are already looking at baseURL, return '' (substr will return false) // If we are already looking at baseURL, return '' (substr will return false)
if($url == $base1) return ''; if($url == $base1) {
else if(substr($url,0,strlen($base1)) == $base1) return substr($url,strlen($base1)); return '';
}
else if(substr($url,0,strlen($base1)) == $base1) {
return substr($url,strlen($base1));
}
else if(substr($base1,-1)=="/" && $url == substr($base1,0,-1)) {
// Convert http://www.mydomain.com/mysitedir to '' // Convert http://www.mydomain.com/mysitedir to ''
else if(substr($base1,-1)=="/" && $url == substr($base1,0,-1)) return ""; return "";
}
if(substr($urlWithoutProtocol,0,strlen($baseDomain)) == $baseDomain) {
return substr($urlWithoutProtocol,strlen($baseDomain));
}
} }
// test for base folder, e.g. /var/www // test for base folder, e.g. /var/www
@ -514,7 +528,14 @@ class Director implements TemplateGlobalProvider {
// Test for relative base url, e.g. mywebsite/ if the full URL is http://localhost/mywebsite/ // Test for relative base url, e.g. mywebsite/ if the full URL is http://localhost/mywebsite/
$base3 = self::baseURL(); $base3 = self::baseURL();
if(substr($url,0,strlen($base3)) == $base3) return substr($url,strlen($base3)); if(substr($url,0,strlen($base3)) == $base3) {
return substr($url,strlen($base3));
}
// Test for relative base url, e.g mywebsite/ if the full url is localhost/myswebsite
if(substr($url,0,strlen($baseDomain)) == $baseDomain) {
return substr($url, strlen($baseDomain));
}
// Nothing matched, fall back to returning the original URL // Nothing matched, fall back to returning the original URL
return $url; return $url;
@ -936,8 +957,4 @@ class Director implements TemplateGlobalProvider {
'BaseHref' => 'absoluteBaseURL', //@deprecated 3.0 'BaseHref' => 'absoluteBaseURL', //@deprecated 3.0
); );
} }
} }

14
tests/control/DirectorTest.php
View File

@ -122,16 +122,22 @@ class DirectorTest extends SapphireTest {
public function testMakeRelative() { public function testMakeRelative() {
$siteUrl = Director::absoluteBaseURL(); $siteUrl = Director::absoluteBaseURL();
$siteUrlNoProtocol = preg_replace('/https?:\/\//', '', $siteUrl); $siteUrlNoProtocol = preg_replace('/https?:\/\//', '', $siteUrl);
$this->assertEquals(Director::makeRelative("$siteUrl"), ''); $this->assertEquals(Director::makeRelative("$siteUrl"), '');
//$this->assertEquals(Director::makeRelative("https://$siteUrlNoProtocol"), ''); $this->assertEquals(Director::makeRelative("https://$siteUrlNoProtocol"), '');
$this->assertEquals(Director::makeRelative("http://$siteUrlNoProtocol"), '');
$this->assertEquals(Director::makeRelative(" $siteUrl/testpage "), 'testpage'); $this->assertEquals(Director::makeRelative(" $siteUrl/testpage "), 'testpage');
//$this->assertEquals(Director::makeRelative("$siteUrlNoProtocol/testpage"), 'testpage'); $this->assertEquals(Director::makeRelative("$siteUrlNoProtocol/testpage"), 'testpage');
$this->assertEquals(Director::makeRelative('ftp://test.com'), 'ftp://test.com'); $this->assertEquals(Director::makeRelative('ftp://test.com'), 'ftp://test.com');
$this->assertEquals(Director::makeRelative('http://test.com'), 'http://test.com'); $this->assertEquals(Director::makeRelative('http://test.com'), 'http://test.com');
// the below is not a relative URL, test makes no sense
// $this->assertEquals(Director::makeRelative('/relative'), '/relative');
$this->assertEquals(Director::makeRelative('relative'), 'relative'); $this->assertEquals(Director::makeRelative('relative'), 'relative');
$this->assertEquals(Director::makeRelative("$siteUrl/?url=http://test.com"), '?url=http://test.com'); $this->assertEquals(Director::makeRelative("$siteUrl/?url=http://test.com"), '?url=http://test.com');
$this->assertEquals("test", Director::makeRelative("https://".$siteUrlNoProtocol."/test"));
$this->assertEquals("test", Director::makeRelative("http://".$siteUrlNoProtocol."/test"));
} }
/** /**