Diff
Modified: trunk/LayoutTests/ChangeLog (234911 => 234912)
--- trunk/LayoutTests/ChangeLog 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/ChangeLog 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1,3 +1,16 @@
+2018-08-15 Ansh Shukla <ansh_shu...@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.r...@sony.com>
[Curl] Implement default cookie path handling correctly as outlined in RFC6265.
Modified: trunk/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt (234911 => 234912)
--- trunk/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/speculative-validation/http-auth-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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".
Added: trunk/LayoutTests/http/tests/loading/oauth-expected.txt (0 => 234912)
--- trunk/LayoutTests/http/tests/loading/oauth-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/oauth-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -0,0 +1,6 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+
Added: trunk/LayoutTests/http/tests/loading/oauth.html (0 => 234912)
--- trunk/LayoutTests/http/tests/loading/oauth.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/oauth.html 2018-08-16 05:38:39 UTC (rev 234912)
@@ -0,0 +1,22 @@
+<script src=""
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setHandlesAuthenticationChallenges(false);
+ if (testRunner.setShouldLogCanAuthenticateAgainstProtectionSpace) {
+ testRunner.setShouldLogCanAuthenticateAgainstProtectionSpace(true);
+ testRunner.waitUntilDone();
+ }
+}
+
+function runtest() {
+ setTimeout(()=>{
+ fetch("resources/oauth-subresource.php").then(()=>{
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }, 0);
+}
+</script>
+<body _onload_="runtest()"></body>
Added: trunk/LayoutTests/http/tests/loading/resources/oauth-subresource.php (0 => 234912)
--- trunk/LayoutTests/http/tests/loading/resources/oauth-subresource.php (rev 0)
+++ trunk/LayoutTests/http/tests/loading/resources/oauth-subresource.php 2018-08-16 05:38:39 UTC (rev 234912)
@@ -0,0 +1,9 @@
+<?php
+$realm = $_SERVER['REQUEST_URI'];
+
+header("Cache-Control: no-store");
+header("WWW-Authenticate: OAuth realm=\"" . $realm . "\"");
+header('HTTP/1.1 401 Unauthorized');
+echo "Sent OAuth Challenge.";
+exit;
+?>
Modified: trunk/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/mac-wk2/http/tests/inspector/network/resource-request-headers-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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).
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -3,7 +3,7 @@
main frame - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - didStartProvisionalLoadForFrame
frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame
-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with httpUsername:httpPassword
frame "<!--frame1-->" - didCommitLoadForFrame
frame "<!--frame1-->" - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - didHandleOnloadEventsForFrame
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -2,7 +2,7 @@
main frame - didCommitLoadForFrame
main frame - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - didStartProvisionalLoadForFrame
-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with webkit:rocks
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with webkit:rocks
frame "<!--frame1-->" - didCommitLoadForFrame
frame "<!--frame1-->" - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/a//b/non-existent-file.html
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -4,13 +4,13 @@
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
frame "<!--frame1-->" - didStartProvisionalLoadForFrame
-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with wrongusername:wrongpassword
frame "<!--frame1-->" - didCommitLoadForFrame
frame "<!--frame1-->" - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - didHandleOnloadEventsForFrame
frame "<!--frame1-->" - didFinishLoadForFrame
frame "<!--frame2-->" - didStartProvisionalLoadForFrame
-127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeHTTPBasic - Responding with correctusername:correctpassword
frame "<!--frame2-->" - didCommitLoadForFrame
frame "<!--frame2-->" - didFinishDocumentLoadForFrame
frame "<!--frame2-->" - didHandleOnloadEventsForFrame
Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -4,13 +4,13 @@
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
frame "<!--frame1-->" - 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 "<!--frame1-->" - didCommitLoadForFrame
frame "<!--frame1-->" - didFinishDocumentLoadForFrame
frame "<!--frame1-->" - didHandleOnloadEventsForFrame
frame "<!--frame1-->" - didFinishLoadForFrame
frame "<!--frame2-->" - 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 "<!--frame2-->" - didCommitLoadForFrame
frame "<!--frame2-->" - didFinishDocumentLoadForFrame
frame "<!--frame2-->" - didHandleOnloadEventsForFrame
Added: trunk/LayoutTests/platform/wk2/http/tests/loading/oauth-expected.txt (0 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/loading/oauth-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/oauth-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -0,0 +1,8 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+canAuthenticateAgainstProtectionSpace
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - ProtectionSpaceAuthenticationSchemeOAuth - Simulating cancelled authentication sheet
+
Modified: trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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)
Modified: trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-with-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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)
Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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
Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/basic-auth-subresource-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/credentials-iframes-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-basic-auth-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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".
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-redirects-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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=""
-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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-insecure-page.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-page-navigates-to-basic-auth-secure-page-via-insecure-redirect.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-insecure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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=""
-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".
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-insecure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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".
Modified: trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/mixedContent/secure-redirect-to-secure-redirect-to-basic-auth-secure-image-allowCrossOriginSubresourcesToAskForCredentials.https-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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".
Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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
Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt (234911 => 234912)
--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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.
Modified: trunk/Source/WebCore/ChangeLog (234911 => 234912)
--- trunk/Source/WebCore/ChangeLog 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/ChangeLog 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1,3 +1,21 @@
+2018-08-15 Ansh Shukla <ansh_shu...@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 Ben Richards <benton_richa...@apple.com>
We should cache the compiled sandbox profile in a data vault
Modified: trunk/Source/WebCore/PAL/ChangeLog (234911 => 234912)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1,3 +1,14 @@
+2018-08-15 Ansh Shukla <ansh_shu...@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 <akeer...@apple.com>
[Datalist] Add button to TextFieldInputs with a datalist
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (234911 => 234912)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-08-16 05:38:39 UTC (rev 234912)
@@ -178,6 +178,8 @@
#endif
@end
+extern NSString * const NSURLAuthenticationMethodOAuth;
+
#endif // defined(__OBJC__)
#endif // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp (234911 => 234912)
--- trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp 2018-08-16 05:38:39 UTC (rev 234912)
@@ -108,6 +108,7 @@
case ProtectionSpaceAuthenticationSchemeHTMLForm:
case ProtectionSpaceAuthenticationSchemeNTLM:
case ProtectionSpaceAuthenticationSchemeNegotiate:
+ case ProtectionSpaceAuthenticationSchemeOAuth:
return true;
case ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
case ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
Modified: trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h (234911 => 234912)
--- trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2018-08-16 05:38:39 UTC (rev 234912)
@@ -52,6 +52,7 @@
ProtectionSpaceAuthenticationSchemeNegotiate = 6,
ProtectionSpaceAuthenticationSchemeClientCertificateRequested = 7,
ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested = 8,
+ ProtectionSpaceAuthenticationSchemeOAuth = 9,
ProtectionSpaceAuthenticationSchemeUnknown = 100
};
Modified: trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm (234911 => 234912)
--- trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm 2018-08-16 05:38:39 UTC (rev 234912)
@@ -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 @@
if ([method isEqualToString:NSURLAuthenticationMethodServerTrust])
return ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
#endif
+ if ([method isEqualToString:NSURLAuthenticationMethodOAuth])
+ return ProtectionSpaceAuthenticationSchemeOAuth;
ASSERT_NOT_REACHED();
return ProtectionSpaceAuthenticationSchemeUnknown;
@@ -155,6 +159,9 @@
method = NSURLAuthenticationMethodClientCertificate;
break;
#endif
+ case ProtectionSpaceAuthenticationSchemeOAuth:
+ method = NSURLAuthenticationMethodOAuth;
+ break;
default:
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebKit/ChangeLog (234911 => 234912)
--- trunk/Source/WebKit/ChangeLog 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebKit/ChangeLog 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1,3 +1,17 @@
+2018-08-15 Ansh Shukla <ansh_shu...@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 Ben Richards <benton_richa...@apple.com>
We should cache the compiled sandbox profile in a data vault
Modified: trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h (234911 => 234912)
--- trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h 2018-08-16 05:38:39 UTC (rev 234912)
@@ -364,6 +364,8 @@
return kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested;
case WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
return kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
+ case WebCore::ProtectionSpaceAuthenticationSchemeOAuth:
+ return kWKProtectionSpaceAuthenticationSchemeOAuth;
default:
return kWKProtectionSpaceAuthenticationSchemeUnknown;
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h (234911 => 234912)
--- trunk/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h 2018-08-16 05:38:39 UTC (rev 234912)
@@ -53,6 +53,7 @@
kWKProtectionSpaceAuthenticationSchemeNegotiate,
kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested,
kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested,
+ kWKProtectionSpaceAuthenticationSchemeOAuth,
kWKProtectionSpaceAuthenticationSchemeUnknown = 100,
};
typedef uint32_t WKProtectionSpaceAuthenticationScheme;
Modified: trunk/Tools/ChangeLog (234911 => 234912)
--- trunk/Tools/ChangeLog 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Tools/ChangeLog 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1,3 +1,16 @@
+2018-08-15 Ansh Shukla <ansh_shu...@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 Ben Richards <benton_richa...@apple.com>
We should cache the compiled sandbox profile in a data vault
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (234911 => 234912)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2018-08-16 05:35:58 UTC (rev 234911)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2018-08-16 05:38:39 UTC (rev 234912)
@@ -1809,6 +1809,32 @@
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 @@
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 @@
{
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 @@
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
