fog-aws 3.28.0 → 3.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b81862bafa0db522d573c2349e8505c3d66c3aeaae51a0c8daa2e6ba6bd1db8
-  data.tar.gz: 4d4fac1aaffa73b888fca2c3b244a85c99d23fb288831947c3c8ffa3f0e7a23b
+  metadata.gz: ef6d261effc88541b56e982050d0003a3ed126e5380a3928f3a622eea66633b9
+  data.tar.gz: 0ba63812241e5c5694e62271c22bf9e654db0ae96f8b481ddd18c3d6731aa295
 SHA512:
-  metadata.gz: c1cd8afc6b7455b6392c55fd2483eb9ac2b0314e3ecd8757e46c3b7462ec9a7f90ab8058310d2ebdfa966e685b983ce7fd93ae834bb86ff44b2e7bac7022473d
-  data.tar.gz: 640fb216fc8e201576b249aab161b1b6e125f1dc7f331f95c394b03f07b891c3e02ae5f75b344d3ecd4a19c0b912512904b48b6796b632b47d9e0cd271489e47
+  metadata.gz: 0dab6002b97b2a17003ea277b62572ea04583f8dd109c77ef4dc8db17cec0d5b97e69fe475bba60791f08ee4ffb0bd14283880d3989f3a70bde4f6b5581ff52b
+  data.tar.gz: cc0419e84ba54e19b5e4909f94e2133816e40ffd3fac80ec96257c1046071a331b777e11a184d5a88abe84dc1a348f3f9aecc9527f90b047d346e3e631a072be

data/CHANGELOG.md

@@ -1,32 +1,69 @@
 # Changelog
 
-## [v3.28.0](https://github.com/fog/fog-aws/tree/v3.28.0) (2024-10-14)
+## [v3.33.2](https://github.com/fog/fog-aws/tree/v3.33.2) (2026-04-20)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.27.0...v3.28.0)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.33.0...v3.33.1)
+
+**Merged pull requests:**
+
+- bug(aws/storage): include non-standard port in Host header for signature v4 [\#755](https://github.com/fog/fog-aws/pull/755) ([stanhu](https://github.com/stanhu))
+- Bump actions/checkout from 5 to 6 [\#753](https://github.com/fog/fog-aws/pull/753) ([dependabot](https://github.com/apps/dependabot))
+
+## [v3.33.1](https://github.com/fog/fog-aws/tree/v3.33.1) (2025-11-03)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.33.0...v3.33.1)
 
 **Closed issues:**
 
-- SES needs to support AWS SigV4 [\#726](https://github.com/fog/fog-aws/issues/726)
+- aws\_credentials\_refresh\_threshold\_seconds gets wiped when credentials are refreshed [\#751](https://github.com/fog/fog-aws/issues/751)
+- Frozen string errors in ruby 3.4 [\#745](https://github.com/fog/fog-aws/issues/745)
 
 **Merged pull requests:**
 
-- Update SES to use AWS SigV4 [\#727](https://github.com/fog/fog-aws/pull/727) ([ohookins](https://github.com/ohookins))
+- bug\(aws/storage\): avoid overwriting refresh threshold with nil [\#752](https://github.com/fog/fog-aws/pull/752) ([geemus](https://github.com/geemus))
+- Bump github/codeql-action from 3 to 4 [\#749](https://github.com/fog/fog-aws/pull/749) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/checkout from 4 to 5 [\#748](https://github.com/fog/fog-aws/pull/748) ([dependabot[bot]](https://github.com/apps/dependabot))
 
-## [v3.27.0](https://github.com/fog/fog-aws/tree/v3.27.0) (2024-09-16)
+## [v3.33.0](https://github.com/fog/fog-aws/tree/v3.33.0) (2025-08-07)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.26.0...v3.27.0)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.32.0...v3.33.0)
+
+**Closed issues:**
+
+- Add support for ListObjectsV2 [\#741](https://github.com/fog/fog-aws/issues/741)
+- NoMethodError (undefined method `copy\_object' for "close":String\) [\#702](https://github.com/fog/fog-aws/issues/702)
 
 **Merged pull requests:**
 
-- avoid merging connection value from headers when saving files [\#725](https://github.com/fog/fog-aws/pull/725) ([geemus](https://github.com/geemus))
+- storage headers should be rejected in a case-insensitive way [\#747](https://github.com/fog/fog-aws/pull/747) ([geemus](https://github.com/geemus))
+- Update rubyzip requirement from ~\> 2.4.1 to ~\> 3.0.0 [\#746](https://github.com/fog/fog-aws/pull/746) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Fix \#741 Added list objects v2 api support [\#744](https://github.com/fog/fog-aws/pull/744) ([Ankk98](https://github.com/Ankk98))
+- Update base64 requirement from ~\> 0.2.0 to \>= 0.2, \< 0.4 [\#743](https://github.com/fog/fog-aws/pull/743) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.32.0](https://github.com/fog/fog-aws/tree/v3.32.0) (2025-05-27)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.31.0...v3.32.0)
 
-## [v3.26.0](https://github.com/fog/fog-aws/tree/v3.26.0) (2024-09-10)
+**Closed issues:**
+
+- Add ability to specify s3 restore object tier in post\_object\_restore [\#740](https://github.com/fog/fog-aws/issues/740)
+
+**Merged pull requests:**
+
+- Add ability to specify s3 restore object tier in post\_object\_restore [\#742](https://github.com/fog/fog-aws/pull/742) ([Ankk98](https://github.com/Ankk98))
+
+## [v3.31.0](https://github.com/fog/fog-aws/tree/v3.31.0) (2025-04-21)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.30.0...v3.31.0)
+
+**Closed issues:**
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.25.0...v3.26.0)
+- Compute.describe\_instance\_status\(\) fails [\#734](https://github.com/fog/fog-aws/issues/734)
 
 **Merged pull requests:**
 
-- Support AWS\_ENDPOINT\_URL\_STS environment variable [\#724](https://github.com/fog/fog-aws/pull/724) ([stanhu](https://github.com/stanhu))
+- Fix Compute.describe\_instance\_status parser [\#735](https://github.com/fog/fog-aws/pull/735) ([kitherill](https://github.com/kitherill))
+- Update rubyzip requirement from ~\> 2.3.0 to ~\> 2.4.1 [\#733](https://github.com/fog/fog-aws/pull/733) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 
 

data/fog-aws.gemspec

@@ -22,14 +22,15 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
+  spec.add_development_dependency 'benchmark'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.16'
   spec.add_development_dependency 'rake',    '>= 12.3.3'
-  spec.add_development_dependency 'rubyzip', '~> 2.3.0'
+  spec.add_development_dependency 'rubyzip', '~> 3.0.0'
   spec.add_development_dependency 'shindo',  '~> 0.3'
 
-  spec.add_dependency 'base64', '~> 0.2.0'
-  spec.add_dependency 'fog-core', '~> 2.1'
+  spec.add_dependency 'base64', '>= 0.2', '< 0.4'
+  spec.add_dependency 'fog-core', '~> 2.6'
   spec.add_dependency 'fog-json', '~> 1.1'
   spec.add_dependency 'fog-xml', '~> 0.1'
 

data/lib/fog/aws/kms.rb

@@ -20,6 +20,9 @@ module Fog
       request :list_keys
       request :create_key
       request :describe_key
+      request :get_public_key
+      request :schedule_key_deletion
+      request :sign
 
       model_path 'fog/aws/models/kms'
       model      :key
@@ -30,7 +33,8 @@ module Fog
           @data ||= Hash.new do |hash, region|
             hash[region] = Hash.new do |region_hash, access_key|
               region_hash[access_key] = {
-                :keys => {},
+                keys: {},
+                pkeys: {}
               }
             end
           end

data/lib/fog/aws/models/storage/file.rb

@@ -281,7 +281,7 @@ module Fog
             merge_attributes(data.body)
           else
             data = service.put_object(directory.key, key, body, options)
-            merge_attributes(data.headers.reject {|key, value| ['Connection', 'Content-Length', 'Content-Type'].include?(key)})
+            merge_attributes(data.headers.reject {|key, value| ['connection', 'content-length', 'content-type'].include?(key.downcase)})
           end
           self.etag = self.etag.gsub('"','') if self.etag
           self.content_length = Fog::Storage.get_body_size(body)

data/lib/fog/aws/parsers/compute/describe_instance_status.rb

@@ -4,7 +4,7 @@ module Fog
       module Compute
         class DescribeInstanceStatus < Fog::Parsers::Base
           def new_instance!
-            @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'eventsSet' => [] }
+            @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'attachedEbsStatus' => { 'details' => [] }, 'eventsSet' => [] }
           end
 
           def new_item!
@@ -31,6 +31,8 @@ module Fog
               @inside = :instanceState
             when 'instanceStatus'
               @inside = :instanceStatus
+            when 'attachedEbsStatus'
+              @inside = :attachedEbsStatus
             when 'eventsSet'
               @inside = :eventsSet
             end
@@ -43,13 +45,13 @@ module Fog
               @instance[name] = value
             when 'nextToken', 'requestId'
               @response[name] = value
-            when 'systemStatus', 'instanceState', 'instanceStatus', 'eventsSet'
+            when 'systemStatus', 'instanceState', 'instanceStatus', 'attachedEbsStatus', 'eventsSet'
               @inside = nil
             when 'item'
               case @inside
               when :eventsSet
                 @instance['eventsSet'] << @item
-              when :systemStatus, :instanceStatus
+              when :systemStatus, :instanceStatus, :attachedEbsStatus
                 @instance[@inside.to_s]['details'] << @item
               when nil
                 @response['instanceStatusSet'] << @instance

data/lib/fog/aws/parsers/kms/describe_key.rb

@@ -17,9 +17,9 @@ module Fog
 
           def end_element(name)
             case name
-            when 'KeyUsage', 'AWSAccountId', 'Description', 'KeyId', 'Arn'
+            when 'Arn', 'AWSAccountId', 'Description', 'KeyId', 'KeySpec', 'KeyState', 'KeyUsage'
               @key[name] = value
-            when 'CreationDate'
+            when 'CreationDate', 'DeletionDate'
               @key[name] = Time.parse(value)
             when 'Enabled'
               @key[name] = (value == 'true')

data/lib/fog/aws/parsers/kms/get_public_key.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module KMS
+        class GetPublicKey < Fog::Parsers::Base
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'EncryptionAlgorithms', 'KeyAgreementAlgorithms', 'SigningAlgorithms'
+              @response[name] = []
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'KeyId', 'KeySpec', 'KeyUsage', 'PublicKey'
+              @response[name] = value
+            when 'EncryptionAlgorithms', 'KeyAgreementAlgorithms', 'SigningAlgorithms'
+              @response[name] << value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/kms/schedule_key_deletion.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module KMS
+        class ScheduleKeyDeletion < Fog::Parsers::Base
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'DeletionDate'
+              @response[name] = Time.parse(value)
+            when 'KeyId', 'KeyState'
+              @response[name] = value
+            when 'PendingWindowInDays'
+              @response[name] = value.to_i
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/kms/sign.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module KMS
+        class Sign < Fog::Parsers::Base
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'KeyId', 'Signature', 'SigningAlgorithm'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/storage/list_objects_v2.rb

@@ -0,0 +1,66 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class ListObjectsV2 < Fog::Parsers::Base
+          # Initialize parser state
+          def initialize
+            super
+            @common_prefix = {}
+            @object = { 'Owner' => {} }
+            reset
+          end
+
+          def reset
+            @object = { 'Owner' => {} }
+            @response = { 'Contents' => [], 'CommonPrefixes' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = false
+            when 'Contents'
+              @response['Contents'] << @object
+              @object = { 'Owner' => {} }
+            when 'DisplayName', 'ID'
+              @object['Owner'][name] = value
+            when 'ETag'
+              @object[name] = value.gsub('"', '') if value != nil
+            when 'IsTruncated'
+              if value == 'true'
+                @response['IsTruncated'] = true
+              else
+                @response['IsTruncated'] = false
+              end
+            when 'LastModified'
+              @object['LastModified'] = Time.parse(value)
+            when 'ContinuationToken', 'NextContinuationToken', 'Name', 'StartAfter'
+              @response[name] = value
+            when 'MaxKeys', 'KeyCount'
+              @response[name] = value.to_i
+            when 'Prefix'
+              if @in_common_prefixes
+                @response['CommonPrefixes'] << value
+              else
+                @response[name] = value
+              end
+            when 'Size'
+              @object['Size'] = value.to_i
+            when 'Delimiter', 'Key', 'StorageClass'
+              @object[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/fog/aws/requests/kms/create_key.rb

@@ -2,61 +2,99 @@ module Fog
   module AWS
     class KMS
       class Real
-        DEFAULT_KEY_POLICY = <<-JSON
-{
-  "Version": "2012-10-17",
-  "Id": "key-default-1",
-  "Statement": [
-    {
-      "Sid": "Enable IAM User Permissions",
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "arn:aws:iam::915445820265:root"
-      },
-      "Action": "kms:*",
-      "Resource": "*"
-    }
-  ]
-}
-        JSON
-
         require 'fog/aws/parsers/kms/describe_key'
 
-        def create_key(policy = nil, description = nil, usage = "ENCRYPT_DECRYPT")
-          request(
-            'Action'      => 'CreateKey',
-            'Description' => description,
-            'KeyUsage'    => usage,
-            'Policy'      => policy,
-            :parser       => Fog::Parsers::AWS::KMS::DescribeKey.new
-          )
+        # Create Key
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'Description'<~String>:
+        #   * 'KeyUsage'<~String>:
+        #   * 'Policy'<~String>:
+        #   * ... (see docs from see also)
+        #
+        # === Returns
+        #
+        # ==== See Also
+        # https://docs.aws.amazon.com/kms/latest/APIReference/API_CreateKey.html
+        def create_key(*args)
+          options = Fog::AWS::KMS.parse_create_key_args(args)
+          request({
+            'Action' => 'CreateKey',
+            :parser => Fog::Parsers::AWS::KMS::DescribeKey.new
+          }.merge!(options))
         end
       end
 
       class Mock
-        def create_key(policy = nil, description = nil, usage = "ENCRYPT_DECRYPT")
+        def create_key(*args)
+          options = Fog::AWS::KMS.parse_create_key_args(args)
+
           response = Excon::Response.new
           key_id   = UUID.uuid
           key_arn  = Fog::AWS::Mock.arn("kms", self.account_id, "key/#{key_id}", @region)
 
           key = {
-            "KeyUsage"     => usage,
-            "AWSAccountId" => self.account_id,
-            "KeyId"        => key_id,
-            "Description"  => description,
-            "CreationDate" => Time.now,
-            "Arn"          => key_arn,
-            "Enabled"      => true,
-          }
+            'Arn' => key_arn,
+            'AWSAccountId' => self.account_id,
+            'CreationDate' => Time.now.utc,
+            'DeletionDate' => nil,
+            'Description' => nil,
+            'Enabled' => true,
+            'KeyId' => key_id,
+            'KeySpec' => 'SYMMETRIC_DEFAULT',
+            'KeyState' => 'Enabled',
+            'KeyUsage' => 'ENCRYPT_DECRYPT',
+            'Policy' => nil
+          }.merge!(options)
 
           # @todo use default policy
 
           self.data[:keys][key_id] = key
 
-          response.body = { "KeyMetadata" => key }
+          klass, arg = {
+            'ECC_NIST_P256' => [OpenSSL::PKey::EC, 'prime256v1'],
+            'ECC_NIST_P384' => [OpenSSL::PKey::EC, 'secp384r1'],
+            'ECC_NIST_P521' => [OpenSSL::PKey::EC, 'secp521r1'],
+            'ECC_SECG_P256K1' => [OpenSSL::PKey::EC, 'secp256k1'],
+            'RSA_2048' => [OpenSSL::PKey::RSA, 2048],
+            'RSA_3072' => [OpenSSL::PKey::RSA, 3072],
+            'RSA_4096' => [OpenSSL::PKey::RSA, 4096]
+          }[key['KeySpec']]
+          raise "Unknown or not-yet-implemented #{key['KeySpec']} KeySpec for kms create_key mocks" unless klass
+
+          self.data[:pkeys][key_id] = klass.generate(arg)
+
+          response.body = { 'KeyMetadata' => key }
           response
         end
       end
+
+      # previous args (policy, description, usage) was deprecated in favor of a hash of options
+      def self.parse_create_key_args(args)
+        case args.size
+        when 0
+          {}
+        when 1
+          if args[0].is_a?(Hash)
+            args[0]
+          else
+            Fog::Logger.deprecation("create_key with distinct arguments is deprecated, use options hash instead [light_black](#{caller.first})[/]")
+            {
+              'Policy' => args[0]
+            }
+          end
+        when 2, 3
+          Fog::Logger.deprecation("create_key with distinct arguments is deprecated, use options hash instead [light_black](#{caller.first})[/]")
+          {
+            'Policy' => args[0],
+            'Description' => args[1],
+            'KeyUsage' => args[2] || 'ENCRYPT_DECRYPT'
+          }
+        else
+          raise "Unknown argument style: #{args.inspect}, use options hash instead."
+        end
+      end
     end
   end
 end

data/lib/fog/aws/requests/kms/get_public_key.rb

@@ -0,0 +1,35 @@
+module Fog
+  module AWS
+    class KMS
+      class Real
+        require 'fog/aws/parsers/kms/get_public_key'
+
+        def get_public_key(identifier, grant_tokens = nil)
+          request(
+            'Action' => 'GetPublicKey',
+            'GrantTokens' => grant_tokens,
+            'KeyId' => identifier,
+            :parser => Fog::Parsers::AWS::KMS::GetPublicKey.new
+          )
+        end
+      end
+
+      class Mock
+        def get_public_key(identifier, _grant_tokens = [])
+          response = Excon::Response.new
+          key = self.data[:keys][identifier]
+          pkey = self.data[:pkeys][identifier]
+
+          response.body = {
+            'KeyId' => key['Arn'],
+            'KeyUsage' => key['KeyUsage'],
+            'KeySpec' => key['KeySpec'],
+            'PublicKey' => Base64.strict_encode64(pkey.public_to_der),
+            'SigningAlgorithms' => key['SigningAlgorithms']
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/kms/list_keys.rb

@@ -2,7 +2,6 @@ module Fog
   module AWS
     class KMS
       class Real
-
         require 'fog/aws/parsers/kms/list_keys'
 
         def list_keys(options={})
@@ -43,9 +42,9 @@ module Fog
           key_set = if marker
                       self.data[:markers][marker] || []
                     else
-                      self.data[:keys].inject([]) { |r,(k,v)|
-                        r << { "KeyId" => k, "KeyArn" => v["Arn"] }
-                      }
+                      self.data[:keys].inject([]) do |r, (k, v)|
+                        r << { 'KeyArn' => v['Arn'], 'KeyId' => k }
+                      end
                     end
 
           keys = if limit

data/lib/fog/aws/requests/kms/schedule_key_deletion.rb

@@ -0,0 +1,37 @@
+module Fog
+  module AWS
+    class KMS
+      class Real
+        require 'fog/aws/parsers/kms/schedule_key_deletion'
+
+        def schedule_key_deletion(identifier, pending_window_in_days)
+          request(
+            'Action' => 'ScheduleKeyDeletion',
+            'KeyId' => identifier,
+            'PendingWindowInDays' => pending_window_in_days,
+            :parser => Fog::Parsers::AWS::KMS::ScheduleKeyDeletion.new
+          )
+        end
+      end
+
+      class Mock
+        def schedule_key_deletion(identifier, pending_window_in_days)
+          response = Excon::Response.new
+          key = self.data[:keys][identifier]
+
+          key['DeletionDate'] = Time.now + (60 * 60 * 24 * pending_window_in_days)
+          key['Enabled'] = false
+          key['KeyState'] = 'PendingDeletion'
+
+          response.body = {
+            'DeletionDate' => key['DeletionDate'],
+            'KeyId' => key['KeyId'],
+            'KeyState' => key['KeyState'],
+            'PendingWindowInDays' => pending_window_in_days
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/kms/sign.rb

@@ -0,0 +1,62 @@
+module Fog
+  module AWS
+    class KMS
+      class Real
+        require 'fog/aws/parsers/kms/sign'
+
+        # Sign
+        #
+        # ==== Parameters
+        # * identifier<~String>: id, arn, alias name, or alias arn for key to sign with
+        # * message<~String>: base64 encoded message to sign
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # https://docs.aws.amazon.com/kms/latest/APIReference/API_Sign.html
+        #
+        def sign(identifier, message, algorithm, options = {})
+          request({
+            'Action' => 'Sign',
+            'KeyId' => identifier,
+            'Message' => message,
+            'SigningAlgorithm' => algorithm,
+            :parser => Fog::Parsers::AWS::KMS::Sign.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def sign(identifier, message, algorithm, options = {})
+          response = Excon::Response.new
+          pkey = self.data[:pkeys][identifier]
+          unless pkey
+            response.status = 404
+            raise(Excon::Errors.status_error({ expects: 200 }, response))
+          end
+
+          data = Base64.decode64(message)
+
+          # FIXME: SM2 support?
+          sha = "SHA#{algorithm.split('_SHA_').last}"
+          signopts = {}
+          signopts[:rsa_padding_mode] = 'pss' if algorithm.start_with?('RSASSA_PSS')
+
+          signature = if options['MessageType'] == 'DIGEST'
+                        pkey.sign_raw(sha, data, signopts)
+                      else
+                        pkey.sign(sha, data, signopts)
+                      end
+
+          response.body = {
+            'KeyId' => identifier,
+            'Signature' => Base64.strict_encode64(signature),
+            'SigningAlgorithm' => algorithm
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/list_objects_v2.rb

@@ -0,0 +1,129 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        require 'fog/aws/parsers/storage/list_objects_v2'
+
+        # List information about objects in an S3 bucket using ListObjectsV2
+        #
+        # @param bucket_name [String] name of bucket to list object keys from
+        # @param options [Hash] config arguments for list.  Defaults to {}.
+        # @option options delimiter [String] causes keys with the same string between the prefix
+        #     value and the first occurrence of delimiter to be rolled up
+        # @option options continuation-token [String] continuation token from a previous request
+        # @option options fetch-owner [Boolean] specifies whether to return owner information
+        # @option options max-keys [Integer] limits number of object keys returned
+        # @option options prefix [String] limits object keys to those beginning with its value
+        # @option options start-after [String] starts listing after this specified key
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * Delimiter [String] - Delimiter specified for query
+        #     * IsTruncated [Boolean] - Whether or not the listing is truncated
+        #     * ContinuationToken [String] - Token specified in the request
+        #     * NextContinuationToken [String] - Token to use in subsequent requests
+        #     * KeyCount [Integer] - Number of keys returned
+        #     * MaxKeys [Integer] - Maximum number of keys specified for query
+        #     * Name [String] - Name of the bucket
+        #     * Prefix [String] - Prefix specified for query
+        #     * StartAfter [String] - StartAfter specified in the request
+        #     * CommonPrefixes [Array] - Array of strings for common prefixes
+        #     * Contents [Array]:
+        #       * ETag [String] - Etag of object
+        #       * Key [String] - Name of object
+        #       * LastModified [String] - Timestamp of last modification of object
+        #       * Owner [Hash]:
+        #         * DisplayName [String] - Display name of object owner
+        #         * ID [String] - Id of object owner
+        #       * Size [Integer] - Size of object
+        #       * StorageClass [String] - Storage class of object
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+
+        def list_objects_v2(bucket_name, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          
+          # Add list-type=2 to indicate ListObjectsV2
+          options = options.merge('list-type' => '2')
+          
+          request({
+            :expects  => 200,
+            :headers  => {},
+            :bucket_name => bucket_name,
+            :idempotent => true,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::Storage::ListObjectsV2.new,
+            :query    => options
+          })
+        end
+      end
+
+      class Mock # :nodoc:all
+        def list_objects_v2(bucket_name, options = {})
+          prefix = options['prefix']
+          continuation_token = options['continuation-token']
+          delimiter = options['delimiter']
+          max_keys = options['max-keys']
+          start_after = options['start-after']
+          fetch_owner = options['fetch-owner']
+          common_prefixes = []
+
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          
+          response = Excon::Response.new
+          if bucket = self.data[:buckets][bucket_name]
+            contents = bucket[:objects].values.map(&:first).sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
+                (prefix    && object['Key'][0...prefix.length] != prefix) ||
+                (start_after && object['Key'] <= start_after) ||
+                (continuation_token && object['Key'] <= continuation_token) ||
+                (delimiter && object['Key'][(prefix ? prefix.length : 0)..-1].include?(delimiter) \
+                           && common_prefixes << object['Key'].sub(/^(#{prefix}[^#{delimiter}]+.).*/, '\1')) ||
+                object.key?(:delete_marker)
+              end.map do |object|
+                data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
+                data.merge!({
+                  'LastModified' => Time.parse(object['Last-Modified']),
+                  'Owner'        => fetch_owner ? bucket['Owner'] : nil,
+                  'Size'         => object['Content-Length'].to_i
+                })
+              data
+            end
+            
+            max_keys = max_keys || 1000
+            size = [max_keys, 1000].min
+            truncated_contents = contents[0...size]
+            next_token = truncated_contents.size != contents.size ? truncated_contents.last['Key'] : nil
+
+            response.status = 200
+            common_prefixes_uniq = common_prefixes.uniq
+            response.body = {
+              'CommonPrefixes'  => common_prefixes_uniq,
+              'Contents'        => truncated_contents,
+              'IsTruncated'     => truncated_contents.size != contents.size,
+              'ContinuationToken' => continuation_token,
+              'NextContinuationToken' => next_token,
+              'KeyCount'        => truncated_contents.size + common_prefixes_uniq.size,
+              'MaxKeys'         => max_keys,
+              'Name'            => bucket['Name'],
+              'Prefix'          => prefix,
+              'StartAfter'      => start_after
+            }
+            if max_keys && max_keys < response.body['Contents'].length
+                response.body['IsTruncated'] = true
+                response.body['Contents'] = response.body['Contents'][0...max_keys]
+                response.body['KeyCount'] = response.body['Contents'].size + response.body['CommonPrefixes'].size
+            end
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
+        end
+      end
+    end
+  end
+end 

data/lib/fog/aws/requests/storage/post_object_restore.rb

@@ -6,7 +6,9 @@ module Fog
         #
         # @param bucket_name [String] Name of bucket containing object
         # @param object_name [String] Name of object to restore
-        # @option days [Integer] Number of days to restore object for. Defaults to 100000 (a very long time)
+        # @param options [Hash] Optional parameters
+        # @option options [Integer] :days Number of days to restore object for. Defaults to 100000 (a very long time)
+        # @option options [String] :tier Glacier retrieval tier. Can be 'Standard', 'Bulk', or 'Expedited'
         #
         # @return [Excon::Response] response:
         #   * status [Integer] 200 (OK) Object is previously restored
@@ -15,11 +17,24 @@ module Fog
         #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html
         #
-        def post_object_restore(bucket_name, object_name, days = 100000)
+        def post_object_restore(bucket_name, object_name, options = {})
           raise ArgumentError.new('bucket_name is required') unless bucket_name
           raise ArgumentError.new('object_name is required') unless object_name
 
-          data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-3-01"><Days>' + days.to_s + '</Days></RestoreRequest>'
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("post_object_restore with a bare days parameter is deprecated, use post_object_restore(bucket_name, object_name, :days => days) instead [light_black](#{caller.first})[/]")
+            options = { :days => options }
+          end
+
+          days = options[:days] || 100000
+          tier = options[:tier]
+
+          data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-03-01/">'
+          data += '<Days>' + days.to_s + '</Days>'
+          if tier
+            data += '<GlacierJobParameters><Tier>' + tier + '</Tier></GlacierJobParameters>'
+          end
+          data += '</RestoreRequest>'
 
           headers = {}
           headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
@@ -39,7 +54,12 @@ module Fog
       end
 
       class Mock # :nodoc:all
-        def post_object_restore(bucket_name, object_name, days = 100000)
+        def post_object_restore(bucket_name, object_name, options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("post_object_restore with a bare days parameter is deprecated, use post_object_restore(bucket_name, object_name, :days => days) instead [light_black](#{caller.first})[/]")
+            options = { :days => options }
+          end
+          
           response = get_object(bucket_name, object_name)
           response.body = nil
           response

data/lib/fog/aws/storage.rb

@@ -7,6 +7,8 @@ module Fog
 
       DEFAULT_REGION = 'us-east-1'
       ACCELERATION_HOST = 's3-accelerate.amazonaws.com'
+      AWS_FIPS_REGIONS = %w(us-east-1 us-east-2 us-west-1 us-west-2 us-gov-east-1 us-gov-west-1 ca-central-1 ca-west-1).freeze
+      AWS_GOVCLOUD_REGIONS = %w(us-gov-east-1 us-gov-west-1).freeze
 
       DEFAULT_SCHEME = 'https'
       DEFAULT_SCHEME_PORT = {
@@ -16,10 +18,7 @@ module Fog
 
       DEFAULT_CONNECTION_OPTIONS = {
         retry_limit: 5,
-        retry_interval: 1,
-        retry_errors: [
-          Excon::Error::Timeout, Excon::Error::Socket, Excon::Error::Server
-        ]
+        retry_interval: 1
       }
 
       MIN_MULTIPART_CHUNK_SIZE = 5242880
@@ -27,9 +26,12 @@ module Fog
 
       VALID_QUERY_KEYS = %w[
         acl
+        continuation-token
         cors
         delete
+        fetch-owner
         lifecycle
+        list-type
         location
         logging
         notification
@@ -43,6 +45,7 @@ module Fog
         response-content-type
         response-expires
         restore
+        start-after
         tagging
         torrent
         uploadId
@@ -103,6 +106,7 @@ module Fog
       request :head_object_url
       request :initiate_multipart_upload
       request :list_multipart_uploads
+      request :list_objects_v2
       request :list_parts
       request :post_object_hidden_fields
       request :post_object_restore
@@ -261,13 +265,17 @@ module Fog
         end
 
         def region_to_host(region=nil)
-          case region.to_s
-          when DEFAULT_REGION, ''
-            's3.amazonaws.com'
-          when %r{\Acn-.*}
-            "s3.#{region}.amazonaws.com.cn"
+          if ENV['AWS_USE_FIPS_ENDPOINT'] == 'true' && AWS_FIPS_REGIONS.include?(region)
+            "s3-fips.#{region}.amazonaws.com" # https://aws.amazon.com/compliance/fips/
           else
-            "s3.#{region}.amazonaws.com"
+            case region.to_s
+            when DEFAULT_REGION, ''
+              's3.amazonaws.com'
+            when %r{\Acn-.*}
+              "s3.#{region}.amazonaws.com.cn"
+            else
+              "s3.#{region}.amazonaws.com"
+            end
           end
         end
 
@@ -581,6 +589,13 @@ module Fog
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
           end
 
+          # GovCloud doesn't support S3 Transfer Acceleration https://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-s3.html
+          # S3 Transfer Acceleration doesn't support FIPS endpoints.  When both fog_aws_accelerate=true and AWS_USE_FIPS_ENDPOINT=true, don't use Accelerate.
+          if @acceleration && (AWS_GOVCLOUD_REGIONS.include?(@region) || ENV['AWS_USE_FIPS_ENDPOINT'] == 'true')
+            Fog::Logger.warning("fog: S3 Transfer Acceleration is not available in GovCloud regions or when AWS_USE_FIPS_ENDPOINT=true. Disabling acceleration.")
+            @acceleration = false
+          end
+
           @host = ACCELERATION_HOST if @acceleration
           setup_credentials(options)
         end
@@ -593,7 +608,9 @@ module Fog
 
 
         def setup_credentials(options)
-          @aws_credentials_refresh_threshold_seconds = options[:aws_credentials_refresh_threshold_seconds]
+          if options[:aws_credentials_refresh_threshold_seconds]
+            @aws_credentials_refresh_threshold_seconds = options[:aws_credentials_refresh_threshold_seconds]
+          end
 
           @aws_access_key_id     = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
@@ -601,7 +618,7 @@ module Fog
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
           if @signature_version == 4
-            @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 's3')
+            @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 's3')
           elsif @signature_version == 2
             @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
           end
@@ -641,8 +658,9 @@ module Fog
           params = request_params(params)
           scheme = params.delete(:scheme)
           host   = params.delete(:host)
-          port   = params.delete(:port) || DEFAULT_SCHEME_PORT[scheme]
-          params[:headers]['Host'] = host
+          port   = params.delete(:port)
+          params[:headers]['Host'] = port ? "#{host}:#{port}" : host
+          port ||= DEFAULT_SCHEME_PORT[scheme]
 
 
           if @signature_version == 4

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = '3.28.0'.freeze
+    VERSION = '3.33.2'.freeze
   end
 end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.28.0
+  version: 3.33.2
 platform: ruby
 authors:
 - Josh Lane
 - Wesley Beary
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
@@ -85,30 +98,36 @@ dependencies:
   name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
@@ -614,7 +633,10 @@ files:
 - lib/fog/aws/parsers/iam/upload_server_certificate.rb
 - lib/fog/aws/parsers/iam/upload_signing_certificate.rb
 - lib/fog/aws/parsers/kms/describe_key.rb
+- lib/fog/aws/parsers/kms/get_public_key.rb
 - lib/fog/aws/parsers/kms/list_keys.rb
+- lib/fog/aws/parsers/kms/schedule_key_deletion.rb
+- lib/fog/aws/parsers/kms/sign.rb
 - lib/fog/aws/parsers/lambda/base.rb
 - lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb
 - lib/fog/aws/parsers/rds/base.rb
@@ -745,6 +767,7 @@ files:
 - lib/fog/aws/parsers/storage/get_service.rb
 - lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
 - lib/fog/aws/parsers/storage/list_multipart_uploads.rb
+- lib/fog/aws/parsers/storage/list_objects_v2.rb
 - lib/fog/aws/parsers/storage/list_parts.rb
 - lib/fog/aws/parsers/storage/upload_part_copy_object.rb
 - lib/fog/aws/parsers/sts/assume_role.rb
@@ -1236,7 +1259,10 @@ files:
 - lib/fog/aws/requests/kinesis/split_shard.rb
 - lib/fog/aws/requests/kms/create_key.rb
 - lib/fog/aws/requests/kms/describe_key.rb
+- lib/fog/aws/requests/kms/get_public_key.rb
 - lib/fog/aws/requests/kms/list_keys.rb
+- lib/fog/aws/requests/kms/schedule_key_deletion.rb
+- lib/fog/aws/requests/kms/sign.rb
 - lib/fog/aws/requests/lambda/add_permission.rb
 - lib/fog/aws/requests/lambda/create_event_source_mapping.rb
 - lib/fog/aws/requests/lambda/create_function.rb
@@ -1414,6 +1440,7 @@ files:
 - lib/fog/aws/requests/storage/head_object_url.rb
 - lib/fog/aws/requests/storage/initiate_multipart_upload.rb
 - lib/fog/aws/requests/storage/list_multipart_uploads.rb
+- lib/fog/aws/requests/storage/list_objects_v2.rb
 - lib/fog/aws/requests/storage/list_parts.rb
 - lib/fog/aws/requests/storage/post_object_hidden_fields.rb
 - lib/fog/aws/requests/storage/post_object_restore.rb
@@ -1458,7 +1485,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1473,8 +1499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.
 test_files: []