auto merge of #4793 : KiChjang/servo/xhr-cred-check, r=Manishearth

Fixes #4665
servo · Feb 2, 2015 · 755adf0 · 755adf0
2 parents 3286d28 + 2093291
commit 755adf0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git 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
@@ -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
diff --git a/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini b/tests/wpt/metadata/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini