Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-11 10:53:02 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-07-14 05:49:09 +0300
commit341d8bc3f7fbe3763250af1e89020b81dad34bb8 (patch)
tree31ce9bb6d36b59b25cfd6f0e61b327bca808a942 /app/assets/javascripts
parent3572582dd2568cd473676563077ab3985b9803f7 (diff)
Add a U2F feature spec for multiple devices owned by the same user.
1. This scenario was previously tested for the registration flow, but not authentication.
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/u2f/authenticate.js.coffee13
-rw-r--r--app/assets/javascripts/u2f/util.js.coffee (renamed from app/assets/javascripts/u2f/util.js.coffee.erb)2
2 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/u2f/authenticate.js.coffee b/app/assets/javascripts/u2f/authenticate.js.coffee
index be10e911c83..918c0a560fd 100644
--- a/app/assets/javascripts/u2f/authenticate.js.coffee
+++ b/app/assets/javascripts/u2f/authenticate.js.coffee
@@ -8,14 +8,17 @@ class @U2FAuthenticate
@appId = u2fParams.app_id
@challenge = u2fParams.challenge
- # The U2F Javascript API v1.1 requires a single challenge, with _no
- # challenges per-request_.
- #
- # The U2F Javascript API v1.0 requires a challenge per-request, which
- # is done by copying the single challenge into every request.
+ # The U2F Javascript API v1.1 requires a single challenge, with
+ # _no challenges per-request_. The U2F Javascript API v1.0 requires a
+ # challenge per-request, which is done by copying the single challenge
+ # into every request.
#
# In either case, we don't need the per-request challenges that the server
# has generated, so we can remove them.
+ #
+ # Note: The server library fixes this behaviour in (unreleased) version 1.0.0.
+ # This can be removed once we upgrade.
+ # https://github.com/castle/ruby-u2f/commit/103f428071a81cd3d5f80c2e77d522d5029946a4
@signRequests = u2fParams.sign_requests.map (request) -> _(request).omit('challenge')
start: () =>
diff --git a/app/assets/javascripts/u2f/util.js.coffee.erb b/app/assets/javascripts/u2f/util.js.coffee
index be1d3286b01..5ef324f609d 100644
--- a/app/assets/javascripts/u2f/util.js.coffee.erb
+++ b/app/assets/javascripts/u2f/util.js.coffee
@@ -1,3 +1,3 @@
class @U2FUtil
@isU2FSupported: ->
- window.u2f
+ window.u2f