jwt_sessions 2.7.0 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad42d33af309b3295e9aa6402179df2a9a0ac5e17618d133427e27edafca9578
-  data.tar.gz: e67b97b9bf3a2aec4bba3f66cc517d4dad03bcb4ce73269147cce31bcd9d85d4
+  metadata.gz: 8d8719e8f8b113faf2af6b40f1912d2cf4819527634411ec946a909c67833d31
+  data.tar.gz: f4e46db88c68b110dc78034925fce8193deab286d5703ea81ccfd2740bca9225
 SHA512:
-  metadata.gz: fe6bc8a993388688a85d6b86ea139ab8d3123b628db77181fa4db6ba68d92c0080ca16fdfcaeb3567be9f2a07896df711cb9edb9c7845d6a226408e6fda00de9
-  data.tar.gz: 712ea681644f82710f5d561a96e78df86c1c3e4c225b8535a9d1cd2e03bcb363d93e4b42764847b786461e26f6f9440a3f85b026e02fa557c647a5866eef70dc
+  metadata.gz: 6edb6fb526941fda66abcf0cea4a69904e08f4ca0be03ff7514d8c73e9b9f94cb86cb74a948612d62f3a20a2f91c123bce8c5e342b2600c959f0da90f4e0a918
+  data.tar.gz: b49c7a27800f9b7621565c9e9206a30f547e837668fb0fd683073ff75b062479bb0d51630f28cd165a70ecd767fc44f736795d4d12b480183fe7395b239696ac

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 2.7.4 (August 31, 2022)
+
+Support:
+
+- compatibility with redis 5.0
+
+## 2.7.3 (August 26, 2022)
+
+Support:
+
+- compatibility with jwt 2.5
+- add rspec to development deps
+
+## 2.7.2 (January 24, 2022)
+
+Bugfixes:
+
+- 2.7.1 version didn't include the correct patch
+
+## 2.7.1 (January 22, 2022)
+
+Bugfixes:
+
+- Correctly init namespaced refresh tokens when fetching all tokens from Redis
+
 ## 2.7.0 (October 05, 2021)
 
 Features:

data/README.md

@@ -409,11 +409,11 @@ jwt_sessions only uses `exp` claim by default when it decodes tokens and you can
 setting `jwt_options`. You can also specify leeway to account for clock skew.
 
 ```ruby
-JWTSessions.jwt_options.verify_iss = true
-JWTSessions.jwt_options.verify_sub = true
-JWTSessions.jwt_options.verify_iat = true
-JWTSessions.jwt_options.verify_aud = true
-JWTSessions.jwt_options.leeway     = 30 # seconds
+JWTSessions.jwt_options[:verify_iss] = true
+JWTSessions.jwt_options[:verify_sub] = true
+JWTSessions.jwt_options[:verify_iat] = true
+JWTSessions.jwt_options[:verify_aud] = true
+JWTSessions.jwt_options[:leeway]     = 30 # seconds
 ```
 
 To pass options like `sub`, `aud`, `iss`, or leeways you should specify a method called `token_claims` in your controller.

data/lib/jwt_sessions/refresh_token.rb

@@ -61,7 +61,7 @@ module JWTSessions
           token_attrs[:access_uid],
           token_attrs[:access_expiration],
           store,
-          namespace: namespace,
+          namespace: token_attrs[:namespace] || namespace,
           payload: {},
           uid: uid,
           expiration: token_attrs[:expiration]

data/lib/jwt_sessions/session.rb

@@ -89,7 +89,7 @@ module JWTSessions
       tokens.each do |token|
         AccessToken.destroy(token.access_uid, store)
         # unlink refresh token from the current access token
-        token.update(nil, nil, token.csrf)
+        token.update(0, 0, token.csrf)
       end.count
     end
 
@@ -208,7 +208,7 @@ module JWTSessions
     def check_access_uid_within_refresh_token
       uid = retrieve_val_from(payload, :access, "uid", "access uid")
       access_uid = @_refresh.access_uid
-      return if access_uid.size.zero?
+      return if access_uid == "0"
       yield @_refresh.uid, @_refresh.access_expiration if access_uid != uid
     end
 

data/lib/jwt_sessions/store_adapters/redis_store_adapter.rb

@@ -37,10 +37,15 @@ module JWTSessions
 
       def fetch_refresh(uid, namespace, first_match = false)
         key    = first_match ? first_refresh_key(uid) : full_refresh_key(uid, namespace)
-        values = storage.hmget(key, *REFRESH_KEYS).compact
+        return {} if key.nil?
 
+        values = storage.hmget(key, *REFRESH_KEYS).compact
         return {} if values.length != REFRESH_KEYS.length
-        REFRESH_KEYS.each_with_index.each_with_object({}) { |(key, index), acc| acc[key] = values[index] }
+
+        REFRESH_KEYS
+          .each_with_index
+          .each_with_object({}) { |(key, index), acc| acc[key] = values[index] }
+          .merge({ namespace: namespace })
       end
 
       def persist_refresh(uid:, access_expiration:, access_uid:, csrf:, expiration:, namespace: nil)
@@ -69,7 +74,10 @@ module JWTSessions
         keys_in_namespace = scan_keys(refresh_key("*", namespace))
         (keys_in_namespace || []).each_with_object({}) do |key, acc|
           uid = uid_from_key(key)
-          acc[uid] = fetch_refresh(uid, namespace)
+          # to be able to properly initialize namespaced tokens extract their namespaces
+          # and pass down to fetch_refresh
+          token_namespace = namespace.to_s.empty? ? namespace_from_key(key) : namespace
+          acc[uid] = fetch_refresh(uid, token_namespace)
         end
       end
 
@@ -131,6 +139,14 @@ module JWTSessions
         key.split("_").last
       end
 
+      def namespace_from_key(key)
+        ns_regexp.match(key)&.[](:namespace)
+      end
+
+      def ns_regexp
+        @ns_regexp ||= Regexp.new("#{prefix}_(?<namespace>.+)_refresh")
+      end
+
       def scan_keys(key_pattern)
         cursor = 0
         all_keys = []

data/lib/jwt_sessions/token.rb

@@ -13,7 +13,7 @@ module JWTSessions
       end
 
       def decode(token, claims = {})
-        decode_options = { algorithm: JWTSessions.algorithm }.merge(JWTSessions.jwt_options.to_h).merge(claims)
+        decode_options = { algorithm: JWTSessions.algorithm }.merge(JWTSessions.jwt_options).merge(claims)
         JWT.decode(token, JWTSessions.public_key, JWTSessions.validate?, decode_options)
       rescue JWT::ExpiredSignature => e
         raise Errors::Expired, e.message

data/lib/jwt_sessions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JWTSessions
-  VERSION = "2.7.0"
+  VERSION = "2.7.4"
 end

data/lib/jwt_sessions.rb

@@ -21,8 +21,6 @@ module JWTSessions
 
   NONE = "none"
 
-  JWTOptions = Struct.new(*JWT::DefaultOptions::DEFAULT_OPTIONS.keys)
-
   DEFAULT_SETTINGS_KEYS = %i[access_cookie
                              access_exp_time
                              access_header
@@ -66,7 +64,7 @@ module JWTSessions
   end
 
   def jwt_options
-    @jwt_options ||= JWTOptions.new(*JWT::DefaultOptions::DEFAULT_OPTIONS.values)
+    @jwt_options ||= JWT::Configuration::Container.new.decode.to_h
   end
 
   def algorithm=(algo)

data/test/units/jwt_sessions/store_adapters/test_redis_store_adapter.rb

@@ -24,13 +24,11 @@ class TestRedisStoreAdapter < Minitest::Test
     adapter = JWTSessions::StoreAdapters::RedisStoreAdapter.new(
       redis_url: "redis://127.0.0.1:6379",
       ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE },
-      reconnect_delay: 2,
       timeout: 8
     )
     options = adapter.storage.instance_variable_get(:@options)
 
     assert_equal 8, options[:timeout]
-    assert_equal 2, options[:reconnect_delay]
     assert_equal 0, options[:ssl_params][:verify_mode]
   end
 

data/test/units/jwt_sessions/test_session.rb

@@ -309,8 +309,8 @@ class TestSession < Minitest::Test
     session.flush_namespaced_access_tokens
     ruid = session.instance_variable_get(:"@_refresh").uid
     refresh_token = JWTSessions::RefreshToken.find(ruid, JWTSessions.token_store, namespace)
-    assert_equal "", refresh_token.access_uid
-    assert_equal "", refresh_token.access_expiration
+    assert_equal "0", refresh_token.access_uid
+    assert_equal "0", refresh_token.access_expiration
 
     # allows to refresh with un-expired but flushed access token payload
     session.refresh_by_access_payload do
@@ -320,8 +320,8 @@ class TestSession < Minitest::Test
     access_token = JWTSessions::AccessToken.find(auid, JWTSessions.token_store)
     refresh_token = JWTSessions::RefreshToken.find(ruid, JWTSessions.token_store, namespace)
 
-    assert_equal false, access_token.uid.size.zero?
-    assert_equal false, access_token.expiration.size.zero?
+    assert "0" != access_token.uid
+    assert "0" != access_token.expiration
     assert_equal access_token.uid.to_s, refresh_token.access_uid
     assert_equal access_token.expiration.to_s, refresh_token.access_expiration
   end

data/test/units/jwt_sessions/test_token.rb

@@ -24,7 +24,7 @@ class TestToken < Minitest::Test
 
   def teardown
     JWTSessions.algorithm = JWTSessions::DEFAULT_ALGORITHM
-    JWTSessions.instance_variable_set(:"@jwt_options", JWTSessions::JWTOptions.new(*JWT::DefaultOptions::DEFAULT_OPTIONS.values))
+    JWTSessions.instance_variable_set(:"@jwt_options", JWT::Configuration::Container.new.decode.to_h)
   end
 
   def test_rsa_token_decode
@@ -73,7 +73,7 @@ class TestToken < Minitest::Test
 
   def test_token_sub_claim
     JWTSessions.encryption_key = "abcdefghijklmnopqrstuvwxyzABCDEF"
-    JWTSessions.jwt_options.verify_sub = true
+    JWTSessions.jwt_options[:verify_sub] = true
     token   = JWTSessions::Token.encode(payload.merge(sub: "subject"))
     decoded = JWTSessions::Token.decode(token, { sub: "subject" }).first
     assert_equal payload["user_id"], decoded["user_id"]
@@ -85,7 +85,7 @@ class TestToken < Minitest::Test
 
   def test_token_iss_claim
     JWTSessions.encryption_key = "abcdefghijklmnopqrstuvwxyzABCDEF"
-    JWTSessions.jwt_options.verify_iss = true
+    JWTSessions.jwt_options[:verify_iss] = true
     token   = JWTSessions::Token.encode(payload.merge(iss: "Me"))
     decoded = JWTSessions::Token.decode(token, { iss: "Me" }).first
     assert_equal payload["user_id"], decoded["user_id"]
@@ -97,7 +97,7 @@ class TestToken < Minitest::Test
 
   def test_token_aud_claim
     JWTSessions.encryption_key = "abcdefghijklmnopqrstuvwxyzABCDEF"
-    JWTSessions.jwt_options.verify_aud = true
+    JWTSessions.jwt_options[:verify_aud] = true
     token   = JWTSessions::Token.encode(payload.merge(aud: ["young", "old"]))
     decoded = JWTSessions::Token.decode(token, { aud: ["young"] }).first
     assert_equal payload["user_id"], decoded["user_id"]
@@ -109,7 +109,7 @@ class TestToken < Minitest::Test
 
   def test_token_leeway_decode
     JWTSessions.encryption_key = "abcdefghijklmnopqrstuvwxyzABCDEF"
-    JWTSessions.jwt_options.leeway = 50
+    JWTSessions.jwt_options[:leeway] = 50
     token   = JWTSessions::Token.encode(payload.merge("exp" => Time.now.to_i - 20))
     decoded = JWTSessions::Token.decode(token).first
     assert_equal payload["user_id"], decoded["user_id"]

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: jwt_sessions
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.4
 platform: ruby
 authors:
 - Yulia Oletskaya
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -24,9 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 description: XSS/CSRF safe JWT auth designed for SPA
 email: yulia.oletskaya@gmail.com
 executables: []
@@ -98,7 +112,7 @@ metadata:
   changelog_uri: https://github.com/tuwukee/jwt_sessions/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/tuwukee/jwt_sessions
   bug_tracker_uri: https://github.com/tuwukee/jwt_sessions/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: JWT Sessions
 test_files: