zaikio-jwt_auth 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ffa04390d58b8362bdcdbec9faf414744c750832bec2059269053456fc92c1
-  data.tar.gz: fa892487c030ac6f8215273b24f40975a6029888f737c8bebc1055170b062ea9
+  metadata.gz: 0ed1625f0c3baa4a4ffaa294a558f4da335e647708aabe66e8a51924bbbd02d5
+  data.tar.gz: 4f5495c0aa6bda2d70cdbf560c3db957ffe65d8017d49d97dcc9c8139b6a69d0
 SHA512:
-  metadata.gz: c0a29c61eea44dec079b7a10039cc67f6ca3f16bd89be7e52698afec6d8e5760d2afb229d76dc2e2ade8e103df219e40017d65a91cdd8c80a47e460a8288b699
-  data.tar.gz: 8ff49fc384edc4684b5cf1b54e86650cd03cd4770fbebf6a2f21207dd0e5bfbb178dcdd4dc76473917246a29980f936b61266310b2b3c68548476225db873862
+  metadata.gz: 77d5cfcc03cd050812d8b01b0e6d8d0954198bb6a002f86c46fb304c515bb54f9661535d0d7d6ed5b67ebcc552cb4d1a61affb40959e57c576f5b602cb74c980
+  data.tar.gz: 30d094c7015d1c73f059282277ba528994db14f4b67525f05265240cd9bc7986a958b13e9cb34765b3e1e36b4c96d7f60dc349b04580bbf7ef56ebd7db48a2ee

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

@@ -1,5 +1,6 @@
 require "jwt"
 require "oj"
+require "active_support/core_ext/integer/time"
 require "zaikio/jwt_auth/railtie"
 require "zaikio/jwt_auth/configuration"
 require "zaikio/jwt_auth/directory_cache"
@@ -26,15 +27,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 +72,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 +132,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,25 +4,24 @@ 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_accessor :app_name, :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
-        @logger ||= Logger.new(STDOUT)
+        @logger ||= Logger.new($stdout)
       end
 
       def environment=(env)
@@ -31,11 +30,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

@@ -2,7 +2,7 @@ module Zaikio
   module JWTAuth
     class TokenData
       def self.subject_format
-        %r{^((\w+)/((\w|-)+)\>)?(\w+)/((\w|-)+)$}
+        %r{^((\w+)/((\w|-)+)>)?(\w+)/((\w|-)+)$}
       end
 
       def self.actions_by_permission
@@ -33,6 +33,10 @@ module Zaikio
         @payload["jti"]
       end
 
+      def expires_at
+        Time.zone.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.3".freeze
+    VERSION = "0.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 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: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -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: []
@@ -86,14 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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