zaikio-jwt_auth 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec233ed24502a3c1787c5c8825ecbf4c889608522152192739ab5938a91e720a
-  data.tar.gz: d15c29da5093ec019ff083874321d6fe709946eee57e464bb4b80ea8c89a7277
+  metadata.gz: cf4b231af0a8a9fb3d9c48d577c85d12ef02b2605418b22abf21512f1d714433
+  data.tar.gz: 2d106d3d2821edc1d24d96d5e69cda3e3b4e4d04b0f062c26a1d90fd2b223f3f
 SHA512:
-  metadata.gz: 96a305a591381bbd7c768f27faaaf859dd2f01cca1032bb9f7b38b8e8a7b240c16da12e438cd6a325abe43ddf3f6d75602cfd068a9746348d52e89bb9274ce2d
-  data.tar.gz: a46b2f66a46b9a906b3ee2bcc0f98ee8ac88412d3bbaac81e0bebdaad2d831749d26a935f7d86c694fedc21ad890a277590fe582843629c8b98b96caf5b474d6
+  metadata.gz: 325c2144f07a582d0bc3e4f3eeadfd68a1940e5230cefaa3a1b7bd9231b7bb74c86ccc1922f457945e78b05a8286f68b7551851705592e0c3838ebfa06f654a1
+  data.tar.gz: 6fc738d1533e5e06a15ebe476acd0a20b166bd08d5065462fdfe012363ae598d258e324806e0e35651f129b0d5dd5d8974ec92bb49b06e644c9bd2fb5f7a1236

data/app/jobs/zaikio/jwt_auth/revoke_access_token_job.rb

@@ -2,8 +2,8 @@ module Zaikio
   module JWTAuth
     class RevokeAccessTokenJob < ApplicationJob
       def perform(event)
-        DirectoryCache.update("api/v1/blacklisted_access_tokens.json", expires_after: 60.minutes) do |data|
-          data["blacklisted_token_ids"] << event.payload["access_token_id"]
+        DirectoryCache.update("api/v1/revoked_access_tokens.json", expires_after: 60.minutes) do |data|
+          data["revoked_token_ids"] << event.payload["access_token_id"]
           data
         end
       end

data/lib/zaikio/jwt_auth.rb

@@ -26,15 +26,16 @@ module Zaikio
     end
 
     def self.revoked_jwt?(jti)
-      blacklisted_token_ids.include?(jti)
+      revoked_token_ids.include?(jti)
     end
 
-    def self.blacklisted_token_ids
+    def self.revoked_token_ids
       return [] if mocked_jwt_payload
 
-      return configuration.blacklisted_token_ids if configuration.blacklisted_token_ids
-
-      DirectoryCache.fetch("api/v1/blacklisted_access_tokens.json", expires_after: 60.minutes)["blacklisted_token_ids"]
+      configuration.revoked_token_ids || DirectoryCache.fetch(
+        "api/v1/revoked_access_tokens.json",
+        expires_after: 60.minutes
+      )["revoked_token_ids"]
     end
 
     def self.included(base)
@@ -70,24 +71,24 @@ module Zaikio
 
         token_data = TokenData.new(jwt_payload)
 
-        return if show_error_if_token_is_blacklisted(token_data)
+        return if show_error_if_token_is_revoked(token_data)
 
         return if show_error_if_authorize_by_jwt_subject_type_fails(token_data)
 
         return if show_error_if_authorize_by_jwt_scopes_fails(token_data)
 
-        send(:after_jwt_auth, token_data) if respond_to?(:after_jwt_auth)
+        send(:after_jwt_auth, token_data) if respond_to?(:after_jwt_auth, true)
       rescue JWT::ExpiredSignature
         render_error("jwt_expired") && (return)
       rescue JWT::DecodeError
         render_error("invalid_jwt") && (return)
       end
 
-      def update_blacklisted_access_tokens_by_webhook
+      def update_revoked_access_tokens_by_webhook
         return unless params[:name] == "directory.revoked_access_token"
 
-        DirectoryCache.update("api/v1/blacklisted_access_tokens.json", expires_after: 60.minutes) do |data|
-          data["blacklisted_token_ids"] << params[:payload][:access_token_id]
+        DirectoryCache.update("api/v1/revoked_access_tokens.json", expires_after: 60.minutes) do |data|
+          data["revoked_token_ids"] << params[:payload][:access_token_id]
           data
         end
 
@@ -130,7 +131,7 @@ module Zaikio
         render_error("unpermitted_subject")
       end
 
-      def show_error_if_token_is_blacklisted(token_data)
+      def show_error_if_token_is_revoked(token_data)
         return unless Zaikio::JWTAuth.revoked_jwt?(token_data.jti)
 
         render_error("invalid_jwt")

data/lib/zaikio/jwt_auth/configuration.rb

@@ -4,21 +4,21 @@ module Zaikio
   module JWTAuth
     class Configuration
       HOSTS = {
-        development: "http://directory.zaikio.test",
-        test: "http://directory.zaikio.test",
-        staging: "https://directory.staging.zaikio.com",
-        sandbox: "https://directory.sandbox.zaikio.com",
-        production: "https://directory.zaikio.com"
+        development: "http://hub.zaikio.test",
+        test: "http://hub.zaikio.test",
+        staging: "https://hub.staging.zaikio.com",
+        sandbox: "https://hub.sandbox.zaikio.com",
+        production: "https://hub.zaikio.com"
       }.freeze
 
       attr_accessor :app_name
       attr_accessor :redis, :host
       attr_reader :environment
-      attr_writer :logger, :blacklisted_token_ids, :keys
+      attr_writer :logger, :revoked_token_ids, :keys
 
       def initialize
         @environment = :sandbox
-        @blacklisted_token_ids = nil
+        @revoked_token_ids = nil
       end
 
       def logger
@@ -31,11 +31,11 @@ module Zaikio
       end
 
       def keys
-        @keys.is_a?(Proc) ? @keys.call : @keys
+        defined?(@keys) && @keys.is_a?(Proc) ? @keys.call : @keys
       end
 
-      def blacklisted_token_ids
-        @blacklisted_token_ids.is_a?(Proc) ? @blacklisted_token_ids.call : @blacklisted_token_ids
+      def revoked_token_ids
+        @revoked_token_ids.is_a?(Proc) ? @revoked_token_ids.call : @revoked_token_ids
       end
 
       private

data/lib/zaikio/jwt_auth/test_helper.rb

@@ -14,7 +14,7 @@ module Zaikio
           jti: "unique-access-token-id",
           nbf: Time.now.to_i,
           exp: 1.hour.from_now.to_i,
-          jku: "http://directory.zaikio.test/api/v1/jwt_public_keys.json",
+          jku: "http://hub.zaikio.test/api/v1/jwt_public_keys.json",
           scope: []
         }.merge(extra_payload).stringify_keys
       end

data/lib/zaikio/jwt_auth/token_data.rb

@@ -33,6 +33,10 @@ module Zaikio
         @payload["jti"]
       end
 
+      def expires_at
+        Time.at(@payload["exp"]).to_datetime
+      end
+
       # scope_options is an array of objects with:
       # scope, app_name (optional), except/only (array, optional)
       def scope_by_configurations?(scope_configurations, action_name, context)

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "0.2.2".freeze
+    VERSION = "0.3.1".freeze
   end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
-- Crispy Mountain GmbH
+- crispymtn
+- Jalyna Schröder
+- Martin Spickermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -30,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +56,9 @@ dependencies:
         version: 2.2.1
 description: JWT-Based authentication and authorization with zaikio.
 email:
+- op@crispymtn.com
 - js@crispymtn.com
+- spickermann@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -93,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: JWT-Based authentication and authorization with zaikio