zaikio-jwt_auth 0.4.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac13b8d1a727e9aefeef7e1da082a3eec4bf48ac8f149ef4cc89ac44ee35d49
-  data.tar.gz: 323355b6f5180bf9662b715c8d2cf8ed94311fa1095e5da2627c8a71cd0f442a
+  metadata.gz: 4103bf1e59a9fa8a68a868c33d785082993255fe24616a01c1113a5a8026dcfe
+  data.tar.gz: e0be8641749a07f97620c73a56a97211ba51e9fe4f9dc6e1bdbaa5dd0422b0e3
 SHA512:
-  metadata.gz: 386ec7f2a8f1bc0a0d2f29495cc4b5754cd2eadce857555eb68a72f9546f76095ba2f0f0c3fdbaa5982a2503ee400480e81418dea5a06e85265380384843e350
-  data.tar.gz: 044a91585bf67a5ba411716ea361a1c85eeab91ef06cbe17b1cd1f03c83a261c0a4e8ef5ebe1e87e3c9e550678fdbcae45859448031c5e5b2983affbb829fd0f
+  metadata.gz: 28c8d6ea0b394450f7ae0027e9388fca1a9bd449213b6825356c65452e8a3efa4ab670802537cf9e08146d8a6980b5cbb22f2efa5cdec4c4b271b4c02b759fcf
+  data.tar.gz: 647aa957f6e7d82ca26b50169fd265b30e144dcef5a26a8273e786c388569ac09babed909a1ddf295255df404f097bc5a867ff5520920d81f37ae4a48a5c60da

data/lib/zaikio/jwt_auth/directory_cache.rb

@@ -5,6 +5,15 @@ require "logger"
 module Zaikio
   module JWTAuth
     class DirectoryCache
+      class UpdateJob < ::ActiveJob::Base
+        def perform(directory_path)
+          DirectoryCache.fetch(directory_path)
+          true # This job will always re-queue until it succeeds.
+        end
+      end
+
+      BadResponseError = Class.new(StandardError)
+
       class << self
         def fetch(directory_path, options = {})
           cache = Zaikio::JWTAuth.configuration.redis.get("zaikio::jwt_auth::#{directory_path}")
@@ -12,7 +21,8 @@ module Zaikio
           json = Oj.load(cache) if cache
 
           if !cache || options[:invalidate] || cache_expired?(json, options[:expires_after])
-            return reload(directory_path)
+            new_values = reload_or_enqueue(directory_path)
+            return new_values || json["data"]
           end
 
           json["data"]
@@ -37,29 +47,29 @@ module Zaikio
           DateTime.strptime(json["fetched_at"].to_s, "%s") < Time.now.utc - (expires_after || 1.hour)
         end
 
-        def reload(directory_path)
-          retries = 0
-
-          begin
-            data = fetch_from_directory(directory_path)
-            Zaikio::JWTAuth.configuration.redis.set("zaikio::jwt_auth::#{directory_path}", {
-              fetched_at: Time.now.to_i,
-              data: data
-            }.to_json)
-
-            data
-          rescue Errno::ECONNREFUSED, Net::ReadTimeout => e
-            raise unless (retries += 1) <= 3
+        def reload_or_enqueue(directory_path)
+          data = fetch_from_directory(directory_path)
+          Zaikio::JWTAuth.configuration.redis.set("zaikio::jwt_auth::#{directory_path}", {
+            fetched_at: Time.now.to_i,
+            data: data
+          }.to_json)
 
-            Zaikio::JWTAuth.configuration.logger.log("Timeout (#{e}), retrying in 1 second...")
-            sleep(1)
-            retry
-          end
+          data
+        rescue Errno::ECONNREFUSED, Net::ReadTimeout, BadResponseError
+          Zaikio::JWTAuth.configuration.logger.info("Error updating DirectoryCache(#{directory_path}), enqueueing job to update")
+          UpdateJob.set(wait: 10.seconds).perform_later(directory_path)
+          nil
         end
 
         def fetch_from_directory(directory_path)
           uri = URI("#{Zaikio::JWTAuth.configuration.host}/#{directory_path}")
-          Oj.load(Net::HTTP.get(uri))
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == "https"
+          response = http.request(Net::HTTP::Get.new(uri.request_uri))
+          raise BadResponseError unless (200..299).cover?(response.code.to_i)
+          raise BadResponseError unless response["content-type"].to_s.include?("application/json")
+
+          Oj.load(response.body)
         end
       end
     end

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "0.4.3".freeze
+    VERSION = "1.0.1".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.1
 platform: ruby
 authors:
 - crispymtn
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -27,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="