Attachment 347217 Details for Bug 186870 – Fix layout test

[patch] Fix layout test

fixed_layout_test.patch (text/plain), 44.00 KB, created by Ansh Shukla on 2018-08-15 15:56:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ansh Shukla

Created: 2018-08-15 15:56:24 PDT

Size: 44.00 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c766cb18557..d21f08ba693 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-15  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+
>+        Reviewed by Alex Christensen.
>+
>+        Ensure the exposed authentication type to clients is OAuth.
>+
>+        * http/tests/loading/oauth-expected.txt: Added.
>+        * http/tests/loading/oauth.html: Added.
>+        * http/tests/loading/resources/oauth-subresource.php: Added.
>+
> 2018-08-15  Christopher Reid  <chris.reid@sony.com>
> 
>         [Curl] Implement default cookie path handling correctly as outlined in RFC6265.
>diff --git a/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt b/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt
>index 528d046f9e1..3c4720b1e00 100644
>--- a/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt
>+++ b/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt
>@@ -1,5 +1,5 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUsername:testPassword
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUsername:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> Tests speculative revalidation of authenticated resources.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>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
>index f8ae3136948..b6ecb8b1ddd 100644
>--- 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
>@@ -2,7 +2,7 @@ main frame - didStartProvisionalLoadForFrame
> main frame - didCommitLoadForFrame
> 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
>+http://127.0.0.1:8000/loading/resources/basic-auth-testing.php?username=webkit&password=rocks - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with webkit:rocks
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - willPerformClientRedirectToURL: http://127.0.0.1:8000/a//b/non-existent-file.html 
>diff --git a/LayoutTests/http/tests/loading/oauth.html b/LayoutTests/http/tests/loading/oauth.html
>index 803dc1bbaa3..f603a6adbef 100644
>--- a/LayoutTests/http/tests/loading/oauth.html
>+++ b/LayoutTests/http/tests/loading/oauth.html
>@@ -19,4 +19,4 @@ function runTest() {
> 	}, 0);
> }
> </script>
>-<body onload="runtest()"></body>
>\ No newline at end of file
>+<body onload="runTest()"></body>
>diff --git a/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt
>index 94cf5394a19..7c2040f743e 100644
>--- a/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt
>+++ b/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt
>@@ -1,5 +1,5 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> Test for Resource request headers which may not have been immediately available but eventually are (Cookie, Authorization).
> 
> 
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt
>index 59ea275f49a..5a5c1acc0fd 100644
>--- a/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt
>@@ -3,7 +3,7 @@ main frame - didCommitLoadForFrame
> main frame - didFinishDocumentLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
> frame "" - didReceiveServerRedirectForProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with httpUsername:httpPassword
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>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
>index daf0f564794..84f1a154d4a 100644
>--- 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
>@@ -2,7 +2,7 @@ main frame - didStartProvisionalLoadForFrame
> main frame - didCommitLoadForFrame
> main frame - didFinishDocumentLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with webkit:rocks
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with webkit:rocks
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - willPerformClientRedirectToURL: http://127.0.0.1:8000/a//b/non-existent-file.html 
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
>index 607e0d80e81..b90b367768e 100644
>--- a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt
>@@ -4,13 +4,13 @@ main frame - didFinishDocumentLoadForFrame
> main frame - didHandleOnloadEventsForFrame
> main frame - didFinishLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with wrongusername:wrongpassword
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
> frame "" - didFinishLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with correctusername:correctpassword
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt
>index 754f507dcfb..eb91ebbe3b8 100644
>--- a/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt
>@@ -4,13 +4,13 @@ main frame - didFinishDocumentLoadForFrame
> main frame - didHandleOnloadEventsForFrame
> main frame - didFinishLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with first:first-pw
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with first:first-pw
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
> frame "" - didFinishLoadForFrame
> frame "" - didStartProvisionalLoadForFrame
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with second:second-pw
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with second:second-pw
> frame "" - didCommitLoadForFrame
> frame "" - didFinishDocumentLoadForFrame
> frame "" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt b/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt
>index dc8012b8ce3..77274418756 100644
>--- a/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt
>@@ -1,4 +1,4 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with username:password
>  
> Tests that the media player sends authorization credentials when requesting a media file.
> Testing same domain (127.0.0.1)
>diff --git a/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt b/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>index 00e0753eb03..8de44778bf9 100644
>--- a/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>@@ -1,5 +1,5 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
>-localhost:8000 - didReceiveAuthenticationChallenge - Responding with username:password
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with username:password
>+localhost:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with username:password
>  
> Tests that the media player sends authorization credentials when requesting a media file.
> Testing same domain (127.0.0.1)
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt
>index bab608a3506..ea00363a95c 100644
>--- a/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt
>@@ -1,2 +1,2 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> PASS
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt
>index 74f972bee5e..d859b159cce 100644
>--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt
>@@ -1,4 +1,4 @@
>-localhost:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> https://bugs.webkit.org/show_bug.cgi?id=40138
> You should load this page at 127.0.0.1:8000 so localhost:8000 is considered a different security origin.
> This test loads a php script which demands http authentication, then uses it to redirect to another script in a different origin that shows what authentication headers were sent with the final request.
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt
>index 992031014ef..d59fee57448 100644
>--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt
>@@ -1,4 +1,4 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> https://bugs.webkit.org/show_bug.cgi?id=66354
> You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
> This test loads a php script which demands http authentication, then uses it to redirect to another script in the same origin that shows what authentication headers were sent with the final request.
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt
>index a80c80b1fbf..89d98d0ae37 100644
>--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt
>@@ -1,4 +1,4 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> https://bugs.webkit.org/show_bug.cgi?id=66354
> You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
> This test loads a php script which demands http authentication, then uses it to redirect to another script in the same origin that shows what authentication headers were sent with the final request.
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt
>index b72f4b38f2e..217c8caa6d3 100644
>--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt
>@@ -1,4 +1,4 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> https://bugs.webkit.org/show_bug.cgi?id=105190
> You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
> This test loads a php script which demands http authentication, then uses it to redirect via 301 to another script in the same origin that shows what authentication headers were sent with the final request. It verifies that the credentials are not placed in the final URL.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt b/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt
>index fdfad3861d2..412b7117977 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt
>@@ -1,3 +1,3 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with username:password
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> PASS
>diff --git a/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt b/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt
>index 3aa99434903..6b9ff030379 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt
>@@ -1,8 +1,8 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> CONSOLE MESSAGE: Blocked http://localhost:8000/security/resources/subresource1/protected-image.php from asking for credentials because it is a cross-origin request.
> CONSOLE MESSAGE: Blocked https://localhost:8443/security/resources/subresource1/protected-image.php from asking for credentials because it is a cross-origin request.
> CONSOLE MESSAGE: Blocked http://localhost:8000/security/resources/subresource2/protected-image.php from asking for credentials because it is a cross-origin request.
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> CONSOLE MESSAGE: Blocked https://127.0.0.1:8443/security/resources/subresource2/protected-image.php from asking for credentials because it is a cross-origin request.
> CONSOLE MESSAGE: Blocked https://localhost:8443/security/resources/subresource2/protected-image.php from asking for credentials because it is a cross-origin request.
> CONSOLE MESSAGE: Blocked https://127.0.0.1:8443/security/resources/subresource2/protected-image.php from asking for credentials because it is a cross-origin request.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt b/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>index a19746e9330..19193f46293 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>@@ -1,4 +1,4 @@
> ALERT: parent host: 127.0.0.1 iframe host: 127.0.0.1 credentials:User: same-domain-user, password: same-domain-password.
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> ALERT: parent host: localhost iframe host: 127.0.0.1 credentials:Authentication canceled
> 
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index e5ee7e8227f..b5028ba5994 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,6 +1,6 @@
> CONSOLE MESSAGE: line 33: The page at https://127.0.0.1:8443/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8000/security/mixedContent/resources/subresource2/protected-image.php.
> 
>-localhost:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> Tests that we do not ask for credentials when loading an insecure image that requires basic authentication.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>index 252c48083b5..8c6e8bc1743 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt
>@@ -1,6 +1,6 @@
> CONSOLE MESSAGE: line 18: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image-redirects-to-basic-auth-secure-image.html?allowCrossOriginSubresourcesToAskForCredentials=1 was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
> 
>-localhost:8443 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8443 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> This test opens a new window to a secure page that loads an insecure image that redirects to a secure image guarded by basic authentication. The image should load.
> 
> PASS did load image.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt
>index 4ab9a32b991..ce61e7620ce 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt
>@@ -1,2 +1,2 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> Authenticated with username testUser.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt
>index b019aa7d689..0020e7614fb 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt
>@@ -1,2 +1,2 @@
>-127.0.0.1:8443 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+127.0.0.1:8443 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> Authenticated with username testUser.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index 44a59e64169..42d674b23bd 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,6 +1,6 @@
> CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://localhost:8443/security/mixedContent/resources/subresource/protected-image.php.
> 
>-localhost:8443 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8443 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> This test loads a secure image that redirects to an insecure image that redirects to a secure image guarded by basic authentication. The image should load.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index da01ffab2b6..dd01562823c 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,6 +1,6 @@
> CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https.html was allowed to display insecure content from http://localhost:8080/security/mixedContent/resources/subresource/protected-image.php.
> 
>-localhost:8080 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8080 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> This test loads a secure image that redirects to an secure image that redirects to an insecure image guarded by basic authentication. The image should load.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>index 3f96a8a4b62..eb9c90ca675 100644
>--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt
>@@ -1,4 +1,4 @@
>-localhost:8443 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
>+localhost:8443 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with testUser:testPassword
> This test loads a secure image that redirects to a secure image that redirects to a secure image guarded by basic authentication. The secure image should load.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt b/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt
>index 7259256ec9d..cb01ef1fbc5 100644
>--- a/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt
>@@ -1,5 +1,5 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
> 
> Sync, no credentials: OK
>diff --git a/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt b/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt
>index 400187f1212..7a514261240 100644
>--- a/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt
>@@ -1,5 +1,5 @@
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
>+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Simulating cancelled authentication sheet
> rdar://problem/7062824 A wrong password entered for site or proxy auth remains in WebCore credential storage, and is sent with subsequent requests.
> 
> This test counts the number of failed requests server side.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 45f39ffa7cb..ce27beca81c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-15  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by Alex Christensen.
>+
>+        Add the ProtectionSpaceAuthenticationSchemeOAuth type.
>+
>+        * platform/network/ProtectionSpaceBase.cpp:
>+        (WebCore::ProtectionSpaceBase::isPasswordBased const): Return yes because the oauth challenge
>+        expects a token in return.
>+        * platform/network/ProtectionSpaceBase.h:
>+        * platform/network/cocoa/ProtectionSpaceCocoa.mm:
>+        (WebCore::scheme):
>+        (WebCore::ProtectionSpace::nsSpace const):
>+
> 2018-08-15  Christopher Reid  <chris.reid@sony.com>
> 
>         [Curl] Implement default cookie path handling correctly as outlined in RFC6265.
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 188d7b61975..5b9fda826d8 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-15  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by Alex Christensen.
>+
>+        * pal/spi/cf/CFNetworkSPI.h: Declare OAuth string when not building against the
>+        internal SDK.
>+
> 2018-08-15  Aditya Keerthi  <akeerthi@apple.com>
> 
>         [Datalist] Add button to TextFieldInputs with a datalist
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index d9ba909b7fb..3dc2950aad8 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -178,6 +178,8 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> #endif
> @end
> 
>+extern NSString * const NSURLAuthenticationMethodOAuth;
>+
> #endif // defined(__OBJC__)
> 
> #endif // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
>diff --git a/Source/WebCore/platform/network/ProtectionSpaceBase.cpp b/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>index fca64c8012e..14eac6a042e 100644
>--- a/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>+++ b/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>@@ -108,6 +108,7 @@ bool ProtectionSpaceBase::isPasswordBased() const
>     case ProtectionSpaceAuthenticationSchemeHTMLForm:
>     case ProtectionSpaceAuthenticationSchemeNTLM:
>     case ProtectionSpaceAuthenticationSchemeNegotiate:
>+    case ProtectionSpaceAuthenticationSchemeOAuth:
>         return true;
>     case ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
>     case ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
>diff --git a/Source/WebCore/platform/network/ProtectionSpaceBase.h b/Source/WebCore/platform/network/ProtectionSpaceBase.h
>index b393e640184..720592dbb9f 100644
>--- a/Source/WebCore/platform/network/ProtectionSpaceBase.h
>+++ b/Source/WebCore/platform/network/ProtectionSpaceBase.h
>@@ -52,6 +52,7 @@ enum ProtectionSpaceAuthenticationScheme {
>     ProtectionSpaceAuthenticationSchemeNegotiate = 6,
>     ProtectionSpaceAuthenticationSchemeClientCertificateRequested = 7,
>     ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested = 8,
>+    ProtectionSpaceAuthenticationSchemeOAuth = 9,
>     ProtectionSpaceAuthenticationSchemeUnknown = 100
> };
>   
>diff --git a/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm b/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>index db1fb51bf99..6218ceab2fb 100644
>--- a/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>@@ -26,6 +26,8 @@
> #import "config.h"
> #import "ProtectionSpaceCocoa.h"
> 
>+#import <pal/spi/cf/CFNetworkSPI.h>
>+
> namespace WebCore {
> 
> static ProtectionSpaceServerType type(NSURLProtectionSpace *space)
>@@ -80,6 +82,8 @@ static ProtectionSpaceAuthenticationScheme scheme(NSURLProtectionSpace *space)
>     if ([method isEqualToString:NSURLAuthenticationMethodServerTrust])
>         return ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
> #endif
>+    if ([method isEqualToString:NSURLAuthenticationMethodOAuth])
>+        return ProtectionSpaceAuthenticationSchemeOAuth;
> 
>     ASSERT_NOT_REACHED();
>     return ProtectionSpaceAuthenticationSchemeUnknown;
>@@ -155,6 +159,9 @@ NSURLProtectionSpace *ProtectionSpace::nsSpace() const
>         method = NSURLAuthenticationMethodClientCertificate;
>         break;
> #endif
>+    case ProtectionSpaceAuthenticationSchemeOAuth:
>+        method = NSURLAuthenticationMethodOAuth;
>+        break;
>     default:
>         ASSERT_NOT_REACHED();
>     }
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 73da19e7745..2012161d701 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-15  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by Alex Christensen.
>+
>+        Correctly expose the OAuth protection space type in API.
>+
>+        * UIProcess/API/C/WKAPICast.h:
>+        (WebKit::toAPI):
>+        * UIProcess/API/C/WKProtectionSpaceTypes.h:
>+
> 2018-08-15  Tim Horton  <timothy_horton@apple.com>
> 
>         Crashes in Quip under _dictionaryPopupInfoForRange, in setObject:forKey:
>diff --git a/Source/WebKit/UIProcess/API/C/WKAPICast.h b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>index c50e1f92e00..e65fd97026c 100644
>--- a/Source/WebKit/UIProcess/API/C/WKAPICast.h
>+++ b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>@@ -364,6 +364,8 @@ inline WKProtectionSpaceAuthenticationScheme toAPI(WebCore::ProtectionSpaceAuthe
>         return kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>     case WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
>         return kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
>+    case WebCore::ProtectionSpaceAuthenticationSchemeOAuth:
>+        return kWKProtectionSpaceAuthenticationSchemeOAuth;
>     default:
>         return kWKProtectionSpaceAuthenticationSchemeUnknown;
>     }
>diff --git a/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h b/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>index 4741460490c..1b25d038746 100644
>--- a/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>+++ b/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>@@ -53,6 +53,7 @@ enum  {
>     kWKProtectionSpaceAuthenticationSchemeNegotiate,
>     kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested,
>     kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested,
>+    kWKProtectionSpaceAuthenticationSchemeOAuth,
>     kWKProtectionSpaceAuthenticationSchemeUnknown = 100,
> };
> typedef uint32_t WKProtectionSpaceAuthenticationScheme;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 3e7cc4ec2d3..00726f1e25a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-15  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by Alex Christensen.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::toString):
>+        (WTR::TestController::canAuthenticateAgainstProtectionSpace): Expose type of authentication challenge so we can test OAuth.
>+        (WTR::TestController::didReceiveAuthenticationChallenge):
>+
> 2018-08-15  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r234870.
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 01203ce19db..f3dc811624c 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -1809,6 +1809,32 @@ void TestController::didReceiveServerRedirectForProvisionalNavigation(WKPageRef
>     return;
> }
> 
>+static const char* toString(WKProtectionSpaceAuthenticationScheme scheme)
>+{
>+    switch (scheme) {
>+    case kWKProtectionSpaceAuthenticationSchemeDefault:
>+        return "ProtectionSpaceAuthenticationSchemeDefault";
>+    case kWKProtectionSpaceAuthenticationSchemeHTTPBasic:
>+        return "ProtectionSpaceAuthenticationSchemeHTTPBasic";
>+    case kWKProtectionSpaceAuthenticationSchemeHTMLForm:
>+        return "ProtectionSpaceAuthenticationSchemeHTMLForm";
>+    case kWKProtectionSpaceAuthenticationSchemeNTLM:
>+        return "ProtectionSpaceAuthenticationSchemeNTLM";
>+    case kWKProtectionSpaceAuthenticationSchemeNegotiate:
>+        return "ProtectionSpaceAuthenticationSchemeNegotiate";
>+    case kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested:
>+        return "ProtectionSpaceAuthenticationSchemeClientCertificateRequested";
>+    case kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
>+        return "ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested";
>+    case kWKProtectionSpaceAuthenticationSchemeOAuth:
>+        return "ProtectionSpaceAuthenticationSchemeOAuth";
>+    case kWKProtectionSpaceAuthenticationSchemeUnknown:
>+        return "ProtectionSpaceAuthenticationSchemeUnknown";
>+    }
>+    ASSERT_NOT_REACHED();
>+    return "ProtectionSpaceAuthenticationSchemeUnknown";
>+}
>+
> bool TestController::canAuthenticateAgainstProtectionSpace(WKPageRef page, WKProtectionSpaceRef protectionSpace)
> {
>     if (m_shouldLogCanAuthenticateAgainstProtectionSpace)
>@@ -1820,7 +1846,7 @@ bool TestController::canAuthenticateAgainstProtectionSpace(WKPageRef page, WKPro
>         return host == "localhost" || host == "127.0.0.1" || (m_allowAnyHTTPSCertificateForAllowedHosts && m_allowedHosts.find(host) != m_allowedHosts.end());
>     }
>     
>-    return authenticationScheme <= kWKProtectionSpaceAuthenticationSchemeHTTPDigest;
>+    return authenticationScheme <= kWKProtectionSpaceAuthenticationSchemeHTTPDigest || authenticationScheme == kWKProtectionSpaceAuthenticationSchemeOAuth;
> }
> 
> void TestController::didFinishNavigation(WKPageRef page, WKNavigationRef navigation)
>@@ -1840,8 +1866,9 @@ void TestController::didReceiveAuthenticationChallenge(WKPageRef page, WKAuthent
> {
>     WKProtectionSpaceRef protectionSpace = WKAuthenticationChallengeGetProtectionSpace(authenticationChallenge);
>     WKAuthenticationDecisionListenerRef decisionListener = WKAuthenticationChallengeGetDecisionListener(authenticationChallenge);
>+    WKProtectionSpaceAuthenticationScheme authenticationScheme = WKProtectionSpaceGetAuthenticationScheme(protectionSpace);
> 
>-    if (WKProtectionSpaceGetAuthenticationScheme(protectionSpace) == kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
>+    if (authenticationScheme == kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
>         // Any non-empty credential signals to accept the server trust. Since the cross-platform API
>         // doesn't expose a way to create a credential from server trust, we use a password credential.
> 
>@@ -1858,7 +1885,7 @@ void TestController::didReceiveAuthenticationChallenge(WKPageRef page, WKAuthent
> 
>     std::string host = toSTD(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
>     int port = WKProtectionSpaceGetPort(protectionSpace);
>-    String message = String::format("%s:%d - didReceiveAuthenticationChallenge - ", host.c_str(), port);
>+    String message = String::format("%s:%d - didReceiveAuthenticationChallenge - %s - ", host.c_str(), port, toString(authenticationScheme));
>     if (!m_handlesAuthenticationChallenges)
>         message.append("Simulating cancelled authentication sheet\n");
>     else

Actions: View | Formatted Diff | Diff

Attachments on bug 186870: 343201 | 346858 | 347110 | 347114 | 347120 | 347128 | 347209 | 347213 | 347217 | 347221 | 347222 | 347230 | 347231 | 347235 | 347237 | 347238