Skip to content

GitLab

T
tangled
Commit 8fa00285 authored by Nina Satragno's avatar Nina Satragno Committed by Commit Bot
Browse files
Options

[webauthn] Fix resident key credentials.get() WPT 

Fix the empty allowCredentials credentials.get() WPT. The test was
expecting the browser to return a non-resident credential with an
undefined allowCredentials list (which defaults to empty). Moreover, the
test helper itself was failing because it was expecting a credential to
be added to the test.

Instead, move the test to its own file that sets up the test environment
to support resident keys and add rk support to the helper with the
isResidentKeyTest flag that avoids appending credentials to
allowCredentials.

Bug: 875444
Change-Id: I8baefa3a74c2a707227df430712a09935c1fbbf1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2130671Reviewed-by: default avatarMartin Kreichgauer <martinkr@google.com>
Commit-Queue: Nina Satragno <nsatragno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755344}
parent 1c0318e9
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 24 deletions
third_party/blink/web_tests/external/wpt/webauthn/getcredential-passing.https-expected.txt deleted 100644 → 0
View file @ 1c0318e9
This is a testharness.js-based test.
PASS passing credentials.get() with default args
PASS passing credentials.create() with no timeout
PASS rpId undefined
PASS passing credentials.get() with rpId (hostname)
FAIL no credential specified promise_test: Unhandled rejection with value: object "Error: Attempting list without defining credential to test"
PASS authenticatorSelection userVerification undefined
PASS authenticatorSelection userVerification preferred
PASS authenticatorSelection userVerification discouraged
PASS extensions undefined
PASS extensions are empty object
PASS extensions are dict of empty strings
PASS Clean up the test environment
Harness: the test ran to completion.
third_party/blink/web_tests/external/wpt/webauthn/getcredential-passing.https.html
View file @ 8fa00285
...@@ -34,10 +34,6 @@ standardSetup(function() { ...@@ -34,10 +34,6 @@ standardSetup(function() {
.addCredential(credPromise) .addCredential(credPromise)
.runTest("passing credentials.get() with rpId (hostname)"); .runTest("passing credentials.get() with rpId (hostname)");
// allowCredentials
new GetCredentialsTest({path: "options.publicKey.allowCredentials", value: undefined})
.runTest("no credential specified");
// authnr selection user verification // authnr selection user verification
new GetCredentialsTest({path: "options.publicKey.userVerification", value: undefined}) new GetCredentialsTest({path: "options.publicKey.userVerification", value: undefined})
.addCredential(credPromise) .addCredential(credPromise)
......
third_party/blink/web_tests/external/wpt/webauthn/getcredential-rk-passing.https.html 0 → 100644
View file @ 8fa00285
<!DOCTYPE html>
<meta charset="utf-8">
<title>WebAuthn credential.get() Resident Key Passing Tests</title>
<meta name="timeout" content="long">
<link rel="help" href="hhttps://w3c.github.io/webauthn/#resident-credential">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src=helpers.js></script>
<body></body>
<script>
standardSetup(function() {
"use strict";
// create a resident key credential
var credPromise = createCredential({
options: {
publicKey: {
authenticatorSelection: {
requireResidentKey: true,
}
}
}
});
// empty allowCredential should find the requireResidentKey: true credential
new GetCredentialsTest({path: "options.publicKey.allowCredentials", value: []})
.addCredential(credPromise)
.setIsResidentKeyTest(true)
.runTest("empty allowCredentials");
// undefined allowCredential should be equivalent to empty
new GetCredentialsTest({path: "options.publicKey.allowCredentials", value: undefined})
.addCredential(credPromise)
.setIsResidentKeyTest(true)
.runTest("undefined allowCredentials");
}, {
// browsers may not allow resident key credential creation without uv
protocol: "ctap2",
hasResidentKey: true,
hasUserVerification: true,
isUserVerified: true,
});
/* JSHINT */
/* globals standardSetup, GetCredentialsTest, createCredential */
</script>
third_party/blink/web_tests/external/wpt/webauthn/helpers.js
View file @ 8fa00285
...@@ -35,6 +35,10 @@ var createCredentialDefaultArgs = { ...@@ -35,6 +35,10 @@ var createCredentialDefaultArgs = {
alg: cose_alg_ECDSA_w_SHA256, alg: cose_alg_ECDSA_w_SHA256,
}], }],
authenticatorSelection: {
requireResidentKey: false,
},
timeout: 60000, // 1 minute timeout: 60000, // 1 minute
excludeCredentials: [] // No excludeList excludeCredentials: [] // No excludeList
} }
...@@ -420,6 +424,9 @@ class GetCredentialsTest extends TestCase { ...@@ -420,6 +424,9 @@ class GetCredentialsTest extends TestCase {
this.credentialPromiseList = []; this.credentialPromiseList = [];
// set to true to pass an empty allowCredentials list to credentials.get
this.isResidentKeyTest = false;
// enable the constructor to modify the default testObject // enable the constructor to modify the default testObject
// would prefer to do this in the super class, but have to call super() before using `this.*` // would prefer to do this in the super class, but have to call super() before using `this.*`
if (arguments.length) { if (arguments.length) {
...@@ -464,7 +471,9 @@ class GetCredentialsTest extends TestCase { ...@@ -464,7 +471,9 @@ class GetCredentialsTest extends TestCase {
type: "public-key" type: "public-key"
}; };
}); });
this.testObject.options.publicKey.allowCredentials = idList; if (!this.isResidentKeyTest) {
this.testObject.options.publicKey.allowCredentials = idList;
}
// return super.test(desc); // return super.test(desc);
}) })
.catch((err) => { .catch((err) => {
...@@ -476,6 +485,11 @@ class GetCredentialsTest extends TestCase { ...@@ -476,6 +485,11 @@ class GetCredentialsTest extends TestCase {
validatePublicKeyCredential(ret); validatePublicKeyCredential(ret);
validateAuthenticatorAssertionResponse(ret.response); validateAuthenticatorAssertionResponse(ret.response);
} }
setIsResidentKeyTest(isResidentKeyTest) {
this.isResidentKeyTest = isResidentKeyTest;
return this;
}
} }
/** /**
...@@ -535,12 +549,17 @@ function validateAuthenticatorAssertionResponse(assert) { ...@@ -535,12 +549,17 @@ function validateAuthenticatorAssertionResponse(assert) {
// TODO: parseAuthenticatorData() and make sure flags are correct // TODO: parseAuthenticatorData() and make sure flags are correct
} }
function standardSetup(cb) { function standardSetup(cb, options = {}) {
// Setup an automated testing environment if available. // Setup an automated testing environment if available.
window.test_driver.add_virtual_authenticator({ let authenticatorArgs = {
protocol: "ctap1/u2f", protocol: "ctap1/u2f",
transport: "usb" transport: "usb",
}).then(authenticator => { hasResidentKey: false,
hasUserVerification: false,
isUserVerified: false,
};
extendObject(authenticatorArgs, options);
window.test_driver.add_virtual_authenticator(authenticatorArgs).then(authenticator => {
cb(); cb();
// XXX add a subtest to clean up the virtual authenticator since // XXX add a subtest to clean up the virtual authenticator since
// testharness does not support waiting for promises on cleanup. // testharness does not support waiting for promises on cleanup.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment