tonyair/silverstripe-iframe
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-iframe synced 2024-10-22 11:05:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from silverstripe-elliot/disallow-javascript-in-url

Browse Source 
Disallow javascript protocol in IFrameURL
This commit is contained in:
☃ Stephen Shkardoon ☃ 2014-07-16 16:20:16 +12:00
commit 83cde3c931
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/IFramePage.php
View File

@ -73,6 +73,26 @@ class IFramePage extends Page {
return $style; return $style;
} }
/**
* Ensure that the IFrameURL is a valid url and prevents XSS
*
* @throws ValidationException
* @return ValidationResult
*/
public function validate() {
$result = parent::validate();
//whitelist allowed URL schemes
$allowed_schemes = array('http', 'https');
if($matches = parse_url($this->IFrameURL)) {
if(isset($matches['scheme']) && !in_array($matches['scheme'], $allowed_schemes)) {
$result->error(_t('IFramePage.VALIDATION.BANNEDURLSCHEME', "This URL scheme is not allowed."));
}
}
return $result;
}
} }
class IFramePage_Controller extends Page_Controller { class IFramePage_Controller extends Page_Controller {

2
lang/en.yml
View File

@ -3,6 +3,8 @@ en:
DESCRIPTION: 'Embeds an iframe into the body of the page.' DESCRIPTION: 'Embeds an iframe into the body of the page.'
PLURALNAME: 'Base Pages' PLURALNAME: 'Base Pages'
SINGULARNAME: 'I Frame Page' SINGULARNAME: 'I Frame Page'
VALIDATION:
BANNEDURLSCHEME: 'This URL scheme is not allowed.'
IframePage: IframePage:
ExternalNote: 'Please note the following section of content is possibly being delivered from an external source (IFRAME in HTML terms), and may present unusual experiences for screen readers.' ExternalNote: 'Please note the following section of content is possibly being delivered from an external source (IFRAME in HTML terms), and may present unusual experiences for screen readers.'
Loading: 'Loading content...' Loading: 'Loading content...'

41
tests/IFramePageTest.php
View File

@ -33,4 +33,45 @@ class IFramePageTest extends SapphireTest {
$iframe->FixedWidth = '200'; $iframe->FixedWidth = '200';
$this->assertContains('width: 200px', $iframe->getStyle(), 'Fixed width is settable'); $this->assertContains('width: 200px', $iframe->getStyle(), 'Fixed width is settable');
} }
function testAllowedUrls() {
$iframe = new IFramePage();
$tests = array(
'allowed' => array(
'http://anything',
'https://anything',
'page',
'sub-page/link',
'page/link',
'page.html',
'page.htm',
'page.phpissoawesomewhywouldiuseanythingelse',
'//url.com/page',
'/root/page/link',
'http://intranet:8888',
'http://javascript:8080',
'http://username:password@hostname/path?arg=value#anchor'
),
'banned' => array(
'javascript:alert',
'tel:0210001234',
'ftp://url',
'ssh://1.2.3.4',
'ssh://url.com/page'
)
);
foreach($tests['allowed'] as $url) {
$iframe->IFrameURL = $url;
$iframe->write();
$this->assertContains($iframe->IFrameURL, $url);
}
foreach($tests['banned'] as $url) {
$iframe->IFrameURL = $url;
$this->setExpectedException('ValidationException');
$iframe->write();
}
}
} }