canistor 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2edb558a153237b48ed0e9438b9e77d6f9d1f8e8c6435b56e51fb79c4fd32fc8
-  data.tar.gz: 8993f393d9e18e7fd2f95873babdbf261e3fc27d4e736c7b8993d42baa797c12
+  metadata.gz: 7079760f9cc2acf2385c2073b80780bf1083d5972332774c35f4ea8ac0ff11e8
+  data.tar.gz: b7b31dcc1529d93ec687c82fa8f895edd62ed8be8854a0da985671a362690304
 SHA512:
-  metadata.gz: 9cfd41769d311b131c28fd1515e3bfdec9fc1ca3912eb37ade3e00fe0796423adad0b9c7a7b4952d84a13b4fff0d163046ca4b8e1dad181f6879fb58e97c16fb
-  data.tar.gz: 8c2ee77d44457b16fe37dffc1e85cb3e381a873a28f1d3c8112f2a5acfc3d69b7332e0031f00d9b7c591dc1f528312cd22c8d447159917585f781b2fa96198ac
+  metadata.gz: '086f2b966946f3bed4f5e56921be6db7015dcdf6bc56190be19f97cb38f28740b8616686e32d8be8ed1887da7dc7b43a75c725827660b7de666e3b899e8b0eb1'
+  data.tar.gz: 4baf02fa55c428023332a04c7b9404499404f652cc8a902bcf1b94ba5b8e685f014fb690dd5071fe08177c9e7b707c7163aaf8dd17d6bd849cf7fc9ac314f6ca

data/lib/canistor/error_handler.rb

@@ -20,6 +20,14 @@ module Canistor
       context.http_response
     end
 
+    def serve_continue
+      response.signal_headers(
+        100,
+        'date' => Time.now.httpdate,
+        'x-amz-request-id' => request_id
+      )
+    end
+
     def serve_bad_request
       serve_error(400, Nokogiri::XML::Builder.new do |xml|
         xml.Error do
@@ -166,6 +174,10 @@ module Canistor
       response.signal_error(RuntimeError.new("Fatal error."))
     end
 
+    def self.serve_continue(context)
+      new(context).serve_continue
+    end
+
     def self.serve_bad_request(context)
       new(context).serve_bad_request
     end

data/lib/canistor/handler.rb

@@ -49,7 +49,12 @@ module Canistor
       end
       if credentials = Canistor.find_credentials(authorization)
         if authorization.valid_signature?(context.http_request, credentials)
-          if bucket = Canistor.store.dig(subject.region, subject.bucket)
+          if bucket = Canistor.find_bucket(subject.region, subject.bucket)
+            # The AWS client has an optimization where it waits for a 100
+            # Continue status code before sending the request body.
+            if context.http_request.headers['expect'] == '100-continue'
+              Canistor::ErrorHandler.serve_continue(context)
+            end
             method = context.http_request.http_method.to_s.downcase
             bucket.send(
               method,

data/lib/canistor/storage/object.rb

@@ -160,7 +160,7 @@ module Canistor
       def find_source(context, subject)
         if source = context.http_request.headers['x-amz-copy-source']
           bucket_name, key = source.split('/', 2)
-          if bucket = Canistor.store.dig(region, bucket_name)
+          if bucket = Canistor.find_bucket(region, bucket_name)
             if object = bucket.dig(key)
               object
             else

data/lib/canistor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canistor
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/canistor.rb

@@ -108,6 +108,31 @@ module Canistor
     nil
   end
 
+  def self.find_bucket(region, bucket)
+    store.dig(region, bucket) || find_bucket_by_name_and_warn(region, bucket)
+  end
+
+  def self.find_bucket_by_name_and_warn(region, bucket)
+    found = find_bucket_by_name(bucket)
+    return if found.nil?
+
+    logger.info(
+      "S3 client configured for \"#{region}\" but the bucket \"#{bucket}\" " \
+      "is in \"#{found.region}\"; Please configure the proper region to " \
+      "avoid multiple unnecessary redirects and signing attempts"
+    ) if logger
+    found
+  end
+
+  def self.find_bucket_by_name(bucket)
+    store.each do |_, buckets|
+      if bucket = buckets[bucket]
+        return bucket
+      end
+    end
+    nil
+  end
+
   def self.credentials=(accounts)
     accounts.each do |attributes|
       unless attributes.keys.map(&:to_s) == %w(access_key_id secret_access_key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canistor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Canistor is mock for Aws::S3 defined by the AWS SDK gem.