Skip to content
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

Jump to bottom

ENH Use symfony/validation logic #3009

Merged
merged 1 commit into from
Oct 2, 2024
Merged

ENH Use symfony/validation logic #3009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 5 additions & 24 deletions code/Model/RedirectorPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\HeaderField;
use SilverStripe\Forms\OptionsetField;
use SilverStripe\Forms\UrlField;
use SilverStripe\Versioned\Versioned;

/**
Expand Down Expand Up @@ -47,6 +48,9 @@ class RedirectorPage extends Page
'RedirectionType',
'Content',
],
'fieldClasses' => [
'ExternalURL' => UrlField::class,
],
];

private static $table_name = 'RedirectorPage';
Expand Down Expand Up @@ -171,35 +175,12 @@ public function syncLinkTracking()
}
}

protected function onBeforeWrite()
GuySartorelli marked this conversation as resolved.
Show resolved Hide resolved
{
parent::onBeforeWrite();

if ($this->ExternalURL && substr($this->ExternalURL ?? '', 0, 2) !== '//') {
$urlParts = parse_url($this->ExternalURL ?? '');
if ($urlParts) {
if (empty($urlParts['scheme'])) {
// no scheme, assume http
$this->ExternalURL = 'http://' . $this->ExternalURL;
} elseif (!in_array($urlParts['scheme'], [
'http',
'https',
])) {
// we only allow http(s) urls
$this->ExternalURL = '';
}
} else {
// malformed URL to reject
$this->ExternalURL = '';
}
}
}
GuySartorelli marked this conversation as resolved.
Show resolved Hide resolved

public function getCMSFields()
{
$this->beforeUpdateCMSFields(function (FieldList $fields) {
// Remove all metadata fields, does not apply for redirector pages
$fields->removeByName('Metadata');
$fields->dataFieldByName('ExternalURL')?->setAllowRelativeProtocol(true);
GuySartorelli marked this conversation as resolved.
Show resolved Hide resolved

$fields->addFieldsToTab(
'Root.Main',
Expand Down
38 changes: 0 additions & 38 deletions tests/php/Model/RedirectorPageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,6 @@ public function testReflexiveAndTransitiveInternalRedirectors()
$this->assertEquals(Director::absoluteURL('/redirection-dest'), $response->getHeader("Location"));
}

public function testExternalURLGetsPrefixIfNotSet()
{
$page = $this->objFromFixture(RedirectorPage::class, 'externalnoprefix');
$this->assertEquals($page->ExternalURL, 'http://google.com', 'onBeforeWrite has prefixed with http');
$page->write();
$this->assertEquals(
$page->ExternalURL,
'http://google.com',
'onBeforeWrite will not double prefix if written again!'
);
}

public function testAllowsProtocolRelative()
{
$noProtocol = new RedirectorPage(['ExternalURL' => 'mydomain.com']);
$noProtocol->write();
$this->assertEquals('http://mydomain.com', $noProtocol->ExternalURL);

$protocolAbsolute = new RedirectorPage(['ExternalURL' => 'http://mydomain.com']);
$protocolAbsolute->write();
$this->assertEquals('http://mydomain.com', $protocolAbsolute->ExternalURL);

$protocolRelative = new RedirectorPage(['ExternalURL' => '//mydomain.com']);
$protocolRelative->write();
$this->assertEquals('//mydomain.com', $protocolRelative->ExternalURL);
}

/**
* Test that we can trigger a redirection before RedirectorPageController::init() is called
*/
Expand All @@ -163,17 +136,6 @@ public function testRedirectRespectsFinishedResponse()
RedirectorPageController::remove_extension(RedirectorPageTest_RedirectExtension::class);
}

public function testNoJSLinksAllowed()
{
$page = new RedirectorPage();
$js = 'javascript:alert("hello world")';
$page->ExternalURL = $js;
$this->assertEquals($js, $page->ExternalURL);

$page->write();
$this->assertEmpty($page->ExternalURL);
}

public function testFileRedirector()
{
$page = $this->objFromFixture(RedirectorPage::class, 'file');
Expand Down
Loading