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

Do not send the header if it is not defined

Browse Source
This commit is contained in:
Robbie Averill 2017-01-11 08:26:04 +13:00
parent cb2dcc75f1
commit 2f6f5b5eff
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Security.php
View File

@ -336,7 +336,9 @@ class Security extends Controller implements TemplateGlobalProvider {
$this->getResponse()->addHeader('X-Frame-Options', $this->config()->frame_options); $this->getResponse()->addHeader('X-Frame-Options', $this->config()->frame_options);
// Prevent search engines from indexing the login page // Prevent search engines from indexing the login page
$this->getResponse()->addHeader('X-Robots-Tag', $this->config()->robots_tag); if ($this->config()->robots_tag) {
$this->getResponse()->addHeader('X-Robots-Tag', $this->config()->robots_tag);
}
} }
public function index() { public function index() {

7
tests/security/SecurityTest.php
View File

@ -581,6 +581,13 @@ class SecurityTest extends FunctionalTest {
$this->assertContains('noindex', $robotsHeader); $this->assertContains('noindex', $robotsHeader);
} }
public function testDoNotSendEmptyRobotsHeaderIfNotDefined() {
Config::inst()->update('Security', 'robots_tag', null);
$response = $this->get(Config::inst()->get('Security', 'login_url'));
$robotsHeader = $response->getHeader('X-Robots-Tag');
$this->assertNull($robotsHeader);
}
/** /**
* Execute a log-in form using Director::test(). * Execute a log-in form using Director::test().
* Helper method for the tests above * Helper method for the tests above