Diff
Modified: branches/safari-611-branch/LayoutTests/ChangeLog (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/ChangeLog 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/ChangeLog 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,3 +1,7 @@
+2021-02-10 Alan Coon <[email protected]>
+
+ Revert r272541. rdar://problem/74208306
+
2021-02-08 Russell Epstein <[email protected]>
Cherry-pick r272345. rdar://problem/74032500
Modified: branches/safari-611-branch/LayoutTests/http/wpt/credential-management/credentialscontainer-store-basics.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/credential-management/credentialscontainer-store-basics.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/credential-management/credentialscontainer-store-basics.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS navigator.credentials.store().
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-failure.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-failure.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-failure.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,11 +1,11 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS CTAP HID with init sub stage data not sent error in a mock hid authenticator.
PASS CTAP HID with init sub stage empty report error in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-success.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-success.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-hid-success.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,8 +1,8 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS CTAP HID with keep alive message in a mock hid authenticator.
PASS CTAP HID with fast data arrival in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-nfc-failure.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-nfc-failure.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/ctap-nfc-failure.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS CTAP NFC with empty apdu response in a mock nfc authenticator.
PASS CTAP NFC with wrong data error in a mock nfc authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/idl.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/idl.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/idl.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
Description
This test verifies that the implementations of the WebAuthN API match with its WebIDL definition.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,7 +1,7 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with malicious payload in a mock hid authenticator.
PASS PublicKeyCredential's [[create]] with unsupported options in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,9 +1,9 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with timeout in a mock hid authenticator.
PASS PublicKeyCredential's [[create]] with malicious payload in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https.html (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https.html 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-hid.https.html 2021-02-10 23:31:00 UTC (rev 272691)
@@ -26,7 +26,7 @@
}
};
- return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "This request has been cancelled by the user.");
+ return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "Operation timed out.");
}, "PublicKeyCredential's [[create]] with timeout in a mock hid authenticator.");
promise_test(function(t) {
@@ -92,7 +92,7 @@
if (window.internals)
internals.setMockWebAuthenticationConfiguration({ hid: { stage: "request", subStage: "msg", error: "unsupported-options" } });
- return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "This request has been cancelled by the user.");
+ return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "Operation timed out.");
}, "PublicKeyCredential's [[create]] with mixed options in a mock hid authenticator.");
promise_test(function(t) {
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,9 +1,9 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with unsupported public key credential parameters in a mock local authenticator.
PASS PublicKeyCredential's [[create]] with matched exclude credentials in a mock local authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-local.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with unsupported public key credential parameters in a mock local authenticator.
PASS PublicKeyCredential's [[create]] with matched exclude credentials in a mock local authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,10 +1,10 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with timeout in a mock nfc authenticator.
PASS PublicKeyCredential's [[create]] with no tags in a mock nfc authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https.html (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https.html 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-nfc.https.html 2021-02-10 23:31:00 UTC (rev 272691)
@@ -26,7 +26,7 @@
}
};
- return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "This request has been cancelled by the user.");
+ return promiseRejects(t, "NotAllowedError", navigator.credentials.create(options), "Operation timed out.");
}, "PublicKeyCredential's [[create]] with timeout in a mock nfc authenticator.");
promise_test(function(t) {
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,10 +1,10 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with malformed APDU payload in a mock hid authenticator.
PASS PublicKeyCredential's [[create]] with malformed U2F register response in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure-u2f.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,10 +1,10 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with malformed APDU payload in a mock hid authenticator.
PASS PublicKeyCredential's [[create]] with malformed U2F register response in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-failure.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[create]] with timeout
PASS PublicKeyCredential's [[create]] with a mismatched RP ID
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-hid.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,16 +1,16 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with minimum options in a mock hid authenticator.
PASS PublicKeyCredential's [[create]] with authenticatorSelection { 'cross-platform' } in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-local.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-local.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-local.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,11 +1,11 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with minimum options in a mock local authenticator.
PASS PublicKeyCredential's [[create]] with authenticatorSelection { 'platform' } in a mock local authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-nfc.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-nfc.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-nfc.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,10 +1,10 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with minimum options in a mock nfc authenticator.
PASS PublicKeyCredential's [[create]] with authenticatorSelection { 'cross-platform' } in a mock nfc authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-u2f.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-u2f.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-create-success-u2f.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,10 +1,10 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
PASS PublicKeyCredential's [[create]] with minimum options in a mock u2f authenticator.
PASS PublicKeyCredential's [[create]] with excludeCredentials in a mock u2f authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,7 +1,7 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with malicious payload in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with invalid credential in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,9 +1,9 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with timeout in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with malicious payload in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https.html (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https.html 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-hid.https.html 2021-02-10 23:31:00 UTC (rev 272691)
@@ -21,7 +21,7 @@
}
};
- return promiseRejects(t, "NotAllowedError", navigator.credentials.get(options), "This request has been cancelled by the user.");
+ return promiseRejects(t, "NotAllowedError", navigator.credentials.get(options), "Operation timed out.");
}, "PublicKeyCredential's [[get]] with timeout in a mock hid authenticator.");
promise_test(function(t) {
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,6 +1,6 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with no matched credentials in a mock local authenticator.
PASS PublicKeyCredential's [[get]] with no matched credentials in a mock local authenticator. 2nd
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-local.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,7 +1,7 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with no matched credentials in a mock local authenticator.
PASS PublicKeyCredential's [[get]] with no matched credentials in a mock local authenticator. 2nd
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-nfc.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-nfc.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-nfc.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with timeout in a mock nfc authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f-silent.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f-silent.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f-silent.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,6 +1,6 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with malformed sign response in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with no matched allow credentials in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure-u2f.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,8 +1,8 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with malformed sign response in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with no matched allow credentials in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-failure.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with timeout
PASS PublicKeyCredential's [[get]] with a mismatched RP ID
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-hid.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-hid.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-hid.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with minimum options in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with matched allow credentials in a mock hid authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-local.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-local.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-local.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with minimum options in a mock local authenticator.
PASS PublicKeyCredential's [[get]] with matched allow credentials in a mock local authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-nfc.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-nfc.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-nfc.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with minimum options in a mock nfc authenticator.
PASS PublicKeyCredential's [[get]] with U2F in a mock nfc authenticator.
Modified: branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-u2f.https-expected.txt (272690 => 272691)
--- branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-u2f.https-expected.txt 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/LayoutTests/http/wpt/webauthn/public-key-credential-get-success-u2f.https-expected.txt 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,14 +1,14 @@
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
-CONSOLE MESSAGE: User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
+CONSOLE MESSAGE: User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events.
PASS PublicKeyCredential's [[get]] with minimum options in a mock hid authenticator.
PASS PublicKeyCredential's [[get]] with more allow credentials in a mock hid authenticator.
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,3 +1,7 @@
+2021-02-10 Alan Coon <[email protected]>
+
+ Revert r272541. rdar://problem/74208306
+
2021-02-08 Russell Epstein <[email protected]>
Cherry-pick r272345. rdar://problem/74032500
Modified: branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp 2021-02-10 23:31:00 UTC (rev 272691)
@@ -292,11 +292,6 @@
m_client->isUserVerifyingPlatformAuthenticatorAvailable(WTFMove(completionHandler));
}
-void AuthenticatorCoordinator::resetUserGestureRequirement()
-{
- m_client->resetUserGestureRequirement();
-}
-
} // namespace WebCore
#endif // ENABLE(WEB_AUTHN)
Modified: branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.h (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.h 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.h 2021-02-10 23:31:00 UTC (rev 272691)
@@ -57,8 +57,6 @@
void discoverFromExternalSource(const Document&, const PublicKeyCredentialRequestOptions&, bool sameOriginWithAncestors, RefPtr<AbortSignal>&&, CredentialPromise&&) const;
void isUserVerifyingPlatformAuthenticatorAvailable(DOMPromiseDeferred<IDLBoolean>&&) const;
- void resetUserGestureRequirement();
-
private:
AuthenticatorCoordinator() = default;
Modified: branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinatorClient.h (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinatorClient.h 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/Modules/webauthn/AuthenticatorCoordinatorClient.h 2021-02-10 23:31:00 UTC (rev 272691)
@@ -55,8 +55,6 @@
virtual void makeCredential(const Frame&, const SecurityOrigin&, const Vector<uint8_t>&, const PublicKeyCredentialCreationOptions&, RequestCompletionHandler&&) { };
virtual void getAssertion(const Frame&, const SecurityOrigin&, const Vector<uint8_t>&, const PublicKeyCredentialRequestOptions&, RequestCompletionHandler&&) { };
virtual void isUserVerifyingPlatformAuthenticatorAvailable(QueryCompletionHandler&&) { };
-
- virtual void resetUserGestureRequirement() { }
};
} // namespace WebCore
Modified: branches/safari-611-branch/Source/WebCore/page/Quirks.cpp (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/page/Quirks.cpp 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/page/Quirks.cpp 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1345,30 +1345,4 @@
#endif
}
-#if ENABLE(WEB_AUTHN)
-bool Quirks::shouldBypassUserGestureRequirementForWebAuthn() const
-{
- if (!needsQuirks())
- return false;
-
- auto host = m_document->topDocument().url().host();
- if (equalLettersIgnoringASCIICase(host, "dropbox.com") || host.endsWithIgnoringASCIICase(".dropbox.com"))
- return true;
-
- if (equalLettersIgnoringASCIICase(host, "microsoft.com") || host.endsWithIgnoringASCIICase(".microsoft.com"))
- return true;
-
- if (equalLettersIgnoringASCIICase(host, "google.com") || host.endsWithIgnoringASCIICase(".google.com"))
- return true;
-
- if (equalLettersIgnoringASCIICase(host, "twitter.com") || host.endsWithIgnoringASCIICase(".twitter.com"))
- return true;
-
- if (equalLettersIgnoringASCIICase(host, "facebook.com") || host.endsWithIgnoringASCIICase(".facebook.com"))
- return true;
-
- return false;
}
-#endif
-
-}
Modified: branches/safari-611-branch/Source/WebCore/page/Quirks.h (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/page/Quirks.h 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/page/Quirks.h 2021-02-10 23:31:00 UTC (rev 272691)
@@ -139,10 +139,6 @@
static RegistrableDomain mapToTopDomain(const URL&);
#endif
-#if ENABLE(WEB_AUTHN)
- WEBCORE_EXPORT bool shouldBypassUserGestureRequirementForWebAuthn() const;
-#endif
-
private:
bool needsQuirks() const;
Modified: branches/safari-611-branch/Source/WebCore/replay/UserInputBridge.cpp (272690 => 272691)
--- branches/safari-611-branch/Source/WebCore/replay/UserInputBridge.cpp 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebCore/replay/UserInputBridge.cpp 2021-02-10 23:31:00 UTC (rev 272691)
@@ -28,7 +28,6 @@
#include "config.h"
#include "UserInputBridge.h"
-#include "AuthenticatorCoordinator.h"
#include "EventHandler.h"
#include "FocusController.h"
#include "Frame.h"
@@ -115,17 +114,11 @@
void UserInputBridge::loadRequest(FrameLoadRequest&& request, InputSource)
{
-#if ENABLE(WEB_AUTHN)
- m_page.authenticatorCoordinator().resetUserGestureRequirement();
-#endif
m_page.mainFrame().loader().load(WTFMove(request));
}
void UserInputBridge::reloadFrame(Frame& frame, OptionSet<ReloadOption> options, InputSource)
{
-#if ENABLE(WEB_AUTHN)
- m_page.authenticatorCoordinator().resetUserGestureRequirement();
-#endif
frame.loader().reload(options);
}
Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (272690 => 272691)
--- branches/safari-611-branch/Source/WebKit/ChangeLog 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,3 +1,7 @@
+2021-02-10 Alan Coon <[email protected]>
+
+ Revert r272541. rdar://problem/74208306
+
2021-02-08 Russell Epstein <[email protected]>
Cherry-pick r272345. rdar://problem/74032500
Modified: branches/safari-611-branch/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp (272690 => 272691)
--- branches/safari-611-branch/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2021-02-10 23:31:00 UTC (rev 272691)
@@ -387,9 +387,9 @@
if (!LocalService::isAvailable())
transports.remove(AuthenticatorTransport::Internal);
- // For the modern UI, we should only consider invoking it when the operation is triggered by users.
+ // Local authenticator might invoke system UI which should definitely not be able to trigger by scripts automatically.
if (!m_pendingRequestData.processingUserGesture)
- transports.clear();
+ transports.remove(AuthenticatorTransport::Internal);
}
void AuthenticatorManager::startDiscovery(const TransportSet& transports)
@@ -435,11 +435,6 @@
// Get available transports and start discovering authenticators on them.
auto& options = m_pendingRequestData.options;
auto transports = getTransports();
- if (transports.isEmpty()) {
- cancel();
- return;
- }
-
m_pendingRequestData.panel = API::WebAuthenticationPanel::create(*this, getRpId(options), transports, getClientDataType(options));
auto& panel = *m_pendingRequestData.panel;
page->uiClient().runWebAuthenticationPanel(*page, panel, *frame, FrameInfoData { m_pendingRequestData.frameInfo }, [transports = WTFMove(transports), weakPanel = makeWeakPtr(panel), weakThis = makeWeakPtr(*this), this] (WebAuthenticationPanelResult result) {
@@ -456,11 +451,6 @@
{
// Get available transports and start discovering authenticators on them.
auto transports = getTransports();
- if (transports.isEmpty()) {
- cancel();
- return;
- }
-
startDiscovery(transports);
// For native API support, we skip the UI part. The native API will handle that.
@@ -510,7 +500,7 @@
{
auto weakPanel = m_pendingRequestData.weakPanel;
if (!weakPanel)
- weakPanel = makeWeakPtr(m_pendingRequestData.panel.get());
+ weakPanel = makeWeakPtr(*m_pendingRequestData.panel.get());
if (!weakPanel)
return;
Modified: branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp (272690 => 272691)
--- branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp 2021-02-10 23:31:00 UTC (rev 272691)
@@ -38,10 +38,8 @@
#include "WebProcess.h"
#include <_javascript_Core/ConsoleTypes.h>
#include <WebCore/AuthenticatorResponseData.h>
-#include <WebCore/Frame.h>
#include <WebCore/PublicKeyCredentialCreationOptions.h>
#include <WebCore/PublicKeyCredentialRequestOptions.h>
-#include <WebCore/Quirks.h>
#include <WebCore/RuntimeEnabledFeatures.h>
#include <WebCore/SecurityOrigin.h>
#include <WebCore/UserGestureIndicator.h>
@@ -69,15 +67,18 @@
if (!webFrame)
return;
- auto isProcessingUserGesture = processingUserGesture(frame, webFrame->frameID());
+ auto processingUserGesture = UserGestureIndicator::processingUserGestureForMedia();
+ if (!processingUserGesture)
+ m_webPage.addConsoleMessage(webFrame->frameID(), MessageSource::Other, MessageLevel::Warning, "User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.create' within user activated events."_s);
+
if (!RuntimeEnabledFeatures::sharedFeatures().webAuthenticationModernEnabled()) {
- m_webPage.sendWithAsyncReply(Messages::WebAuthenticatorCoordinatorProxy::MakeCredential(webFrame->frameID(), webFrame->info(), hash, options, isProcessingUserGesture), WTFMove(handler));
+ m_webPage.sendWithAsyncReply(Messages::WebAuthenticatorCoordinatorProxy::MakeCredential(webFrame->frameID(), webFrame->info(), hash, options, processingUserGesture), WTFMove(handler));
return;
}
if (!isWebBrowser())
return;
- WebProcess::singleton().ensureWebAuthnProcessConnection().connection().sendWithAsyncReply(Messages::WebAuthnConnectionToWebProcess::MakeCredential(hash, options, isProcessingUserGesture), WTFMove(handler));
+ WebProcess::singleton().ensureWebAuthnProcessConnection().connection().sendWithAsyncReply(Messages::WebAuthnConnectionToWebProcess::MakeCredential(hash, options, processingUserGesture), WTFMove(handler));
}
void WebAuthenticatorCoordinator::getAssertion(const Frame& frame, const SecurityOrigin&, const Vector<uint8_t>& hash, const PublicKeyCredentialRequestOptions& options, RequestCompletionHandler&& handler)
@@ -86,15 +87,18 @@
if (!webFrame)
return;
- auto isProcessingUserGesture = processingUserGesture(frame, webFrame->frameID());
+ auto processingUserGesture = UserGestureIndicator::processingUserGestureForMedia();
+ if (!processingUserGesture)
+ m_webPage.addConsoleMessage(webFrame->frameID(), MessageSource::Other, MessageLevel::Warning, "User gesture is not detected. To use the platform authenticator, call 'navigator.credentials.get' within user activated events."_s);
+
if (!RuntimeEnabledFeatures::sharedFeatures().webAuthenticationModernEnabled()) {
- m_webPage.sendWithAsyncReply(Messages::WebAuthenticatorCoordinatorProxy::GetAssertion(webFrame->frameID(), webFrame->info(), hash, options, isProcessingUserGesture), WTFMove(handler));
+ m_webPage.sendWithAsyncReply(Messages::WebAuthenticatorCoordinatorProxy::GetAssertion(webFrame->frameID(), webFrame->info(), hash, options, processingUserGesture), WTFMove(handler));
return;
}
if (!isWebBrowser())
return;
- WebProcess::singleton().ensureWebAuthnProcessConnection().connection().sendWithAsyncReply(Messages::WebAuthnConnectionToWebProcess::GetAssertion(hash, options, isProcessingUserGesture), WTFMove(handler));
+ WebProcess::singleton().ensureWebAuthnProcessConnection().connection().sendWithAsyncReply(Messages::WebAuthnConnectionToWebProcess::GetAssertion(hash, options, processingUserGesture), WTFMove(handler));
}
void WebAuthenticatorCoordinator::isUserVerifyingPlatformAuthenticatorAvailable(QueryCompletionHandler&& handler)
@@ -109,17 +113,6 @@
WebProcess::singleton().ensureWebAuthnProcessConnection().connection().sendWithAsyncReply(Messages::WebAuthnConnectionToWebProcess::IsUserVerifyingPlatformAuthenticatorAvailable(), WTFMove(handler));
}
-bool WebAuthenticatorCoordinator::processingUserGesture(const Frame& frame, const FrameIdentifier& frameID)
-{
- bool needsQuirk = frame.document() && frame.document()->quirks().shouldBypassUserGestureRequirementForWebAuthn();
- auto processingUserGesture = UserGestureIndicator::processingUserGestureForMedia() || (!m_requireUserGesture && needsQuirk);
- if (!processingUserGesture)
- m_webPage.addConsoleMessage(frameID, MessageSource::Other, MessageLevel::Warning, "User gesture is not detected. To use the WebAuthn API, call 'navigator.credentials.create' within user activated events."_s);
-
- m_requireUserGesture = true;
- return processingUserGesture;
-}
-
} // namespace WebKit
#endif // ENABLE(WEB_AUTHN)
Modified: branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.h (272690 => 272691)
--- branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.h 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.h 2021-02-10 23:31:00 UTC (rev 272691)
@@ -28,7 +28,6 @@
#if ENABLE(WEB_AUTHN)
#include <WebCore/AuthenticatorCoordinatorClient.h>
-#include <WebCore/FrameIdentifier.h>
namespace WebKit {
@@ -43,12 +42,8 @@
void makeCredential(const WebCore::Frame&, const WebCore::SecurityOrigin&, const Vector<uint8_t>&, const WebCore::PublicKeyCredentialCreationOptions&, WebCore::RequestCompletionHandler&&) final;
void getAssertion(const WebCore::Frame&, const WebCore::SecurityOrigin&, const Vector<uint8_t>& hash, const WebCore::PublicKeyCredentialRequestOptions&, WebCore::RequestCompletionHandler&&) final;
void isUserVerifyingPlatformAuthenticatorAvailable(WebCore::QueryCompletionHandler&&) final;
- void resetUserGestureRequirement() final { m_requireUserGesture = false; }
- bool processingUserGesture(const WebCore::Frame&, const WebCore::FrameIdentifier&);
-
WebPage& m_webPage;
- bool m_requireUserGesture { false };
};
} // namespace WebKit
Modified: branches/safari-611-branch/Tools/ChangeLog (272690 => 272691)
--- branches/safari-611-branch/Tools/ChangeLog 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Tools/ChangeLog 2021-02-10 23:31:00 UTC (rev 272691)
@@ -1,3 +1,7 @@
+2021-02-10 Alan Coon <[email protected]>
+
+ Revert r272541. rdar://problem/74208306
+
2021-02-08 Russell Epstein <[email protected]>
Cherry-pick r272345. rdar://problem/74032500
Modified: branches/safari-611-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm (272690 => 272691)
--- branches/safari-611-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm 2021-02-10 23:27:13 UTC (rev 272690)
+++ branches/safari-611-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKWebAuthenticationPanel.mm 2021-02-10 23:31:00 UTC (rev 272691)
@@ -450,6 +450,24 @@
[webView waitForMessage:@"Succeeded!"];
}
+TEST(WebAuthenticationPanel, PanelTimeout)
+{
+ reset();
+ RetainPtr<NSURL> testURL = [[NSBundle mainBundle] URLForResource:@"web-authentication-get-assertion" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+
+ auto *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
+ [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationExperimentalFeature()];
+ [[configuration preferences] _setEnabled:NO forExperimentalFeature:webAuthenticationModernExperimentalFeature()];
+
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]);
+ auto delegate = adoptNS([[TestWebAuthenticationPanelUIDelegate alloc] init]);
+ [webView setUIDelegate:delegate.get()];
+
+ [webView loadRequest:[NSURLRequest requestWithURL:testURL.get()]];
+ Util::run(&webAuthenticationPanelRan);
+ Util::run(&webAuthenticationPanelFailed);
+}
+
TEST(WebAuthenticationPanel, PanelHidSuccess1)
{
reset();
@@ -1377,6 +1395,24 @@
cleanUpKeychain("");
}
+TEST(WebAuthenticationPanel, LANoMockDefaultOff)
+{
+ reset();
+ RetainPtr<NSURL> testURL = [[NSBundle mainBundle] URLForResource:@"web-authentication-make-credential-la-no-mock" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+
+ auto *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
+ [[configuration preferences] _setEnabled:YES forExperimentalFeature:webAuthenticationExperimentalFeature()];
+ [[configuration preferences] _setEnabled:NO forExperimentalFeature:webAuthenticationModernExperimentalFeature()];
+
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]);
+ auto delegate = adoptNS([[TestWebAuthenticationPanelUIDelegate alloc] init]);
+ [webView setUIDelegate:delegate.get()];
+
+ [webView loadRequest:[NSURLRequest requestWithURL:testURL.get()]];
+ Util::run(&webAuthenticationPanelRan);
+ checkPanel([delegate panel], @"", @[adoptNS([[NSNumber alloc] initWithInt:_WKWebAuthenticationTransportUSB]).get()], _WKWebAuthenticationTypeCreate);
+}
+
TEST(WebAuthenticationPanel, LAMakeCredentialNoMockNoUserGesture)
{
reset();
@@ -1391,7 +1427,8 @@
[webView setUIDelegate:delegate.get()];
[webView loadRequest:[NSURLRequest requestWithURL:testURL.get()]];
- [webView waitForMessage:@"This request has been cancelled by the user."];
+ Util::run(&webAuthenticationPanelRan);
+ checkPanel([delegate panel], @"", @[adoptNS([[NSNumber alloc] initWithInt:_WKWebAuthenticationTransportUSB]).get()], _WKWebAuthenticationTypeCreate);
}
TEST(WebAuthenticationPanel, LAMakeCredentialRollBackCredential)
@@ -1462,7 +1499,8 @@
[webView setUIDelegate:delegate.get()];
[webView loadRequest:[NSURLRequest requestWithURL:testURL.get()]];
- [webView waitForMessage:@"This request has been cancelled by the user."];
+ Util::run(&webAuthenticationPanelRan);
+ checkPanel([delegate panel], @"", @[adoptNS([[NSNumber alloc] initWithInt:_WKWebAuthenticationTransportUSB]).get()], _WKWebAuthenticationTypeGet);
}
TEST(WebAuthenticationPanel, LAGetAssertionMultipleOrder)
