WIP: Upstream updates

.coditsu/ci.yml

@@ -0,0 +1,3 @@
+repository_id: 'f789891f-3f4e-42be-a25b-068d49708ddb'
+api_key: <%= ENV['CODITSU_API_KEY'] %>
+api_secret: <%= ENV['CODITSU_API_SECRET'] %>

.gitignore

@@ -30,4 +30,6 @@
 .rvmrc
 
 # Example files
-/example/.bundle
+/example/.bundle
+vendor
+.coditsu/local.yml

.rubocop.yml

@@ -0,0 +1,15 @@
+Documentation:
+  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.6
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"
+
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"

.ruby-version

@@ -0,0 +1 @@
+2.6.5

.travis.yml

@@ -1,6 +1,47 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+services:
+  - docker
+
+dist: trusty
+sudo: false
+cache: bundler
+
+git:
+  depth: false
+
+test: &test
+  stage: test
+  language: ruby
+  before_install:
+    - gem install bundler
+    - gem update --system
+
+jobs:
+  include:
+    - <<: *test
+      rvm: 2.6.5
+    - <<: *test
+      rvm: 2.5.7
+    - <<: *test
+      rvm: 2.4.8
+
+    - stage: coditsu
+      language: ruby
+      rvm: 2.6.3
+      before_install:
+        - gem update --system
+        - gem install bundler
+      before_script:
+        - docker create -v /sources --name sources alpine:3.4 /bin/true
+        - docker cp ./ sources:/sources
+      script: >
+        docker run
+        -e CODITSU_API_KEY
+        -e CODITSU_API_SECRET
+        -e CODITSU_REPOSITORY_ID
+        -e CODITSU_BUILD_BRANCH=$TRAVIS_BRANCH
+        --volumes-from sources
+        coditsu/build-runner:latest
+
+stages:
+  - test
+  - coditsu

CHANGELOG.md

@@ -0,0 +1,6 @@
+## master
+- [#58](https://github.com/castle/ruby-u2f/pull/58) drop support for ruby 2.3
+- [#41](https://github.com/castle/ruby-u2f/pull/41) drop support for ruby 2.2
+
+## 1.0.0 (2016-02-18)
+- update ruby-u2f to work with the v1.1 U2F JavaScript API.

Gemfile

@@ -1,2 +1,13 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 gemspec
+
+gem 'rake'
+
+group :test do
+  gem 'coveralls_reborn'
+  gem 'json_expressions'
+  gem 'rspec'
+  gem 'simplecov'
+end

Gemfile.lock

@@ -1,85 +1,54 @@
 PATH
   remote: .
   specs:
-    u2f (0.2.1)
+    u2f (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    coveralls (0.8.10)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.11.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.3)
-    json_expressions (0.8.3)
-    mime-types (2.99)
-    netrc (0.11.0)
-    parser (2.2.0.pre.7)
-      ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
-    rainbow (2.0.0)
-    rake (10.3.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    coveralls_reborn (0.16.0)
+      simplecov (~> 0.18.1)
+      term-ansicolor (~> 1.6)
+      thor (>= 0.20.3, < 2.0)
+      tins (~> 1.16)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    json_expressions (0.9.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rubocop (0.27.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    term-ansicolor (1.3.2)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.6.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
+    thor (1.0.1)
+    tins (1.25.0)
+      sync
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls (~> 0.8.10)
-  json_expressions (~> 0.8.3)
-  rake (~> 10.3)
-  rspec (~> 3.1)
-  rubocop (~> 0.27.1)
-  simplecov (~> 0.11.1)
+  coveralls_reborn
+  json_expressions
+  rake
+  rspec
+  simplecov
   u2f!
 
 BUNDLED WITH
-   1.11.0
+   2.1.4

README.md

@@ -1,10 +1,9 @@
 # Ruby U2F
 
-[![Gem Version](https://badge.fury.io/rb/u2f.png)](http://badge.fury.io/rb/u2f)
-[![Dependency Status](https://gemnasium.com/castle/ruby-u2f.svg)](https://gemnasium.com/castle/ruby-u2f)
+[![Gem Version](https://badge.fury.io/rb/u2f.svg)](https://badge.fury.io/rb/u2f)
 [![security](https://hakiri.io/github/castle/ruby-u2f/master.svg)](https://hakiri.io/github/castle/ruby-u2f/master)
 
-[![Build Status](https://travis-ci.org/castle/ruby-u2f.png)](https://travis-ci.org/castle/ruby-u2f)
+[![Build Status](https://travis-ci.org/castle/ruby-u2f.svg?branch=API_v1_1)](https://travis-ci.org/castle/ruby-u2f)
 [![Code Climate](https://codeclimate.com/github/castle/ruby-u2f/badges/gpa.svg)](https://codeclimate.com/github/castle/ruby-u2f)
 [![Coverage Status](https://img.shields.io/coveralls/castle/ruby-u2f.svg)](https://coveralls.io/r/castle/ruby-u2f)
 
@@ -40,7 +39,9 @@ The U2F library has two major tasks:
 
 Each task starts by generating a challenge on the server, which is rendered to a web view, read by the browser APIs and transmitted to the plugged in U2F devices for verification. The U2F device responds and triggers a callback in the browser, and a form is posted back to your server where you verify the challenge and store the U2F device information to your database.
 
-You'll need an instance of `U2F::U2F`, which is conveniently placed in an [instance method](https://github.com/castle/ruby-u2f/blob/master/example/app/helpers/helpers.rb) on the controller. The initializer takes an **App ID** as argument.
+Note that ordinarily, each user will have one or more U2F registrations (as it's a common usage pattern for users to have more than one U2F device -- for example one for regular use, and a second stored safely as a backup). While it's omitted from examples here for brevity, a new registration should typically be associated with the particular user registering. Likewise, when authenticating, queries over "all registrations" should actually be scoped to registrations associated with the particular user being authenticated.
+
+You'll need an instance of `U2F::U2F`, which is conveniently placed in an [instance method](https://github.com/castle/ruby-u2f/blob/API_v1_1/example/app/helpers/helpers.rb) on the controller. The initializer takes an **App ID** as argument.
 
 ```ruby
 def u2f
@@ -67,6 +68,8 @@ def new
   key_handles = Registration.map(&:key_handle)
   @sign_requests = u2f.authentication_requests(key_handles)
 
+  @app_id = u2f.app_id
+
   render 'registrations/new'
 end
 ```
@@ -82,10 +85,11 @@ Render a form that will be automatically posted when the U2F device reponds.
 
 ```javascript
 // render requests from server into Javascript format
-var registerRequests = <%= @registration_requests.as_json.to_json.html_safe %>;
+var appId = <%= @app_id.to_json.html_safe %>
+var registerRequests = <%= @registration_requests.to_json.html_safe %>;
 var signRequests = <%= @sign_requests.as_json.to_json.html_safe %>;
 
-u2f.register(registerRequests, signRequests, function(registerResponse) {
+u2f.register(appId, registerRequests, signRequests, function(registerResponse) {
   var form, reg;
 
   if (registerResponse.errorCode) {
@@ -138,10 +142,12 @@ def new
   return 'Need to register first' if key_handles.empty?
 
   # Generate SignRequests
+  @app_id = u2f.app_id
   @sign_requests = u2f.authentication_requests(key_handles)
+  @challenge = u2f.challenge
 
-  # Store challenges. We need them for the verification step
-  session[:challenges] = @sign_requests.map(&:challenge)
+  # Store challenge. We need it for the verification step
+  session[:challenge] = @challenge
 
   render 'authentications/new'
 end
@@ -158,9 +164,11 @@ Render a form that will be automatically posted when the U2F device reponds.
 
 ```javascript
 // render requests from server into Javascript format
-var signRequests = <%= @sign_requests.as_json.to_json.html_safe %>;
+var signRequests = <%= @sign_requests.to_json.html_safe %>;
+var challenge = <%= @challenge.to_json.html_safe %>;
+var appId = <%= @app_id.to_json.html_safe %>;
 
-u2f.sign(signRequests, function(signResponse) {
+u2f.sign(appId, challenge, signRequests, function(signResponse) {
   var form, reg;
 
   if (signResponse.errorCode) {
@@ -187,13 +195,13 @@ def create
   return 'Need to register first' unless registration
 
   begin
-    u2f.authenticate!(session[:challenges], response,
+    u2f.authenticate!(session[:challenge], response,
                       Base64.decode64(registration.public_key),
                       registration.counter)
   rescue U2F::Error => e
     return "Unable to authenticate: <%= e.class.name %>"
   ensure
-    session.delete(:challenges)
+    session.delete(:challenge)
   end
 
   registration.update(counter: response.counter)

Rakefile

@@ -1,7 +1,9 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec

example/Gemfile

@@ -1,20 +1,25 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Project requirements
 gem 'rake'
 
 # Component requirements
-gem 'haml'
+gem 'dm-aggregates'
+gem 'dm-constraints'
+gem 'dm-core'
+gem 'dm-migrations'
 gem 'dm-sqlite-adapter'
-gem 'dm-validations'
 gem 'dm-timestamps'
-gem 'dm-migrations'
-gem 'dm-constraints'
-gem 'dm-aggregates'
 gem 'dm-types'
-gem 'dm-core'
+gem 'dm-validations'
+gem 'haml'
 
 # Padrino Stable Gem
-gem 'padrino', '0.12.4'
+gem 'padrino'
+
+# To enable https
+gem 'thin'
 
-gem 'u2f'#, path: '../.'
+gem 'u2f', '1.0.0'