adopt webauthn-ruby >= 2

sorah · May 26, 2022 · b025c90 · b025c90
1 parent 7e62d5a
commit b025c90
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,3 +6,4 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'puma'
+gem 'nokogiri'
diff --git a/clarion.gemspec b/clarion.gemspec
@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "clarion/version"
@@ -20,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "webauthn", '< 2'
+  spec.add_dependency "webauthn", '>= 2.0.0'
   spec.add_dependency "sinatra"
   spec.add_dependency "erubis"
   spec.add_dependency "aws-sdk-s3"

diff --git a/lib/clarion/authenticator.rb b/lib/clarion/authenticator.rb
@@ -43,7 +43,6 @@ def credential_request_options
 
     def verify!(challenge: self.challenge(), origin:, extension_results: {}, credential_id:, authenticator_data:, client_data_json:, signature:)
       assertion = WebAuthn::AuthenticatorAssertionResponse.new(
-        credential_id: credential_id,
         authenticator_data: authenticator_data,
         client_data_json: client_data_json,
         signature: signature,
@@ -55,8 +54,9 @@ def verify!(challenge: self.challenge(), origin:, extension_results: {}, credent
       end
 
       rp_id = extension_results&.fetch('appid', extension_results&.fetch(:appid, false)) ? legacy_app_id : self.rp_id()
-      allowed_credentials = authn.keys.map { |_|  {id: _.handle, public_key: _.public_key_bytes} }
-      unless assertion.valid?(challenge, origin, rp_id: rp_id, allowed_credentials: allowed_credentials)
+
+      # TODO: move sign_count verification to webauthn-ruby
+      unless assertion.valid?(challenge, origin, rp_id: rp_id, public_key: key.public_key_bytes, sign_count: false)
         raise Authenticator::InvalidAssertion, "invalid assertion"
       end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ git_source(:github) {\|repo_name\| "https://github.com/#{repo_name}" }
		gemspec

		gem 'puma'
		gem 'nokogiri'