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

Merge pull request #2007 from open-sausages/pulls/4.0/site_url_check

Browse Source 
BUG Safely check for is_site_url before parsing a shortcode
This commit is contained in:
Chris Joe 2017-11-02 10:02:12 +13:00 committed by GitHub
commit 0b8c5d7bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Model/SiteTreeLinkTracking_Parser.php
View File

@ -1,6 +1,7 @@
<?php <?php
namespace SilverStripe\CMS\Model; namespace SilverStripe\CMS\Model;
use DOMElement;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\View\Parsers\HTMLValue; use SilverStripe\View\Parsers\HTMLValue;
@ -33,12 +34,16 @@ class SiteTreeLinkTracking_Parser
return $results; return $results;
} }
/** @var DOMElement $link */
foreach ($links as $link) { foreach ($links as $link) {
if (!$link->hasAttribute('href')) { if (!$link->hasAttribute('href')) {
continue; continue;
} }
$href = Director::makeRelative($link->getAttribute('href')); $href = $link->getAttribute('href');
if (Director::is_site_url($href)) {
$href = Director::makeRelative($href);
}
// Definitely broken links. // Definitely broken links.
if ($href == '' || $href[0] == '/') { if ($href == '' || $href[0] == '/') {

18
tests/php/Model/SiteTreeLinkTrackingTest.php
View File

@ -4,12 +4,18 @@ namespace SilverStripe\CMS\Tests\Model;
use SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser; use SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Control\Director;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\View\Parsers\HTMLValue; use SilverStripe\View\Parsers\HTMLValue;
use Page; use Page;
class SiteTreeLinkTrackingTest extends SapphireTest class SiteTreeLinkTrackingTest extends SapphireTest
{ {
protected function setUp()
{
parent::setUp();
Director::config()->set('alternate_base_url', 'http://www.mysite.com/');
}
protected function isBroken($content) protected function isBroken($content)
{ {
@ -25,12 +31,24 @@ class SiteTreeLinkTrackingTest extends SapphireTest
public function testParser() public function testParser()
{ {
// Shortcodes
$this->assertTrue($this->isBroken('<a href="[sitetree_link,id=123]">link</a>')); $this->assertTrue($this->isBroken('<a href="[sitetree_link,id=123]">link</a>'));
$this->assertTrue($this->isBroken('<a href="[sitetree_link,id=123]#no-such-anchor">link</a>')); $this->assertTrue($this->isBroken('<a href="[sitetree_link,id=123]#no-such-anchor">link</a>'));
$this->assertTrue($this->isBroken('<a href="[file_link,id=123]">link</a>')); $this->assertTrue($this->isBroken('<a href="[file_link,id=123]">link</a>'));
// Relative urls
$this->assertTrue($this->isBroken('<a href="">link</a>')); $this->assertTrue($this->isBroken('<a href="">link</a>'));
$this->assertTrue($this->isBroken('<a href="/">link</a>')); $this->assertTrue($this->isBroken('<a href="/">link</a>'));
// Non-shortcodes, assume non-broken without due reason
$this->assertFalse($this->isBroken('<a href="/some-page">link</a>'));
$this->assertFalse($this->isBroken('<a href="some-page">link</a>'));
// Absolute urls
$this->assertFalse($this->isBroken('<a href="http://www.mysite.com/some-page">link</a>'));
$this->assertFalse($this->isBroken('<a href="http://www.google.com/some-page">link</a>'));
// Anchors
$this->assertFalse($this->isBroken('<a name="anchor">anchor</a>')); $this->assertFalse($this->isBroken('<a name="anchor">anchor</a>'));
$this->assertFalse($this->isBroken('<a id="anchor">anchor</a>')); $this->assertFalse($this->isBroken('<a id="anchor">anchor</a>'));
$this->assertTrue($this->isBroken('<a href="##anchor">anchor</a>')); $this->assertTrue($this->isBroken('<a href="##anchor">anchor</a>'));