logi_auth 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3ae64ef8bf56e00d3edeef71184c59da5ce8ff9a8d4df3aae11c1556f222ba
-  data.tar.gz: 8838cb06f5305d4b1e231d52c8aeeed10fec22a9658370c2d98af878b7d7aaa8
+  metadata.gz: 831ea9a87a2ab041f8056110a66b5bdb70edfb5922c24e611f2928812a90a192
+  data.tar.gz: a81b696e656399b2aebcffe49346f6278b95af02bcde4fd535a7de921a394aee
 SHA512:
-  metadata.gz: afd06609d41ff98473b53a913174c7a2e2101428a03892f6d41f39dc598b0a73ecbd987cb2eb33ecd2cf951283dcc2947f08484c824834a21f158f681b95be6c
-  data.tar.gz: f587f3dd60e2dcbcb23a67e3eaa0d7a383521c07c90af24b49c346b222f4c47e2980949b0f52068a994158b32972e5cd99af8e55592d7cb15cc720bb55002820
+  metadata.gz: 0cbd469cbd055f391654f6c968692a3ca3d8d74d7a6c124daddd0225cfc54d0cc8e1f5a91279d8ba7bff83ea1317d28ca923c6bdd755dafd20c6eac954571cff
+  data.tar.gz: e66aa214038aac5f916c9a0af991edd2af705c7322c958551c255043e68f62ac720e8ecdc859733136cc8fc9227aaf7fbdef2cd8c9a020df2c3fcd7f1694d13d

data/lib/logi_auth/errors.rb

@@ -10,6 +10,7 @@ module LogiAuth
     CODES = %w[
       malformed missing_kid unknown_kid bad_signature
       iss_mismatch aud_mismatch expired nonce_mismatch missing_claim
+      at_hash_mismatch
     ].freeze
 
     attr_reader :code

data/lib/logi_auth/id_token_verifier.rb

@@ -24,12 +24,15 @@ module LogiAuth
     module_function
 
     # Verify +id_token+ and return a Result. Raises IdTokenError on any failure.
-    # Claim order: signature -> iss -> aud -> exp -> iat -> nonce -> sub.
+    # Claim order: signature -> iss -> aud -> exp -> iat -> nonce -> sub -> at_hash.
     #
-    # jwks:     Hash with "keys" => [ {"kty","n","e","kid",...}, ... ]
-    # expected: { issuer:, client_id:, nonce: } (nonce optional)
-    # now:      Unix seconds; defaults to Time.now. Injectable for tests.
-    def verify(id_token, jwks:, expected:, now: nil, clock_skew_sec: 60)
+    # jwks:         Hash with "keys" => [ {"kty","n","e","kid",...}, ... ]
+    # expected:     { issuer:, client_id:, nonce: } (nonce optional)
+    # now:          Unix seconds; defaults to Time.now. Injectable for tests.
+    # access_token: OAuth access_token string. When both the payload carries an
+    #   `at_hash` and this is provided, OIDC §3.1.3.6 at_hash binding is enforced
+    #   (present-only): default nil skips the check, preserving backward compat.
+    def verify(id_token, jwks:, expected:, now: nil, clock_skew_sec: 60, access_token: nil)
       now ||= Time.now.to_i
 
       parts = id_token.split(".")
@@ -46,7 +49,15 @@ module LogiAuth
       kid = header["kid"]
       raise IdTokenError, "missing_kid" unless kid.is_a?(String) && !kid.empty?
 
-      jwk = Array(jwks["keys"]).find { |k| k["kid"] == kid }
+      # Tolerant JWKS key selection: pick the RS256 signing RSA key matching kid.
+      # Guards against a future EC (or encryption) key sharing the kid space —
+      # exact-match kty/use/alg filter keeps login working when JWKS gains keys.
+      jwk = Array(jwks["keys"]).find do |k|
+        k["kty"] == "RSA" &&
+          (k["use"].nil? || k["use"] == "sig") &&
+          (k["alg"].nil? || k["alg"] == "RS256") &&
+          k["kid"] == kid
+      end
       raise IdTokenError, "unknown_kid" if jwk.nil?
 
       signature = base64url_decode(parts[2])
@@ -82,9 +93,24 @@ module LogiAuth
       sub = payload["sub"]
       raise IdTokenError, "missing_claim" unless sub.is_a?(String) && !sub.empty?
 
+      # OIDC §3.1.3.6 at_hash — enforced last, present-only. If the payload
+      # carries an at_hash and an access_token was supplied, they must bind:
+      # base64url_nopad(SHA256(access_token bytes)[0...16]) == at_hash. Absent
+      # at_hash or absent access_token skips the check (backward compatible).
+      at_hash = payload["at_hash"]
+      if access_token && at_hash.is_a?(String) && !at_hash.empty?
+        raise IdTokenError, "at_hash_mismatch" unless at_hash == compute_at_hash(access_token)
+      end
+
       Result.new(sub: sub, claims: payload)
     end
 
+    # left-most 128 bits of SHA256(access_token), base64url without padding.
+    def compute_at_hash(access_token)
+      digest = OpenSSL::Digest::SHA256.digest(access_token.encode(Encoding::UTF_8))
+      Base64.urlsafe_encode64(digest[0, 16], padding: false)
+    end
+
     def verify_rs256(signing_input, signature, jwk)
       key = rsa_public_key(jwk)
       return false unless key

data/lib/logi_auth/server.rb

@@ -92,7 +92,10 @@ module LogiAuth
         raise ServerError.new("missing_id_token", "Token response had no id_token — was `openid` in the scopes?")
       end
 
-      verified = verify_with_rotation_retry(id_token, nonce)
+      # Thread the access_token so OIDC §3.1.3.6 at_hash binding is enforced
+      # before the Session is returned (present-only: no-op when the id_token
+      # carries no at_hash). parse_token_body guarantees a String access_token.
+      verified = verify_with_rotation_retry(id_token, nonce, tokens["access_token"])
       email = verified.claims["email"]
       expires_in = tokens["expires_in"]
 
@@ -110,17 +113,17 @@ module LogiAuth
 
     private
 
-    def verify_with_rotation_retry(id_token, nonce)
+    def verify_with_rotation_retry(id_token, nonce, access_token = nil)
       expected = { issuer: @token_issuer, client_id: @client_id, nonce: nonce }
       jwks, from_cache = fetch_jwks(force: false)
       begin
-        IdTokenVerifier.verify(id_token, jwks: jwks, expected: expected)
+        IdTokenVerifier.verify(id_token, jwks: jwks, expected: expected, access_token: access_token)
       rescue IdTokenError => e
         # Key rotation within the cache TTL — bust + refetch once.
         if e.code == "unknown_kid" && from_cache
           fresh, = fetch_jwks(force: true)
           begin
-            IdTokenVerifier.verify(id_token, jwks: fresh, expected: expected)
+            IdTokenVerifier.verify(id_token, jwks: fresh, expected: expected, access_token: access_token)
           rescue IdTokenError => retry_err
             raise as_id_token_invalid(retry_err)
           end

data/lib/logi_auth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogiAuth
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logi_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dcode
 bindir: bin
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest