zaikio-jwt_auth 0.4.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7fc3c22cfc4c1f3664674815aa450cea8d3607bfc75c9e0fded0849ac199763
-  data.tar.gz: e3452768d900d0f992165e60df3d32743a763da97969a2ddf7b331a60d253f6f
+  metadata.gz: 5246d95da7085c56dce3719ba3bdba4c102c3b4dd01c941cacb5de5d9e813eb0
+  data.tar.gz: 354e97d2ef3972049e103fa0afea9e047f9990ab816ca8b7afec7c3671e0d90b
 SHA512:
-  metadata.gz: fde1af79e8a59aabfbe96d3f020f3180881d220a69ce209e4e4b8d82048e91d9d754c39d97d8604dccbde3aa9c02ef5aa526bb7b444d94b98f53c632efed8932
-  data.tar.gz: 538fb9c7471206bee6c72725720869d2545ded691ae9901f09c0966d42d1d77eb94dfecf9ebd31935ad982c93512584a99b17a095bd16c7eb237ad084a4c3d7c
+  metadata.gz: 8025ca7934fac9df869afde1fd23287208fb9edbd1970e3d065d9591062a1557a435f6cb0d7d8147d8f8f2fdbb476ae00dead2d89bb232951489de785df0e248
+  data.tar.gz: 89431f5cdf4ad50dff018a35530fb95d97d2a9a91a1908566b8d9de187dff65f1203bfb76a7eef79fcc3fca116f336ab194c18b8bd583d830098481678a53aa8

data/README.md

@@ -152,7 +152,18 @@ class MyRackMiddleware < Rack::Middleware
     ...
 ```
 
-This function expects to receive the string in the format `"Bearer $token"`.
+This function expects to receive the string in the format `"Bearer $token"`. If the JWT is
+invalid, expired, or has some other fundamental issues, the JWT library may throw
+[additional errors](https://github.com/jwt/ruby-jwt/blob/v2.2.2/lib/jwt/error.rb), and you
+should be prepared to handle these, for example:
+
+```ruby
+def call(env)
+  token = Zaikio::JWTAuth.extract("definitely.not.jwt")
+rescue JWT::DecodeError, JWT::ExpiredSignature
+  [401, {}, ["Unauthorized"]]
+end
+```
 
 ## Contributing
 

data/lib/zaikio/jwt_auth.rb

@@ -18,7 +18,7 @@ module Zaikio
     def self.configure
       self.configuration ||= Configuration.new
 
-      if Zaikio.const_defined?("Webhooks")
+      if Zaikio.const_defined?("Webhooks", false)
         Zaikio::Webhooks.on "directory.revoked_access_token", Zaikio::JWTAuth::RevokeAccessTokenJob,
                             perform_now: true
       end

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.2".freeze
+    VERSION = "1.0.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.0.0
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="