diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-02 08:57:53 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-02 08:57:53 -0700 |
| commit | 755adf0ddefb060007c0319655f994445aea4709 (patch) | |
| tree | d176643bbeb46c563e74b8e6cbc617a96b3f01ee | |
| parent | 3286d2812a083aa4a081d888a40e86b0b12b5c20 (diff) | |
| parent | 2093291539b6011fd76733414d145e61c92c0814 (diff) | |
| download | servo-755adf0ddefb060007c0319655f994445aea4709.tar.gz servo-755adf0ddefb060007c0319655f994445aea4709.zip | |
auto merge of #4793 : KiChjang/servo/xhr-cred-check, r=Manishearth
Fixes #4665
4 files changed, 16 insertions, 15 deletions
diff --git a/components/script/dom/webidls/XMLHttpRequest.webidl b/components/script/dom/webidls/XMLHttpRequest.webidl index ba100ca23ad..6066ba9c17b 100644 --- a/components/script/dom/webidls/XMLHttpRequest.webidl +++ b/components/script/dom/webidls/XMLHttpRequest.webidl @@ -50,6 +50,7 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget { void setRequestHeader(ByteString name, ByteString value); [SetterThrows] attribute unsigned long timeout; + [SetterThrows] attribute boolean withCredentials; readonly attribute XMLHttpRequestUpload upload; [Throws] diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 0f6e9551272..961125bf25b 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -489,8 +489,21 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { fn WithCredentials(self) -> bool { self.with_credentials.get() } - fn SetWithCredentials(self, with_credentials: bool) { - self.with_credentials.set(with_credentials); + // Spec for SetWithCredentials: https://xhr.spec.whatwg.org/#dom-xmlhttprequest-withcredentials + fn SetWithCredentials(self, with_credentials: bool) -> ErrorResult { + match self.ready_state.get() { + XMLHttpRequestState::HeadersReceived | + XMLHttpRequestState::Loading | + XMLHttpRequestState::XHRDone => Err(InvalidState), + _ if self.send_flag.get() => Err(InvalidState), + _ => match self.global.root() { + GlobalRoot::Window(_) if self.sync.get() => Err(InvalidAccess), + _ => { + self.with_credentials.set(with_credentials); + Ok(()) + }, + }, + } } fn Upload(self) -> Temporary<XMLHttpRequestUpload> { Temporary::new(self.upload) diff --git a/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini b/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini deleted file mode 100644 index 3c608dca283..00000000000 --- a/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[XMLHttpRequest-withCredentials.html] - type: testharness - [setting on synchronous XHR] - expected: FAIL - - [setting withCredentials when not in UNSENT, OPENED state] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini b/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini deleted file mode 100644 index 46e66dde6ba..00000000000 --- a/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini +++ /dev/null @@ -1,5 +0,0 @@ -[XMLHttpRequest-withCredentials.worker] - type: testharness - [setting withCredentials when not in UNSENT, OPENED state] - expected: FAIL - |