Skip to content

Commit

Permalink
Merge pull request #655 from jcjones/574-hotplugging
Browse files Browse the repository at this point in the history 
Fix #574 - Change language for Create and Get to support hotplugging
  • Loading branch information
@jcjones
jcjones authored Oct 20, 2017
2 parents 01aa320 + 83da7ff commit 579f6cf
Showing 1 changed file with 30 additions and 33 deletions.
63 changes: 30 additions & 33 deletions index.bs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,9 +591,9 @@ When this method is invoked, the user agent MUST execute the following algorithm
member of <code>|options|.{{MakePublicKeyCredentialOptions/user}}</code> are [=present|not present=], return a {{TypeError}} [=simple exception=].

1. If the {{MakePublicKeyCredentialOptions/timeout}} member of |options| is [=present=], check if its value lies within a
reasonable range as defined by the platform and if not, correct it to the closest value lying within that range. Set
|adjustedTimeout| to this adjusted value. If the {{MakePublicKeyCredentialOptions/timeout}} member of |options| is [=present|not
present=], then set |adjustedTimeout| to a platform-specific default.
reasonable range as defined by the platform and if not, correct it to the closest value lying within that range. Set a timer
|lifetimeTimer| to this adjusted value. If the {{MakePublicKeyCredentialOptions/timeout}} member of |options| is [=present|not
present=], then set |lifetimeTimer| to a platform-specific default.

1. Let |global| be the {{PublicKeyCredential}}'s [=interface object=]'s [=global object|environment settings object's global
object=].
Expand Down Expand Up @@ -682,30 +682,26 @@ When this method is invoked, the user agent MUST execute the following algorithm

1. Let |clientDataHash| be the [=hash of the serialized client data=] represented by |clientDataJSON|.

1. Let |currentlyAvailableAuthenticators| be a new [=ordered set=] consisting of all [=authenticators=]
currently available on this platform.
1. Start |lifetimeTimer|.

1. Let |selectedAuthenticators| be a new [=ordered set=].
1. Let |issuedRequests| be a new [=ordered set=].

1. If <code>|options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}}</code> is
[=present|present=], [=set/for each=] |authenticator| that becomes available on this
platform during the lifetime of |lifetimeTimer| and do the following:

1. If |currentlyAvailableAuthenticators| [=list/is empty=], return a {{DOMException}} whose name is
"{{NotFoundError}}", and terminate this algorithm.
Issue: The definitions of "lifetime of" and "becomes available" are intended to represent how
devices are hotplugged into (USB) or discovered by (NFC) browsers, and are under-specified.
Resolving this with good definitions or some other means will be addressed by resolving
[Issue #613](https://github.com/w3c/webauthn/issues/613).

1. If <code>|options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}}</code> is [=present|present=], iterate through
|currentlyAvailableAuthenticators| and do the following [=set/for each=] |authenticator|:
1. If {{AuthenticatorSelectionCriteria/authenticatorAttachment}} is [=present|present=] and its value is not equal
to |authenticator|'s attachment modality, [=iteration/continue=].
1. If {{AuthenticatorSelectionCriteria/requireResidentKey}} is set to |true| and the |authenticator|
is not capable of storing a [=Client-Side-Resident Credential Private Key=], [=iteration/continue=].
1. If {{AuthenticatorSelectionCriteria/requireUserVerification}} is set to |true| and the
|authenticator| is not capable of performing [=user verification=], [=iteration/continue=].
1. [=set/Append=] |authenticator| to |selectedAuthenticators|.

1. If |selectedAuthenticators| [=list/is empty=], return a {{DOMException}} whose name is
"{{ConstraintError}}", and terminate this algoritm.

1. Let |issuedRequests| be a new [=ordered set=].

1. [=set/For each=] |authenticator| in |currentlyAvailableAuthenticators|:
1. Let |excludeCredentialDescriptorList| be a new [=list=].

1. [=list/For each=] credential descriptor |C| in <code>|options|.{{MakePublicKeyCredentialOptions/excludeCredentials}}</code>:
Expand All @@ -725,13 +721,11 @@ When this method is invoked, the user agent MUST execute the following algorithm

1. [=set/Append=] |authenticator| to |issuedRequests|.

1. Start a timer for |adjustedTimeout| milliseconds.

1. [=While=] |issuedRequests| [=list/is not empty=], perform the following actions depending upon the |adjustedTimeout| timer
and responses from the authenticators:
1. [=While=] |issuedRequests| [=list/is not empty=], perform the following actions depending upon
|lifetimeTimer| and responses from the authenticators:
<dl class="switch">

: If the |adjustedTimeout| timer expires,
: If |lifetimeTimer| expires,
:: [=set/For each=] |authenticator| in |issuedRequests| invoke the [=authenticatorCancel=] operation on |authenticator|
and [=set/remove=] |authenticator| from |issuedRequests|.

Expand Down Expand Up @@ -838,8 +832,8 @@ method is invoked, the user agent MUST:

1. If the {{PublicKeyCredentialRequestOptions/timeout}} member of |options| is [=present=], check if its value lies
within a reasonable range as defined by the platform and if not, correct it to the closest value lying within that range.
Set |adjustedTimeout| to this adjusted value. If the {{PublicKeyCredentialRequestOptions/timeout}} member of
|options| is [=present|not present=], then set |adjustedTimeout| to a platform-specific default.
Set a timer |lifetimeTimer| to this adjusted value. If the {{PublicKeyCredentialRequestOptions/timeout}} member of
|options| is [=present|not present=], then set |lifetimeTimer| to a platform-specific default.

1. Let |global| be the {{PublicKeyCredential}}'s [=interface object=]'s [=relevant global object=].

Expand Down Expand Up @@ -908,12 +902,17 @@ method is invoked, the user agent MUST:

1. Let |issuedRequests| be a new [=ordered set=].

1. If there are no [=authenticators=] currently available on this platform, return a {{DOMException}} whose name is
"{{NotFoundError}}", and terminate this algorithm.

1. Let |authenticator| be a platform-specific handle whose value identifies an [=authenticator=].

1. For each |authenticator| currently available on this platform, perform the following steps:
1. Start |lifetimeTimer|.

1. [=set/For each=] |authenticator| that becomes available on this platform during the lifetime of
|lifetimeTimer|, perform the following steps:

Issue: The definitions of "lifetime of" and "becomes available" are intended to represent how
devices are hotplugged into (USB) or discovered by (NFC) browsers, and are under-specified.
Resolving this with good definitions or some other means will be addressed by resolving
[Issue #613](https://github.com/w3c/webauthn/issues/613).

1. Let |allowCredentialDescriptorList| be a new [=list=].

Expand Down Expand Up @@ -969,16 +968,14 @@ method is invoked, the user agent MUST:

1. [=set/Append=] |authenticator| to |issuedRequests|.

1. Execute the following steps [=in parallel=]. The [=task source=] for these [=tasks=] is the [=dom manipulation task source=].

1. Start a timer for |adjustedTimeout| milliseconds. Then execute the following steps [=in parallel=]. The [=task source=] for
these [=tasks=] is the [=dom manipulation task source=].

1. While |issuedRequests| [=list/is not empty=], perform the following actions depending upon the |adjustedTimeout| timer
1. While |issuedRequests| [=list/is not empty=], perform the following actions depending upon |lifetimeTimer|
and responses from the authenticators:

<dl class="switch">

: If the |adjustedTimeout| timer expires,
: If |lifetimeTimer| expires,
:: [=set/For each=] |authenticator| in |issuedRequests| invoke the [=authenticatorCancel=] operation on
|authenticator| and [=set/remove=] |authenticator| from |issuedRequests|.

Expand Down

0 comments on commit 579f6cf

Please sign in to comment.