u2f 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e589a4313b54ef4f09bd93ee9d3ae3dc796a55d8
-  data.tar.gz: 6af61bb8549b978fc2e0de34eb1096aa7391df97
+  metadata.gz: 6e0ab3b3eb230926d60ba6c8d81cae756f87c600
+  data.tar.gz: 45249dfefef68ba3b21eb10701fdcbfdb50ed48b
 SHA512:
-  metadata.gz: 2b719b5857602edb742ce3d4e9ef90ae448a286e23abdd58696e52bf5f7d92a9afb88c8666a571f8af62ca6981db3313f7c0d7fb0fab016e2b71adfed68274f1
-  data.tar.gz: c9efc1c6157f3c6e846b237e545fdda917d9871098f0686ceb1ec21f7ddb73a75bdd6571bca92083f9ce35ecaeec519c4a6ff33f0b6c26a96cb415c2840a34eb
+  metadata.gz: ecca8a5e02031e7d14698436aacecf61d6b615051128685f64c16546ad86e63cd9e52536cee122af66721696c28bbb9d028582078c92f42045479277ca70d0e3
+  data.tar.gz: 6062a5d9a6de64b7e9ff2c602ff46f51329a9950eb408702117f8de45dc135476ed37f609829b2288566ba5a254f9cb31efaff9eb4c02a3b06bdf791eb583595

data/README.md

@@ -38,9 +38,9 @@ The U2F library has two major tasks:
 - **Register** new devices.
 - **Authenticate** previously registered devices.
 
-Each task starts by generating a challenge on the server, which is rendered to a web view, read by the browser API:s 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.
+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.
+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.
 
 ```ruby
 def u2f
@@ -188,7 +188,7 @@ def create
 
   begin
     u2f.authenticate!(session[:challenges], response,
-                      Base64.decode64(registration.public_key), 
+                      Base64.decode64(registration.public_key),
                       registration.counter)
   rescue U2F::Error => e
     return "Unable to authenticate: <%= e.class.name %>"

data/lib/u2f/register_request.rb

@@ -1,10 +1,17 @@
 module U2F
   class RegisterRequest
     include RequestBase
+    attr_accessor :challenge
 
-    def initialize(challenge, app_id)
+    def initialize(challenge)
       @challenge = challenge
-      @app_id = app_id
+    end
+
+    def as_json(options = {})
+      {
+        version: version,
+        challenge: challenge
+      }
     end
   end
-end
+end

data/lib/u2f/request_base.rb

@@ -1,14 +1,6 @@
 module U2F
   module RequestBase
-    attr_accessor :version, :challenge, :app_id
-
-    def as_json(options = {})
-      {
-        version: version,
-        challenge: challenge,
-        appId: app_id
-      }
-    end
+    attr_accessor :version
 
     def to_json(options = {})
       ::JSON.pretty_generate(as_json, options)

data/lib/u2f/sign_request.rb

@@ -3,14 +3,15 @@ module U2F
     include RequestBase
     attr_accessor :key_handle
 
-    def initialize(key_handle, challenge, app_id)
+    def initialize(key_handle)
       @key_handle = key_handle
-      @challenge = challenge
-      @app_id = app_id
     end
 
     def as_json(options = {})
-      super.merge(keyHandle: key_handle)
+      {
+        version: version,
+        keyHandle: key_handle
+      }
     end
   end
 end

data/lib/u2f/sign_response.rb

@@ -29,10 +29,15 @@ module U2F
       signature_data.byteslice(5..-1)
     end
 
+    # Bit 0 being set to 1 indicates that the user is present. A different value
+    # of Bit 0, as well as Bits 1 through 7, are reserved for future use.
+    USER_PRESENCE_MASK = 0b00000001
+
     ##
     # If user presence was verified
     def user_present?
-      signature_data.byteslice(0).unpack('C').first == 1
+      byte = signature_data.byteslice(0).unpack('C').first
+      byte & USER_PRESENCE_MASK == 1
     end
 
     ##

data/lib/u2f/u2f.rb

@@ -21,7 +21,7 @@ module U2F
     def authentication_requests(key_handles)
       key_handles = [key_handles] unless key_handles.is_a? Array
       key_handles.map do |key_handle|
-        SignRequest.new(key_handle, challenge, app_id)
+        SignRequest.new(key_handle)
       end
     end
 
@@ -41,13 +41,11 @@ module U2F
     #   - +UserNotPresentError+:: if the user wasn't present during the authentication
     #   - +CounterTooLowError+:: if there is a counter mismatch between the registered one and the one in the response.
     #
-    def authenticate!(challenges, response, registration_public_key,
+    def authenticate!(challenge, response, registration_public_key,
                       registration_counter)
-      # Handle both single and Array input
-      challenges = [challenges] unless challenges.is_a? Array
 
       # TODO: check that it's the correct key_handle as well
-      unless challenges.include?(response.client_data.challenge)
+      unless challenge == response.client_data.challenge
         fail NoMatchingRequestError
       end
 
@@ -84,7 +82,7 @@ module U2F
     #
     def registration_requests
       # TODO: generate a request for each supported version
-      [RegisterRequest.new(challenge, @app_id)]
+      [RegisterRequest.new(challenge)]
     end
 
     ##

data/lib/version.rb

@@ -1,3 +1,3 @@
 module U2F
-  VERSION = "0.2.1"
+  VERSION = '1.0.0'
 end

data/spec/lib/register_request_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe U2F::RegisterRequest do
-  let(:app_id) { 'http://example.com' }
   let(:challenge) { 'fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g' }
 
   let(:sign_request) do
-    U2F::RegisterRequest.new(challenge, app_id)
+    U2F::RegisterRequest.new(challenge)
   end
 
   describe '#to_json' do
@@ -13,9 +12,8 @@ describe U2F::RegisterRequest do
     it do
       is_expected.to match_json_expression(
         version: String,
-        appId: String,
         challenge: String
       )
     end
   end
-end
+end

data/spec/lib/register_response_spec.rb

@@ -12,7 +12,7 @@ describe U2F::RegisterResponse do
     device.register_response(challenge).gsub(" ", "")
   end
   let(:error_response) { device.register_response(challenge, error = true) }
-  let(:registration_request) { U2F::RegisterRequest.new(challenge, app_id) }
+  let(:registration_request) { U2F::RegisterRequest.new(challenge) }
   let(:register_response) do
     U2F::RegisterResponse.load_from_json(registration_data_json)
   end

data/spec/lib/sign_request_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
 describe U2F::SignRequest do
-  let(:app_id) { 'http://example.com' }
-  let(:challenge) { 'fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g' }
   let(:key_handle) do
     'CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w=='
   end
   let(:sign_request) do
-    U2F::SignRequest.new(key_handle, challenge, app_id)
+    U2F::SignRequest.new(key_handle)
   end
 
   describe '#to_json' do
@@ -15,10 +13,8 @@ describe U2F::SignRequest do
     it do
       is_expected.to match_json_expression(
         version: String,
-        appId: String,
-        challenge: String,
         keyHandle: String
       )
     end
   end
-end
+end

data/spec/lib/u2f_spec.rb

@@ -21,7 +21,7 @@ describe U2F do
     U2F::SignResponse.load_from_json sign_response_json
   end
   let(:sign_request) do
-    U2F::SignRequest.new(key_handle, auth_challenge, app_id)
+    U2F::SignRequest.new(key_handle)
   end
 
   describe '#authentication_requests' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u2f
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Johan Brissmyr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: json_expressions
   requirement: !ruby/object:Gem::Requirement
@@ -73,28 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.1
 description: Library for handling registration and authentication of U2F devices
 email:
 - brissmyr@gmail.com
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: U2F library