aliyun-sdk 0.4.1 → 0.7.2

data/spec/aliyun/oss/client/client_spec.rb

@@ -127,6 +127,31 @@ module Aliyun
           expect(WebMock).to have_requested(:get, "#{bucket}.#{ep1}/#{object}")
           expect(WebMock).to have_requested(:put, "#{bucket}.#{ep2}/#{object}")
         end
+
+        it "should fail with invalid bucket name" do
+          bucket = 'INVALID'
+          ep1 = 'oss-cn-hangzhou.aliyuncs.com'
+          client = Client.new(
+            :endpoint => ep1,
+            :access_key_id => 'xxx', :access_key_secret => 'yyy')
+
+          expect {
+            client.create_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.delete_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.bucket_exists?(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.get_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+        end
+
       end # construct
 
       def mock_buckets(buckets, more = {})
@@ -247,7 +272,7 @@ module Aliyun
         end
 
         it "should test bucket existence" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
           stub_request(:get, bucket_url)
             .with(:query => query)

data/spec/aliyun/oss/http_spec.rb

@@ -76,6 +76,32 @@ module Aliyun
           r = s.read(1000)
           expect(r.size).to eq(64)
         end
+
+        it "should read with a correct crc" do
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          s = HTTP::StreamWriter.new(true) do |sr|
+            sr << content
+          end
+
+          r = s.read(content.size + 1)
+          expect(r.size).to eq(content.size)
+          expect(s.data_crc).to eq(content_crc)
+        end
+
+        it "should read with a correct crc when setting init_crc" do
+          content = "hello world"
+          init_crc = 100
+          content_crc = Aliyun::OSS::Util.crc(content, init_crc)
+
+          s = HTTP::StreamWriter.new(true, init_crc) do |sr|
+            sr << content
+          end
+
+          r = s.read(content.size + 1)
+          expect(r.size).to eq(content.size)
+          expect(s.data_crc).to eq(content_crc)
+        end
       end # StreamWriter
 
     end # HTTP

data/spec/aliyun/oss/multipart_spec.rb

@@ -23,6 +23,15 @@ module Aliyun
         "#{@bucket}.#{@endpoint}/#{@object}"
       end
 
+      def crc_protocol
+        Protocol.new(
+          Config.new(:endpoint => @endpoint,
+                     :access_key_id => 'xxx',
+                     :access_key_secret => 'yyy',
+                     :upload_crc_enable => true,
+                     :download_crc_enable => true))
+      end
+
       def mock_txn_id(txn_id)
         Nokogiri::XML::Builder.new do |xml|
           xml.InitiateMultipartUploadResult {
@@ -102,7 +111,7 @@ module Aliyun
       context "Initiate multipart upload" do
 
         it "should POST to create transaction" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
           stub_request(:post, request_path).with(:query => query)
 
           @protocol.initiate_multipart_upload(
@@ -120,7 +129,7 @@ module Aliyun
         end
 
         it "should return transaction id" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
           return_txn_id = 'zyx'
           stub_request(:post, request_path).
             with(:query => query).
@@ -134,7 +143,7 @@ module Aliyun
         end
 
         it "should raise Exception on error" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           code = 'InvalidArgument'
           message = 'Invalid argument.'
@@ -207,6 +216,42 @@ module Aliyun
             .with(:body => nil, :query => query)
         end
 
+        it "should raise crc exception on error" do
+          txn_id = 'xxxyyyzzz'
+          part_no = 1
+          query = {'partNumber' => part_no, 'uploadId' => txn_id}
+
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+
+          stub_request(:put, request_path).with(:query => query).to_return(
+            :status => 200, :headers => {:x_oss_hash_crc64ecma => content_crc + 1})
+
+          expect {
+            crc_protocol.upload_part(@bucket, @object, txn_id, part_no) do |body|
+              body << content
+            end
+          }.to raise_error(CrcInconsistentError, "The crc of put between client and oss is not inconsistent.")
+        end
+
+        it "should not raise crc exception on error" do
+          txn_id = 'xxxyyyzzz'
+          part_no = 1
+          query = {'partNumber' => part_no, 'uploadId' => txn_id}
+
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+
+          stub_request(:put, request_path).with(:query => query).to_return(
+            :status => 200, :headers => {:x_oss_hash_crc64ecma => content_crc})
+
+          expect {
+            crc_protocol.upload_part(@bucket, @object, txn_id, part_no) do |body|
+              body << content
+            end
+          }.not_to raise_error
+        end
+
       end # upload part
 
       context "Upload part by copy object" do
@@ -417,7 +462,7 @@ module Aliyun
 
         it "should GET to list multiparts" do
           request_path = "#{@bucket}.#{@endpoint}/"
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           stub_request(:get, request_path).with(:query => query)
 
@@ -430,7 +475,7 @@ module Aliyun
         it "should send extra params when list multiparts" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -456,7 +501,7 @@ module Aliyun
         it "should get multipart transactions" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -503,7 +548,7 @@ module Aliyun
         it "should decode object key" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -569,7 +614,7 @@ module Aliyun
 
         it "should raise Exception on error" do
           request_path = "#{@bucket}.#{@endpoint}/"
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           code = 'InvalidArgument'
           message = 'Invalid argument.'

data/spec/aliyun/oss/object_spec.rb

@@ -17,6 +17,15 @@ module Aliyun
         @bucket = 'rubysdk-bucket'
       end
 
+      def crc_protocol
+        Protocol.new(
+          Config.new(:endpoint => @endpoint,
+                     :access_key_id => 'xxx',
+                     :access_key_secret => 'yyy',
+                     :upload_crc_enable => true,
+                     :download_crc_enable => true))
+      end
+
       def get_request_path(object = nil)
         p = "#{@bucket}.#{@endpoint}/"
         p += CGI.escape(object) if object
@@ -190,6 +199,35 @@ module Aliyun
                     'x-oss-meta-people' => 'mary'})
         end
 
+        it "should raise crc exception on error" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          stub_request(:put, url).to_return(
+            :status => 200, :headers => {:x_oss_hash_crc64ecma => content_crc.to_i + 1})
+          expect(crc_protocol.upload_crc_enable).to eq(true)
+          expect {
+            crc_protocol.put_object(@bucket, object_name) do |c|
+              c << content
+            end
+          }.to raise_error(CrcInconsistentError, "The crc of put between client and oss is not inconsistent.")
+        end
+
+        it "should not raise crc exception on error" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          stub_request(:put, url).to_return(
+            :status => 200, :headers => {:x_oss_hash_crc64ecma => content_crc})
+          expect(crc_protocol.upload_crc_enable).to eq(true)
+          expect {
+            crc_protocol.put_object(@bucket, object_name) do |c|
+              c << content
+            end
+          }.not_to raise_error
+        end
       end # put object
 
       context "Append object" do
@@ -198,7 +236,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           return_headers = {'x-oss-next-append-position' => '101'}
           stub_request(:post, url).with(:query => query)
             .to_return(:headers => return_headers)
@@ -217,7 +255,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           code = 'ObjectNotAppendable'
           message = 'Normal object cannot be appended.'
           stub_request(:post, url).with(:query => query).
@@ -237,7 +275,7 @@ module Aliyun
         it "should use default content-type" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -254,7 +292,7 @@ module Aliyun
         it "should use customized content-type" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -273,7 +311,7 @@ module Aliyun
         it "should set user defined metas" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -290,6 +328,72 @@ module Aliyun
                                  'x-oss-meta-year' => '2015',
                                  'x-oss-meta-people' => 'mary'})
         end
+
+        it "should raise crc exception on error" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+
+          query = {'append' => nil, 'position' => 11}
+          return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc.to_i + 1}
+          stub_request(:post, url).with(:query => query)
+            .to_return(:headers => return_headers)
+          expect(crc_protocol.upload_crc_enable).to eq(true)
+          expect {
+            crc_protocol.append_object(@bucket, object_name, 11, :init_crc => 0) do |c|
+              c << content
+            end
+          }.to raise_error(CrcInconsistentError, "The crc of append between client and oss is not inconsistent.")
+        end
+
+        it "should not raise crc exception with init_crc" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+
+          query = {'append' => nil, 'position' => 11}
+          return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc}
+          stub_request(:post, url).with(:query => query)
+            .to_return(:headers => return_headers)
+
+          expect(crc_protocol.upload_crc_enable).to eq(true)
+          next_pos = 0
+          expect {
+            next_pos = crc_protocol.append_object(@bucket, object_name, 11, :init_crc => 0) do |c|
+              c << content
+            end
+          }.not_to raise_error
+
+          expect(WebMock).to have_requested(:post, url)
+            .with(:body => content, :query => query)
+          expect(next_pos).to eq(101)
+        end
+
+        it "should not raise crc exception without init_crc" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+
+          query = {'append' => nil, 'position' => 11}
+          return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc + 1}
+          stub_request(:post, url).with(:query => query)
+            .to_return(:headers => return_headers)
+
+          expect(crc_protocol.upload_crc_enable).to eq(true)
+          next_pos = 0
+          expect {
+            next_pos = crc_protocol.append_object(@bucket, object_name, 11) do |c|
+              c << content
+            end
+          }.not_to raise_error
+
+          expect(WebMock).to have_requested(:post, url)
+            .with(:body => content, :query => query)
+          expect(next_pos).to eq(101)
+        end
       end # append object
 
       context "Copy object" do
@@ -507,6 +611,15 @@ module Aliyun
                   })
         end
 
+        it "should raise Exception on error when setting invalid range" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          stub_request(:get, url)
+          expect {
+            @protocol.get_object(@bucket, object_name, {:range => [0, 10, 5]}) {}
+          }.to raise_error(ClientError)
+        end
+
         it "should match modify time and etag" do
           object_name = 'ruby'
           url = get_request_path(object_name)
@@ -557,6 +670,88 @@ module Aliyun
           expect(WebMock).to have_requested(:get, url)
             .with(:body => nil, :query => query)
         end
+
+        it "should get object with headers" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          headers = {
+            'Range' => 'bytes=0-9'
+          }
+          stub_request(:get, url)
+
+          @protocol.get_object(@bucket, object_name, {:headers => headers}) {}
+
+          expect(WebMock).to have_requested(:get, url)
+            .with(:body => nil, :query => {},
+                  :headers => {
+                    'Range' => 'bytes=0-9'
+                  })
+        end
+
+        it "should raise crc exception on error" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          stub_request(:get, url).to_return(
+            :status => 200, :body => content, :headers => {:x_oss_hash_crc64ecma => content_crc.to_i + 1})
+          response_content = ""
+          expect(crc_protocol.download_crc_enable).to eq(true)
+          expect {
+            crc_protocol.get_object(@bucket, object_name) {|c| response_content << c}
+          }.to raise_error(CrcInconsistentError, "The crc of get between client and oss is not inconsistent.")
+        end
+
+        it "should not raise crc exception on error" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          stub_request(:get, url).to_return(
+            :status => 200, :body => content, :headers => {:x_oss_hash_crc64ecma => content_crc})
+          response_content = ""
+          expect(crc_protocol.download_crc_enable).to eq(true)
+          expect {
+            crc_protocol.get_object(@bucket, object_name) {|c| response_content << c}
+          }.not_to raise_error
+          expect(response_content).to eq(content)
+        end
+
+        it "should not raise crc exception on error when setting range" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          content = "hello world 0123456789"
+          content_crc = Aliyun::OSS::Util.crc(content)
+          stub_request(:get, url).to_return(
+            :status => 200, :body => content, :headers => {:x_oss_hash_crc64ecma => content_crc.to_i + 1})
+          response_content = ""
+          expect(crc_protocol.download_crc_enable).to eq(true)
+          expect {
+            crc_protocol.get_object(@bucket, object_name, {range: [0, 10]}) {|c| response_content << c}
+          }.not_to raise_error
+          expect(WebMock).to have_requested(:get, url)
+            .with(:body => nil, :query => {},
+                  :headers => {
+                    'Range' => 'bytes=0-9'
+                  })
+        end
+
+        it "should get to get object with special chars" do
+          object_name = 'ruby///adfadfa//!@#%^*//?key=value&aabc#abc=ad'
+          url = get_request_path(object_name)
+
+          return_content = "hello world"
+          stub_request(:get, url).to_return(:body => return_content)
+
+          content = ""
+          @protocol.get_object(@bucket, object_name) {|c| content << c}
+
+          expect(WebMock).to have_requested(:get, url)
+            .with(:body => nil, :query => {})
+
+          expect(content).to eq(return_content)
+        end
+
       end # Get object
 
       context "Get object meta" do
@@ -651,7 +846,7 @@ module Aliyun
 
         it "should batch delete objects" do
           url = get_request_path
-          query = {'delete' => '', 'encoding-type' => KeyEncoding::URL}
+          query = {'delete' => nil}
 
           object_names = (1..5).map do |i|
             "object-#{i}"
@@ -661,7 +856,7 @@ module Aliyun
             .with(:query => query)
             .to_return(:body => mock_delete_result(object_names))
 
-          opts = {:quiet => false, :encoding => KeyEncoding::URL}
+          opts = {:quiet => false}
           deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
 
           expect(WebMock).to have_requested(:post, url)
@@ -671,7 +866,7 @@ module Aliyun
 
         it "should decode object key in batch delete response" do
           url = get_request_path
-          query = {'delete' => '', 'encoding-type' => KeyEncoding::URL}
+          query = {'delete' => nil, 'encoding-type' => KeyEncoding::URL}
 
           object_names = (1..5).map do |i|
             "对象-#{i}"
@@ -691,6 +886,57 @@ module Aliyun
             .with(:query => query, :body => mock_delete(object_names, opts))
           expect(deleted).to match_array(object_names)
         end
+
+        it "should batch delete objects in quiet mode" do
+          url = get_request_path
+          query = {'delete' => nil}
+
+          object_names = (1..5).map do |i|
+            "object-#{i}"
+          end
+
+          stub_request(:post, url)
+            .with(:query => query)
+            .to_return(:body => "")
+
+          opts = {:quiet => true}
+          deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
+
+          expect(WebMock).to have_requested(:post, url)
+            .with(:query => query, :body => mock_delete(object_names, opts))
+          expect(deleted).to match_array([])
+        end
+
+        it "should rasie Exception wiht invalid responsed body" do
+          url = get_request_path
+          query = {'delete' => nil}
+          body = '<DeleteResult>
+                    <EncodingType>invaid<EncodingType>
+                    <Deleted>
+                      <Key>multipart.data</Key>
+                    </Deleted>
+                    <Deleted>
+                      <Key>test.jpg</Key>
+                    </Deleted>
+                    <Deleted>
+                      <Key>demo.jpg</Key>
+                    </Deleted>
+                  </DeleteResult>'
+
+          object_names = (1..5).map do |i|
+            "object-#{i}"
+          end
+
+          stub_request(:post, url)
+            .with(:query => query)
+            .to_return(:body => body)
+
+          opts = {:quiet => false}
+          expect {
+            deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
+          }.to raise_error(ClientError)
+
+        end
       end # delete object
 
       context "acl" do
@@ -698,7 +944,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           stub_request(:put, url).with(:query => query)
 
           @protocol.put_object_acl(@bucket, object_name, ACL::PUBLIC_READ)
@@ -713,7 +959,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
 
           stub_request(:get, url)