Unreviewed, rolling out r195493.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Jan 2016 07:13:53 +0000 (07:13 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Jan 2016 07:13:53 +0000 (07:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153397

Broke authenticaiton tests (leaks credentials) (Requested by
ap on #webkit).

Reverted changeset:

"LayoutTest http/tests/security/xssAuditor/embed-tag-in-path-
unterminated.html crashing"
https://bugs.webkit.org/show_bug.cgi?id=153250
http://trac.webkit.org/changeset/195493

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt [deleted file]
LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes.html [deleted file]
LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes-expected.txt [deleted file]
LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes.html [deleted file]
LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/network/CredentialStorage.cpp

index 60d179f..4fdb40d 100644 (file)
@@ -1,3 +1,18 @@
+2016-01-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r195493.
+        https://bugs.webkit.org/show_bug.cgi?id=153397
+
+        Broke authenticaiton tests (leaks credentials) (Requested by
+        ap on #webkit).
+
+        Reverted changeset:
+
+        "LayoutTest http/tests/security/xssAuditor/embed-tag-in-path-
+        unterminated.html crashing"
+        https://bugs.webkit.org/show_bug.cgi?id=153250
+        http://trac.webkit.org/changeset/195493
+
 2016-01-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         HTMLElement::nodeName should not upper case non-ASCII characters
diff --git a/LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt b/LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt
deleted file mode 100644 (file)
index 8b04521..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-http://127.0.0.1:8000/loading/resources/basic-auth-testing.php?username=webkit&password=rocks - didReceiveAuthenticationChallenge - Responding with webkit:rocks
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - willPerformClientRedirectToURL: http://127.0.0.1:8000/a//b/non-existent-file.html 
-frame "frame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-frame "frame" - didStartProvisionalLoadForFrame
-frame "frame" - didCancelClientRedirectForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didReceiveTitle: 404 Not Found
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - didFailLoadWithError
-PASS did not cause assertion failure.
diff --git a/LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes.html b/LayoutTests/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes.html
deleted file mode 100644 (file)
index 209e665..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    testRunner.setHandlesAuthenticationChallenges(true);
-    testRunner.setAuthenticationUsername("webkit");
-    testRunner.setAuthenticationPassword("rocks");
-    testRunner.waitUntilDone();
-}
-
-function done()
-{
-    document.body.removeChild(document.getElementById("frame"));
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function notifyFrameDidLoad(frame)
-{
-    frame.onload = done;
-    frame.src = "http://127.0.0.1:8000/a//b/non-existent-file.html";
-}
-</script>
-</head>
-<body>
-<iframe id="frame" src="resources/basic-auth-testing.php?username=webkit&password=rocks" onload="notifyFrameDidLoad(this)"></iframe>
-<p>PASS did not cause assertion failure.</p>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes-expected.txt b/LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes-expected.txt
deleted file mode 100644 (file)
index 2fd279d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS did not cause assertion failure.
diff --git a/LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes.html b/LayoutTests/http/tests/xmlhttprequest/basic-auth-load-URL-with-consecutive-slashes.html
deleted file mode 100644 (file)
index b4ad88a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText()
-
-function sendWithCredentials()
-{
-    var xhr = new XMLHttpRequest;
-    xhr.open("GET", "resources/remember-bad-password/count-failures.php", false, "foo", "bar");
-    xhr.send("");
-}
-
-function sendWithoutCredentials()
-{
-    var xhr = new XMLHttpRequest;
-    xhr.open("GET", "resources/remember-bad-password//count-failures.php", false);
-    xhr.send("");
-}
-
-function reset()
-{
-    var xhr = new XMLHttpRequest;
-    xhr.open("GET", "resources/remember-bad-password/count-failures.php?command=reset", false);
-    xhr.send("");
-}
-
-sendWithCredentials();
-sendWithoutCredentials();
-reset();
-</script>
-<p>PASS did not cause assertion failure.</p>
-</body>
-</html>
diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt
deleted file mode 100644 (file)
index 575c050..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "frame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with webkit:rocks
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - willPerformClientRedirectToURL: http://127.0.0.1:8000/a//b/non-existent-file.html 
-frame "frame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "frame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-frame "frame" - didStartProvisionalLoadForFrame
-frame "frame" - didCancelClientRedirectForFrame
-frame "frame" - didCommitLoadForFrame
-frame "frame" - didReceiveTitle: 404 Not Found
-frame "frame" - didFinishDocumentLoadForFrame
-frame "frame" - didFailLoadWithError
-PASS did not cause assertion failure.
index 8acbd11..7f67dd6 100644 (file)
@@ -1,3 +1,18 @@
+2016-01-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r195493.
+        https://bugs.webkit.org/show_bug.cgi?id=153397
+
+        Broke authenticaiton tests (leaks credentials) (Requested by
+        ap on #webkit).
+
+        Reverted changeset:
+
+        "LayoutTest http/tests/security/xssAuditor/embed-tag-in-path-
+        unterminated.html crashing"
+        https://bugs.webkit.org/show_bug.cgi?id=153250
+        http://trac.webkit.org/changeset/195493
+
 2016-01-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         HTMLElement::nodeName should not upper case non-ASCII characters
index 104769b..f5aada8 100644 (file)
@@ -123,6 +123,7 @@ HashMap<String, ProtectionSpace>::iterator CredentialStorage::findDefaultProtect
         ASSERT(index != notFound);
         directoryURL = directoryURL.substring(0, (index == directoryURLPathStart) ? index + 1 : index);
         ASSERT(directoryURL.length() > directoryURLPathStart);
+        ASSERT(directoryURL.length() == directoryURLPathStart + 1 || directoryURL[directoryURL.length() - 1] != '/');
     }
 }