-
Notifications
You must be signed in to change notification settings - Fork 61
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.
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
Resolve issue #118 CORS issues in IE and Edge #119
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -269,6 +269,101 @@ public function testAddCorsHeadersResponseCORSDisabled() | |
$this->assertEquals('405', $response->getStatusCode()); | ||
} | ||
|
||
/** | ||
* IE and Edge are a bit weird, so we check CORS headers differently on the same domain | ||
* despite CORS being enabled. This checks if our IE exception plays nice | ||
*/ | ||
public function testIECorsHeadersResponseCORSEnabledOnSameDomain() | ||
{ | ||
Controller::config()->set('cors', [ | ||
'Enabled' => true, | ||
'Allow-Origin' => 'localhost', | ||
'Allow-Headers' => 'Authorization, Content-Type', | ||
'Allow-Methods' => 'GET, POST, OPTIONS', | ||
'Max-Age' => 86400 | ||
]); | ||
|
||
$controller = new Controller(); | ||
$request = new HTTPRequest('OPTIONS', ''); | ||
$request->addHeader('referer', 'http://localhost/admin/tests'); | ||
$request->addHeader('User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; Touch; rv:11.0) like Gecko'); | ||
$response = $controller->index($request); | ||
|
||
$this->assertTrue($response instanceof HTTPResponse); | ||
$this->assertEquals('200', $response->getStatusCode()); | ||
$this->assertNotEmpty($response->getHeader('Access-Control-Allow-Origin')); | ||
} | ||
|
||
/** | ||
* IE and Edge are a bit weird, so we check CORS headers differently on the same domain | ||
* despite CORS being enabled. This checks if our IE exception plays not nice without the user agent | ||
* @expectedException \SilverStripe\Control\HTTPResponse_Exception | ||
*/ | ||
public function testIECorsHeadersResponseCORSEnabledNoReferer() | ||
{ | ||
Controller::config()->set('cors', [ | ||
'Enabled' => true, | ||
'Allow-Origin' => 'localhost', | ||
'Allow-Headers' => 'Authorization, Content-Type', | ||
'Allow-Methods' => 'GET, POST, OPTIONS', | ||
'Max-Age' => 86400 | ||
]); | ||
|
||
$controller = new Controller(); | ||
$request = new HTTPRequest('OPTIONS', ''); | ||
$request->addHeader('referer', 'http://localhost/admin/tests'); | ||
$controller->index($request); | ||
} | ||
|
||
/** | ||
* IE and Edge are a bit weird, so we check CORS headers differently on the same domain | ||
* despite CORS being enabled. This checks if our IE exception plays nice | ||
*/ | ||
public function testEdgeCorsHeadersResponseCORSEnabledOnSameDomain() | ||
{ | ||
Controller::config()->set('cors', [ | ||
'Enabled' => true, | ||
'Allow-Origin' => 'localhost', | ||
'Allow-Headers' => 'Authorization, Content-Type', | ||
'Allow-Methods' => 'GET, POST, OPTIONS', | ||
'Max-Age' => 86400 | ||
]); | ||
|
||
$controller = new Controller(); | ||
$request = new HTTPRequest('OPTIONS', ''); | ||
$request->addHeader('referer', 'http://localhost/admin/tests'); | ||
// Yes, that is a real Edge user agent string! | ||
$request->addHeader('User-Agent', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063'); | ||
$response = $controller->index($request); | ||
|
||
$this->assertTrue($response instanceof HTTPResponse); | ||
$this->assertEquals('200', $response->getStatusCode()); | ||
$this->assertNotEmpty($response->getHeader('Access-Control-Allow-Origin')); | ||
} | ||
|
||
/** | ||
* IE and Edge are a bit weird, so we check CORS headers differently on the same domain | ||
* despite CORS being enabled. This checks if our IE exception plays nice | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's the Edge exception, not IE |
||
* @expectedException \SilverStripe\Control\HTTPResponse_Exception | ||
*/ | ||
public function testEdgeCorsHeadersResponseCORSEnabledNoReferer() | ||
{ | ||
Controller::config()->set('cors', [ | ||
'Enabled' => true, | ||
'Allow-Origin' => 'localhost', | ||
'Allow-Headers' => 'Authorization, Content-Type', | ||
'Allow-Methods' => 'GET, POST, OPTIONS', | ||
'Max-Age' => 86400 | ||
]); | ||
|
||
$controller = new Controller(); | ||
$request = new HTTPRequest('OPTIONS', ''); | ||
// Yes, that is a real Edge user agent string! | ||
$request->addHeader('User-Agent', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063'); | ||
$controller->index($request); | ||
} | ||
|
||
|
||
protected function getType(Manager $manager) | ||
{ | ||
return (new TypeCreatorFake($manager))->toType(); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs an update as this is a copy-paste from the inline comment