fakes3 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db9520921cf6e3133db80395102de95622fde8c1
-  data.tar.gz: 3627b3c4a37f71be5f9a3b6af00443efd5c4cdc2
+SHA256:
+  metadata.gz: 4deaaab0070103b1803099e1067fd78dad5a34ac86dede4198c604a9d47bfc20
+  data.tar.gz: fbb4c771b4df864cd7460a9bf4c5fa2fb80a5c7b554dd7c1dda77cd5338e83f6
 SHA512:
-  metadata.gz: 34d0d8a995420525d0faf38ebae7d7bcba6b96cd38ec2297ed35a5a1702ab3912184cfee15b61caa9db6ed5041f8bec1ea7e425c485d0a52b88f1d40b49b138a
-  data.tar.gz: 43de1b4446acb27e2e99c0624a496e3c8b4efc7c65a3eda0342e8102351a6e1fe3876b966cc2d32c643bd804e62712de2a6562b05accc4e9c5dfafe40f1d6b37
+  metadata.gz: 7382cef361cd7b7aaf048a34695357e08bbd61c9c677a06fa130394ca2dbad2627dceb7c4ef2a7bd4bfe2d4b46723ba3edf47d083dc2dfab17d90778a416c35e
+  data.tar.gz: 2688032f252dcdda84464cbc6c09cb834942996fbc7c575c43f7ff73a7b8398ccb40631584c678b4c0ef207c10f2505a49f7cbd5277809d88efe9b00eb0c1156

data/CONTRIBUTING.md

@@ -16,6 +16,7 @@ There are some prerequisites to actually being able to run the unit/integration
 On macOS, edit your /etc/hosts and add the following line:
 
     127.0.0.1 posttest.localhost
+    127.0.0.1 v2.bucket.localhost
 
 Then ensure that the following packages are installed (boto, s3cmd):
 

data/README.md

@@ -17,9 +17,9 @@ Many commands are supported, including put, get, list, copy, and make bucket.
 
 ## Running
 
-To run the server, you just specify a root and a port.
+To run the server, you must specify a root, a port, and your license key.
 
-    fakes3 -r /mnt/fakes3_root -p 4567
+    fakes3 -r /mnt/fakes3_root -p 4567 --license YOUR_LICENSE_KEY
 
 ## Licensing
 
@@ -29,6 +29,8 @@ https://supso.org/projects/fake-s3
 
 Depending on your company's size, the license may be free. It is also free for individuals.
 
+You pass the license key to Fake S3 with the command line option --license YOUR_LICENSE_KEY.
+
 ## Connecting to Fake S3
 
 Take a look at the test cases to see client example usage.  For now, Fake S3 is

data/Rakefile

@@ -16,7 +16,7 @@ end
 
 desc "Run the test_server"
 task :test_server do |t|
-  system("bundle exec bin/fakes3 --port 10453 --root test_root")
+  system("bundle exec bin/fakes3 --port 10453 --license test --root test_root  --corspostputallowheaders 'Authorization, Content-Length, Cache-Control'")
 end
 
 task :default => :test

data/lib/fakes3/cli.rb

@@ -15,8 +15,33 @@ module FakeS3
     method_option :limit, :aliases => '-l', :type => :string, :desc => 'Rate limit for serving (ie. 50K, 1.0M)'
     method_option :sslcert, :type => :string, :desc => 'Path to SSL certificate'
     method_option :sslkey, :type => :string, :desc => 'Path to SSL certificate key'
+    method_option :corsorigin, :type => :string, :desc => 'Access-Control-Allow-Origin header return value'
+    method_option :corsmethods, :type => :string, :desc => 'Access-Control-Allow-Methods header return value'
+    method_option :corspreflightallowheaders, :type => :string, :desc => 'Access-Control-Allow-Headers header return value for preflight OPTIONS requests'
+    method_option :corspostputallowheaders, :type => :string, :desc => 'Access-Control-Allow-Headers header return value for POST and PUT requests'
+    method_option :corsexposeheaders, :type => :string, :desc => 'Access-Control-Expose-Headers header return value'
+    method_option :license, :type => :string, :desc => 'Your license key, available at https://supso.org/projects/fake-s3'
 
     def server
+      license_key = options[:license]
+      if license_key.nil?
+        license_message = """
+======================
+As of version 1.3, Fake S3 requires a license key passed with --license YOUR_LICENSE_KEY.
+Please fix this before September 18, 2018.
+You can get a license at:
+https://supso.org/projects/fake-s3
+======================
+
+"""
+        licensing_required = Time.now > Time.utc(2018, 9, 19)
+        if licensing_required
+          abort license_message
+        else
+          warn license_message
+        end 
+      end
+      
       store = nil
       if options[:root]
         root = File.expand_path(options[:root])
@@ -45,6 +70,13 @@ module FakeS3
         end
       end
 
+      cors_options = {}
+      cors_options['allow_origin'] = options[:corsorigin] if options[:corsorigin]
+      cors_options['allow_methods'] = options[:corsmethods] if options[:corsmethods]
+      cors_options['preflight_allow_headers'] = options[:corspreflightallowheaders] if options[:corspreflightallowheaders]
+      cors_options['post_put_allow_headers'] = options[:corspostputallowheaders] if options[:corspostputallowheaders]
+      cors_options['expose_headers'] = options[:corsexposeheaders] if options[:corsexposeheaders]
+
       address = options[:address]
       ssl_cert_path = options[:sslcert]
       ssl_key_path = options[:sslkey]
@@ -53,8 +85,8 @@ module FakeS3
         abort "If you specify an SSL certificate you must also specify an SSL certificate key"
       end
 
-      puts "Loading FakeS3 with #{root} on port #{options[:port]} with hostname #{hostname}" unless options[:quiet]
-      server = FakeS3::Server.new(address,options[:port],store,hostname,ssl_cert_path,ssl_key_path, quiet: !!options[:quiet])
+      puts "Loading Fake S3 with #{root} on port #{options[:port]} with hostname #{hostname}" unless options[:quiet]
+      server = FakeS3::Server.new(address,options[:port],store,hostname,ssl_cert_path,ssl_key_path, quiet: !!options[:quiet], cors_options: cors_options)
       server.serve
     end
 

data/lib/fakes3/server.rb

@@ -49,12 +49,19 @@ module FakeS3
   end
 
   class Servlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server,store,hostname)
+    def initialize(server,store,hostname,cors_options)
       super(server)
       @store = store
       @hostname = hostname
       @port = server.config[:Port]
       @root_hostnames = [hostname,'localhost','s3.amazonaws.com','s3.localhost']
+
+      # Here lies hard-coded defaults for CORS Configuration
+      @cors_allow_origin = (cors_options['allow_origin'] or '*')
+      @cors_allow_methods = (cors_options['allow_methods'] or 'PUT, POST, HEAD, GET, OPTIONS')
+      @cors_preflight_allow_headers = (cors_options['preflight_allow_headers'] or 'Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token, Content-Disposition')
+      @cors_post_put_allow_headers = (cors_options['post_put_allow_headers'] or 'Authorization, Content-Length')
+      @cors_expose_headers = (cors_options['expose_headers'] or 'ETag')
     end
 
     def validate_request(request)
@@ -101,7 +108,7 @@ module FakeS3
           response.status = 404
           response.body = XmlAdapter.error_no_such_key(s_req.object)
           response['Content-Type'] = "application/xml"
-          response['Access-Control-Allow-Origin'] = '*'
+          response['Access-Control-Allow-Origin'] = @cors_allow_origin
           return
         end
 
@@ -134,7 +141,7 @@ module FakeS3
         response.header['ETag'] = "\"#{real_obj.md5}\""
         response['Accept-Ranges'] = "bytes"
         response['Last-Ranges'] = "bytes"
-        response['Access-Control-Allow-Origin'] = '*'
+        response['Access-Control-Allow-Origin'] = @cors_allow_origin
 
         real_obj.custom_metadata.each do |header, value|
           response.header['x-amz-meta-' + header] = value
@@ -188,7 +195,7 @@ module FakeS3
       response.status = 200
       response.body = ""
       response['Content-Type'] = "text/xml"
-      response['Access-Control-Allow-Origin'] = '*'
+      response['Access-Control-Allow-Origin'] = @cors_allow_origin
 
       case s_req.type
       when Request::COPY
@@ -240,9 +247,9 @@ module FakeS3
         response.header['ETag']  = "\"#{real_obj.md5}\""
       end
 
-      response['Access-Control-Allow-Origin']   = '*'
-      response['Access-Control-Allow-Headers']  = 'Authorization, Content-Length'
-      response['Access-Control-Expose-Headers'] = 'ETag'
+      response['Access-Control-Allow-Origin']   = @cors_allow_origin
+      response['Access-Control-Allow-Headers']  = @cors_post_put_allow_headers
+      response['Access-Control-Expose-Headers'] = @cors_expose_headers
 
       response.status = 200
     end
@@ -322,9 +329,9 @@ module FakeS3
       end
 
       response['Content-Type']                  = 'text/xml'
-      response['Access-Control-Allow-Origin']   = '*'
-      response['Access-Control-Allow-Headers']  = 'Authorization, Content-Length'
-      response['Access-Control-Expose-Headers'] = 'ETag'
+      response['Access-Control-Allow-Origin']   = @cors_allow_origin
+      response['Access-Control-Allow-Headers']  = @cors_post_put_allow_headers
+      response['Access-Control-Expose-Headers'] = @cors_expose_headers
     end
 
     def do_DELETE(request, response)
@@ -348,10 +355,10 @@ module FakeS3
 
     def do_OPTIONS(request, response)
       super
-      response['Access-Control-Allow-Origin']   = '*'
-      response['Access-Control-Allow-Methods']  = 'PUT, POST, HEAD, GET, OPTIONS'
-      response['Access-Control-Allow-Headers']  = 'Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token, Content-Disposition'
-      response['Access-Control-Expose-Headers'] = 'ETag'
+      response['Access-Control-Allow-Origin']   = @cors_allow_origin
+      response['Access-Control-Allow-Methods']  = @cors_allow_methods
+      response['Access-Control-Allow-Headers']  = @cors_preflight_allow_headers
+      response['Access-Control-Expose-Headers'] = @cors_expose_headers
     end
 
     private
@@ -371,9 +378,13 @@ module FakeS3
         end
 
         if elems.size == 0
-          s_req.type = Request::DELETE_OBJECTS
-          s_req.query = query
-          s_req.webrick_request = webrick_req
+          if s_req.is_path_style
+            s_req.type = Request::DELETE_OBJECTS
+            s_req.query = query
+            s_req.webrick_request = webrick_req
+          else
+            s_req.type = Request::DELETE_BUCKET
+          end
         elsif elems.size == 1
           s_req.type = webrick_req.query_string == 'delete' ? Request::DELETE_OBJECTS : Request::DELETE_BUCKET
           s_req.query = query
@@ -486,8 +497,9 @@ module FakeS3
       s_req.path = webrick_req.path
       s_req.is_path_style = true
 
-      if !@root_hostnames.include?(host) && !(IPAddr.new(host) rescue nil)
-        s_req.bucket = host.split(".")[0]
+      root_hostname = @root_hostnames.find { |hostname| host.end_with?(".#{hostname}") }
+      if root_hostname
+        s_req.bucket = host[0...-root_hostname.size - 1]
         s_req.is_path_style = false
       end
 
@@ -550,6 +562,7 @@ module FakeS3
       @hostname = hostname
       @ssl_cert_path = ssl_cert_path
       @ssl_key_path = ssl_key_path
+      @cors_options = extra_options[:cors_options] or {}
       webrick_config = {
         :BindAddress => @address,
         :Port => @port
@@ -575,7 +588,7 @@ module FakeS3
     end
 
     def serve
-      @server.mount "/", Servlet, @store, @hostname
+      @server.mount "/", Servlet, @store, @hostname, @cors_options
       shutdown = proc { @server.shutdown }
       trap "INT", &shutdown
       trap "TERM", &shutdown

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/aws_sdk_v2_commands_test.rb

@@ -17,7 +17,7 @@ class AwsSdkV2CommandsTest < Test::Unit::TestCase
     assert_not_nil bucket
 
     bucket_names = @resource.buckets.map(&:name)
-    assert(bucket_names.index("v2_create_bucket") >= 0)
+    assert_not_nil bucket_names.index("v2_create_bucket")
   end
 
   def test_destroy_bucket
@@ -37,6 +37,14 @@ class AwsSdkV2CommandsTest < Test::Unit::TestCase
     assert_equal 'test', object.get.body.string
   end
 
+  def test_bucket_with_dots
+    bucket = @resource.create_bucket(bucket: 'v2.bucket')
+    object = bucket.object('key')
+    object.put(body: 'test')
+
+    assert_equal 'test', object.get.body.string
+  end
+
   def test_delete_object
     object = @bucket.object('exists')
     object.put(body: 'test')

data/test/cli_test.rb

@@ -10,7 +10,7 @@ class CLITest < Test::Unit::TestCase
   end
 
   def test_quiet_mode
-    script = FakeS3::CLI.new([], :root => '.', :port => 4567, :quiet => true)
+    script = FakeS3::CLI.new([], :root => '.', :port => 4567, :license => 'test', :quiet => true)
     assert_output('') do
       script.invoke(:server)
     end

data/test/post_test.rb

@@ -29,6 +29,8 @@ class PostTest < Test::Unit::TestCase
     ) { |response|
       assert_equal(response.code, 303)
       assert_equal(response.headers[:location], 'http://somewhere.else.com/?foo=bar&bucket=posttest&key=uploads%2F12345%2Fpost_test.rb')
+      # Tests that CORS Headers can be set from command line
+      assert_equal(response.headers[:access_control_allow_headers], 'Authorization, Content-Length, Cache-Control')
     }
   end
 
@@ -40,6 +42,8 @@ class PostTest < Test::Unit::TestCase
       'file'=>File.new(__FILE__,"rb")
     ) { |response|
       assert_equal(response.code, 200)
+      # Tests that CORS Headers can be set from command line
+      assert_equal(response.headers[:access_control_allow_headers], 'Authorization, Content-Length, Cache-Control')
     }
   end
 
@@ -52,6 +56,8 @@ class PostTest < Test::Unit::TestCase
     ) { |response|
       assert_equal(response.code, 201)
       assert_match(%r{^\<\?xml.*uploads/12345/post_test\.rb}m, response.body)
+      # Tests that CORS Headers can be set from command line
+      assert_equal(response.headers[:access_control_allow_headers], 'Authorization, Content-Length, Cache-Control')
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fake S3 is a server that simulates Amazon S3 commands so you can test your