fido_metadata 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08330439dce6050e6e099e11620382b947e17777a40744f72283a1be18a07c3e'
-  data.tar.gz: 2377b8900e5593832e965d53c41cac920d23bc846eb0be698b42f8d499f0d976
+  metadata.gz: 0c6e9096d99e10cec5ea15b15be0d472ef3ec60e58378505af0bae9851b6292a
+  data.tar.gz: 8d2221965bf30f01241fad4753a76cf7889ac61262a1af9b2e68bb93837afc48
 SHA512:
-  metadata.gz: 1122f49d0fe46db1464763d37db667c09e7794b2acdac868effc6a5bac03c1ec9f38a6b2a4beb87b419f2f9028cd84021aaab6b858a8e645ff452c4c4b53f595
-  data.tar.gz: c60c889a0e9c3088d27530be2fa9f3a97ead8dbbdf638d18909ed66d78431fc969548282b4b6a41e030b5160abd42f171860c455aabbf993ed4fa0faeaabe189
+  metadata.gz: fb89e5eec3d127872bfd90663f5a25e14554aff9bed9cdc058fed1b394d148f6a6057a7148aa40271360f217b2efb150c1f8525ee041ae19f7acaa3ad0eadc86
+  data.tar.gz: 8a708a7fa370ad71a29bb42517061d95d2608b20ce92514e58004216e6b826d5d8fdc3ffb45e433197c5699f05b9a6746363f64e476b7ad936380aae0dea753c

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   DisabledByDefault: true
   Exclude:
     - "gemfiles/**/*"
+    - "vendor/**/*"
 
 Bundler:
   Enabled: true

data/.travis.yml

@@ -1,7 +1,18 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
 rvm:
   - 2.6.5
-before_install: gem install bundler -v 1.17.3
+  - 2.5.7
+  - 2.4.9
+  - 2.3.8
+script:
+  - bin/rspec
+jobs:
+  fast_finish: true
+  include:
+    - rvm: 2.6.5
+      name: Rubocop
+      script:
+        - bundle info rubocop
+        - bin/rubocop

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0] - 2019-12-28
+### Added
+- Set `expires_in` and `race_condition_ttl` options during caching.
+
 ## [0.3.0] - 2019-11-24
 ### Changed
 - Made `FidoMetada::TestCacheStore` available for gem users. It is not required by default.
@@ -26,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Extracted from [webauthn-ruby PR 208](https://github.com/cedarcode/webauthn-ruby/pull/208) after discussion with the maintainers. Thanks for the feedback @grzuy and @brauliomartinezlm!
 
 [Unreleased]: https://github.com/bdewater/fido_metadata/compare/v0.2.0...HEAD
+[0.4.0]: https://github.com/bdewater/fido_metadata/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/bdewater/fido_metadata/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/bdewater/fido_metadata/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/bdewater/fido_metadata/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fido_metadata (0.3.0)
+    fido_metadata (0.4.0)
       jwt (~> 2.0)
 
 GEM

data/lib/fido_metadata.rb

@@ -5,7 +5,11 @@ require "fido_metadata/version"
 
 module FidoMetadata
   def self.configuration
-    @configuration ||= Configuration.new
+    @configuration ||= begin
+      c = Configuration.new
+      c.race_condition_ttl = 1
+      c
+    end
   end
 
   def self.configure
@@ -15,5 +19,6 @@ module FidoMetadata
   class Configuration
     attr_accessor :metadata_token
     attr_accessor :cache_backend
+    attr_accessor :race_condition_ttl
   end
 end

data/lib/fido_metadata/client.rb

@@ -89,7 +89,7 @@ module FidoMetadata
       crls = uris.compact.uniq.map do |uri|
         begin
           get(uri)
-        rescue Net::ProtoServerError
+        rescue Net::ProtocolError
           # TODO: figure out why test endpoint specifies a missing and unused CRL in the cert chain, and see if this
           # rescue can be removed. If the CRL is used, OpenSSL error 3 (unable to get certificate CRL) will raise.
           nil

data/lib/fido_metadata/store.rb

@@ -7,16 +7,18 @@ require "fido_metadata/statement"
 module FidoMetadata
   class Store
     METADATA_ENDPOINT = URI("https://mds2.fidoalliance.org/")
+    TOC_CACHE_KEY = "metadata_toc"
+    STATEMENT_CACHE_KEY = "statement_%s"
 
     def table_of_contents
       @table_of_contents ||= begin
-        key = "metadata_toc"
+        key = TOC_CACHE_KEY
         toc = cache_backend.read(key)
         return toc if toc
 
         json = client.download_toc(METADATA_ENDPOINT)
         toc = FidoMetadata::TableOfContents.from_json(json)
-        cache_backend.write(key, toc)
+        cache_backend.write(key, toc, expires_in: toc.expires_in, race_condition_ttl: race_condition_ttl)
         toc
       end
     end
@@ -38,7 +40,7 @@ module FidoMetadata
     def fetch_statement(aaguid: nil, attestation_certificate_key_id: nil)
       verify_arguments(aaguid: aaguid, attestation_certificate_key_id: attestation_certificate_key_id)
 
-      key = "statement_#{aaguid || attestation_certificate_key_id}"
+      key = STATEMENT_CACHE_KEY % (aaguid || attestation_certificate_key_id)
       statement = cache_backend.read(key)
       return statement if statement
 
@@ -51,7 +53,12 @@ module FidoMetadata
 
       json = client.download_entry(entry.url, expected_hash: entry.hash)
       statement = FidoMetadata::Statement.from_json(json)
-      cache_backend.write(key, statement)
+      cache_backend.write(
+        key,
+        statement,
+        expires_in: table_of_contents.expires_in,
+        race_condition_ttl: race_condition_ttl
+      )
       statement
     end
 
@@ -75,6 +82,10 @@ module FidoMetadata
       FidoMetadata.configuration.metadata_token || raise("no metadata_token configured")
     end
 
+    def race_condition_ttl
+      FidoMetadata.configuration.race_condition_ttl
+    end
+
     def client
       @client ||= FidoMetadata::Client.new(metadata_token)
     end

data/lib/fido_metadata/table_of_contents.rb

@@ -13,5 +13,9 @@ module FidoMetadata
     json_accessor("nextUpdate", Coercer::Date)
     json_accessor("entries", Coercer::Objects.new(Entry))
     json_accessor("no")
+
+    def expires_in
+      next_update.to_time.to_i - Time.now.to_i
+    end
   end
 end

data/lib/fido_metadata/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FidoMetadata
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fido_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bart de Water
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FIDO Alliance Metadata Service client