google-cloud-env 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4a496680f310900fc41089c24e9ec06ce45525b0770e48a2d856c14d779cc4
-  data.tar.gz: 9480e4bedae18e535ff6f6a1f88febc728cdd2586855afd5994a62383ca62226
+  metadata.gz: 90efc7ff417c91cb62cbb85b70f1a16f25ad41b84effa31e7a753d64d0f541a8
+  data.tar.gz: 6925442cc3d569125696bf34112b8ce4fce1030295c48b259533219c6577e6c4
 SHA512:
-  metadata.gz: cba25bf0603f67d9029d215bac97bac46b739da8d230d832a07d694e975c04034756f4a1e9c09100b57b9c5149fbccb9d7732d351021ad60f121999359161dfa
-  data.tar.gz: c1c2b2bf84d183e499252867dfa925f287e74abb8416728764205c32060a9487cb02ce4afe0197f1da9f4f77f3b66bd3381e256947c03db49776e7066f102fad
+  metadata.gz: 5076fb608c2552701f6f267f641a83ae0301b8a7d6b3103613046b67179bed1e9c32ea65d238c3f81776ce1f7a77883c906fb3c421b1c4f4e9edb0a567f1dfe6
+  data.tar.gz: 81a486aa7b6c23c143a6af6cab570cd7ce3af5a22966303dccaf3081ff90e05e9a9f94a50356d860f03d2f03afffc74089abf71b4ea3a19b9dd87ebcb223dcaf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.2.1 (2024-10-04)
+
+#### Bug Fixes
+
+* Fixed edge cases in token expiration extraction ([#73](https://github.com/googleapis/ruby-cloud-env/issues/73)) 
+
 ### 2.2.0 (2024-08-22)
 
 #### Features

data/lib/google/cloud/env/compute_metadata.rb

@@ -806,7 +806,7 @@ module Google
         #
         def access_token_lifetime data
           json = JSON.parse data rescue nil
-          return 0 unless json&.key? "expires_in"
+          return 0 unless json.respond_to?(:key?) && json.key?("expires_in")
           lifetime = json["expires_in"].to_i - TOKEN_EXPIRY_BUFFER
           lifetime = 0 if lifetime.negative?
           lifetime
@@ -818,9 +818,9 @@ module Google
         #
         def identity_token_lifetime data
           return 0 unless data =~ /^[\w=-]+\.([\w=-]+)\.[\w=-]+$/
-          base64 = Base64.decode64 Regexp.last_match[1]
+          base64 = Base64.urlsafe_decode64 Regexp.last_match[1]
           json = JSON.parse base64 rescue nil
-          return 0 unless json&.key? "exp"
+          return 0 unless json.respond_to?(:key?) && json&.key?("exp")
           lifetime = json["exp"].to_i - Time.now.to_i - TOKEN_EXPIRY_BUFFER
           lifetime = 0 if lifetime.negative?
           lifetime

data/lib/google/cloud/env/version.rb

@@ -20,7 +20,7 @@ module Google
       # Library version
       # @return [String]
       #
-      VERSION = "2.2.0".freeze
+      VERSION = "2.2.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-env
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -59,10 +59,10 @@ homepage: https://github.com/googleapis/ruby-cloud-env
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.2.0/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.2.1/CHANGELOG.md
   source_code_uri: https://github.com/googleapis/ruby-cloud-env
   bug_tracker_uri: https://github.com/googleapis/ruby-cloud-env/issues
-  documentation_uri: https://rubydoc.info/gems/google-cloud-env/2.2.0
+  documentation_uri: https://rubydoc.info/gems/google-cloud-env/2.2.1
 post_install_message: 
 rdoc_options: []
 require_paths: