s3_proxy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea44cf361b902f466809821fe30b411db50add3
-  data.tar.gz: 8d929051a8382e50fad93796c980613c9e140f1d
+  metadata.gz: b87ae0701382cfcc91e7b233bd68ecef70546677
+  data.tar.gz: 5c6344cbac68b8b9b06b5a032aa9d0db5e4a1821
 SHA512:
-  metadata.gz: cb0718bf8606acda33658d475862aff4482bdf59afb2fffb08a86da53ae421a266054de9c32e38c9d09c8bd71608c87294e08703e6df0c5d53e9e1372c94ce31
-  data.tar.gz: 4cb738cac629cd46beec034f40286790f4c5cb738a6519f10586f50daba3d86f5e8d2667d474739fb93df127dd2ae885f061ec34f3e23b9b21630e5c6733b252
+  metadata.gz: 636b2f85af7915558cae9107de37cc2498e961909af4821ca2621bbaa531ad3b2711a01a33b7f00f6053f63faa0a352043807e7956279d6ad80174d3dcd9a79c
+  data.tar.gz: 3f42b9f14ac02405ca8489f76211f01f4e8a1c665f75dbe29463dbb122875f630f43aa0f182d5b4de4836caa4933d0f6dad11260dbd5768178517af80572cb45

data/lib/s3_proxy/app.rb

@@ -8,28 +8,60 @@ module S3Proxy
     end
 
     def call(env)
-      return Errors.method_not_allowed unless env['REQUEST_METHOD'] == 'GET'
+      return Errors.method_not_allowed unless %w(GET HEAD).include?(env['REQUEST_METHOD'])
       return Errors.not_found if env['PATH_INFO'].empty?
 
-      _, bucket, key = env['PATH_INFO'].split('/', 3)
-      path = {bucket: bucket, key: key}
+      # When used as a forward proxy
+      if env['HTTP_HOST'] =~ /(.+)\.s3\.amazonaws\.com/
+        bucket = $1
+        _, key = env['PATH_INFO'].split('/', 2)
+      else
+        _, bucket, key = env['PATH_INFO'].split('/', 3)
+      end
+
+      return Errors.not_found unless bucket && key
+
+      req = {bucket: bucket, key: key}
+
+      req[:if_match] = env['HTTP_IF_MATCH'] if env['HTTP_IF_MATCH']
+      req[:if_none_match] = env['HTTP_IF_NONE_MATCH'] if env['HTTP_IF_NONE_MATCH']
+      req[:if_modified_since] = env['HTTP_IF_MODIFIED_SINCE'] if env['HTTP_IF_MODIFIED_SINCE']
+      req[:if_unmodified_since] = env['HTTP_IF_UNMODIFIED_SINCE'] if env['HTTP_UNMODIFIED_SINCE']
+
+      head = s3.head_object(req)
 
-      head = s3.head_object(path)
       return Errors.not_found unless head
 
-      if env['rack.hijack?']
-        hijack env, path, head
-      else
-        gentle env, path, head
+      case env['REQUEST_METHOD']
+      when 'HEAD'
+        gentle env, req, head
+      when 'GET'
+        if env['rack.hijack?']
+          hijack env, req, head
+        else
+          gentle env, req, head
+        end
       end
 
-    rescue Aws::S3::Errors::NoSuchKey
+    rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
       return Errors.not_found
+
+    rescue Aws::S3::Errors::NotModified
+      return Errors.not_modified
+
+    rescue Aws::S3::Errors::PreconditionFailed
+      return Errors.precondition_failed
+
+    rescue NameError => e
+      # https://github.com/aws/aws-sdk-core-ruby/pull/65
+      raise e unless e.message == "wrong constant name 412Error"
+
+      return Errors.precondition_failed
     end
 
     private
 
-    def hijack(env, path, head)
+    def hijack(env, request, head)
       env['rack.hijack'].call
 
       io = env['rack.hijack_io']
@@ -39,31 +71,45 @@ module S3Proxy
         io.write "Connection: close\r\n"
         io.write "Content-Type: #{head.content_type}\r\n"
         io.write "Content-Length: #{head.content_length}\r\n"
+        io.write "ETag: #{head.etag}\r\n"
+        io.write "Last-Modified: #{head.last_modified}\r\n"
         io.write "\r\n"
         io.flush
 
-        s3.get_object(path, target: io)
+        s3.get_object(request, target: io)
       ensure
         io.close
       end
       return [200, {}, ['']]
     end
 
-    def gentle(env, path, head)
-      fiber = Fiber.new do
-        s3.get_object(path) do |chunk|
-          Fiber.yield(chunk)
+    def gentle(env, request, head)
+      case env['REQUEST_METHOD']
+      when 'GET'
+        fiber = Fiber.new do
+          s3.get_object(request) do |chunk|
+            Fiber.yield(chunk)
+          end
+          Fiber.yield(nil)
         end
-        Fiber.yield(nil)
-      end
 
-      body = Enumerator.new do |y|
-        while n = fiber.resume
-          y << n
+        body = Enumerator.new do |y|
+          while n = fiber.resume
+            y << n
+          end
         end
+      when 'HEAD'
+        body = ['']
       end
 
-      [200, {'Content-Type' => head.content_type, 'Content-Length' => head.content_length.to_s}, body]
+      headers = {
+        'Content-Type' => head.content_type,
+        'Content-Length' => head.content_length.to_s,
+        'Last-Modified' => head.last_modified,
+        'ETag' => head.etag,
+      }
+
+      [200, headers, body]
     end
 
     def s3
@@ -84,6 +130,14 @@ module S3Proxy
           [403, {'Content-Type' => 'text/plain'}, ["forbidden"]]
         end
 
+        def precondition_failed
+          [412, {'Content-Type' => 'text/plain'}, ["precondition failed"]]
+        end
+
+        def not_modified
+          [304, {'Content-Type' => 'text/plain'}, ["not modified"]]
+        end
+
         def unknown(code)
           [code, {'Content-Type' => 'text/plain'}, ["Error: #{code}"]]
         end

data/lib/s3_proxy/version.rb

@@ -1,3 +1,3 @@
 module S3Proxy
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -122,3 +122,4 @@ signing_key:
 specification_version: 4
 summary: S3 reverse proxy rack app that accepts multiple buckets
 test_files: []
+has_rdoc: