update gems

add `Qiniu.fetch` method

.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### V6.5.1
+
+- 为 Qiniu::Auth 添加验证七牛回调请求签名合法性的函数。[https://github.com/qiniu/ruby-sdk/pull/133](https://github.com/qiniu/ruby-sdk/pull/133)
+
 ### v6.5.0
 
 - 为 Qiniu::Auth 添加一个异常处理逻辑，在 Access Key 和 Secret Key 未正常设置（nil 值）的情况下给出正确提示。[https://github.com/qiniu/ruby-sdk/pull/126](https://github.com/qiniu/ruby-sdk/pull/126)

Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    qiniu (6.5.0)
+    qiniu (6.5.1)
       json (~> 1.8)
-      mime-types (~> 1.19)
+      mime-types (~> 2.4.3)
       rest-client (~> 1.7.3)
       ruby-hmac (~> 0.4)
 
@@ -12,9 +12,9 @@ GEM
   specs:
     diff-lcs (1.2.5)
     fakeweb (1.3.0)
-    json (1.8.2)
+    json (1.8.3)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
-    netrc (0.10.3)
+    netrc (0.11.0)
     rake (10.4.2)
     rest-client (1.7.3)
       mime-types (>= 1.16, < 3.0)
@@ -42,3 +42,6 @@ DEPENDENCIES
   qiniu!
   rake (>= 0.9)
   rspec (>= 2.11)
+
+BUNDLED WITH
+   1.11.2

lib/qiniu.rb

@@ -117,6 +117,11 @@ module Qiniu
         code == StatusOK
       end
 
+      def fetch(bucket, target_url, key)
+        code, data = Storage.fetch(bucket, target_url, key)
+        code == StatusOK
+      end
+
       def batch(command, bucket, keys)
         code, data = Storage.batch(command, bucket, keys)
         code == StatusOK ? data : false

lib/qiniu/auth.rb

@@ -206,11 +206,7 @@ module Qiniu
           return authorize_download_url(download_url, args)
         end # authorize_download_url_2
 
-        def generate_acctoken(url, body = '')
+        def generate_acctoken_sign_with_mac(access_key, secret_key, url, body)
-          ### 提取AK/SK信息
-          access_key = Config.settings[:access_key]
-          secret_key = Config.settings[:secret_key]
-
           ### 解析URL，生成待签名字符串
           uri = URI.parse(url)
           signing_str = uri.path
@@ -232,13 +228,12 @@ module Qiniu
 
           ### 生成数字签名
           sign = calculate_hmac_sha1_digest(secret_key, signing_str)
-          encoded_sign = Utils.urlsafe_base64_encode(sign)
+          return Utils.urlsafe_base64_encode(sign)
+        end # generate_acctoken_sign_with_mac
 
-          ### 生成管理授权凭证
+        def generate_acctoken(url, body = '')
-          acctoken = "#{access_key}:#{encoded_sign}"
+          encoded_sign = generate_acctoken_sign_with_mac(Config.settings[:access_key], Config.settings[:secret_key], url, body)
-
+          return "#{Config.settings[:access_key]}:#{encoded_sign}"
-          ### 返回管理授权凭证
-          return acctoken
         end # generate_acctoken
 
         def generate_uptoken(put_policy)
@@ -259,6 +254,31 @@ module Qiniu
           ### 返回上传授权凭证
           return uptoken
         end # generate_uptoken
+
+        def authenticate_callback_request(auth_str, url, body = '')
+          ### 提取AK/SK信息
+          access_key = Config.settings[:access_key]
+          secret_key = Config.settings[:secret_key]
+
+          ### 检查签名格式
+          ak_pos = auth_str.index(access_key)
+          if ak_pos.nil? then
+            return false
+          end
+
+          colon_pos = auth_str.index(':', ak_pos + 1)
+          if colon_pos.nil? || ((ak_pos + access_key.length) != colon_pos) then
+            return false
+          end
+
+          encoded_sign = generate_acctoken_sign_with_mac(access_key, secret_key, url, body)
+          sign_pos = auth_str.index(encoded_sign, colon_pos + 1)
+          if sign_pos.nil? || ((sign_pos + encoded_sign.length) != auth_str.length) then
+            return false
+          end
+
+          return true
+        end # authenticate_callback_request
       end # class << self
 
     end # module Auth

lib/qiniu/config.rb

@@ -20,6 +20,7 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
+          :fetch_host      => "http://iovip.qbox.me",
           :rsf_host        => "http://rsf.qbox.me",
           :up_host         => "http://up.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",

lib/qiniu/http.rb

@@ -65,7 +65,7 @@ module Qiniu
         end
 
         content_type = resp_headers["content-type"][0]
-        if !content_type.nil? && content_type == API_RESULT_MIMETYPE then
+        if !content_type.nil? && !content_type.downcase.index(API_RESULT_MIMETYPE).nil? then
           # 如果是JSON格式，则反序列化
           resp_body = Utils.safe_json_parse(resp_body)
         end
@@ -117,7 +117,7 @@ module Qiniu
         end
 
         content_type = resp_headers["content-type"][0]
-        if !content_type.nil? && content_type == API_RESULT_MIMETYPE then
+        if !content_type.nil? && !content_type.downcase.index(API_RESULT_MIMETYPE).nil? then
           # 如果是JSON格式，则反序列化
           resp_body = Utils.safe_json_parse(resp_body)
         end

lib/qiniu/management.rb

@@ -82,6 +82,11 @@ module Qiniu
           return HTTP.management_post(url)
         end # delete
 
+        def fetch(bucket, target_url, key)
+          url = Config.settings[:fetch_host] + '/fetch/' + Utils.urlsafe_base64_encode(target_url) + '/to/' + encode_entry_uri(bucket, key)
+          return HTTP.management_post(url)
+        end # fetch
+
         def batch(command, bucket, keys)
           execs = []
           keys.each do |key|

lib/qiniu/upload.rb

@@ -49,13 +49,22 @@ module Qiniu
                               key = nil,
                               x_vars = nil,
                               opts = {})
+
+        file = File.new(local_file, 'rb')
+        return upload_with_token_2_file_stream(uptoken, file, key, x_vars, opts)
+      end # upload_with_token_2
+
+      def upload_with_token_2_file_stream(uptoken,
+                                          file,
+                                          key = nil,
+                                          x_vars = nil,
+                                          opts = {})
         ### 构造URL
         url = Config.settings[:up_host]
         url[/\/*$/] = ''
         url += '/'
 
         ### 构造HTTP Body
-        file = File.new(local_file, 'rb')
         if not opts[:content_type].nil?
           file.define_singleton_method("content_type") do
             opts[:content_type]
@@ -63,8 +72,8 @@ module Qiniu
         end
 
         post_data = {
-          :file      => file,
+            :file      => file,
-          :multipart => true,
+            :multipart => true,
         }
         if not uptoken.nil?
           post_data[:token] = uptoken
@@ -78,7 +87,7 @@ module Qiniu
 
         ### 发送请求
         HTTP.api_post(url, post_data)
-      end # upload_with_token_2
+      end
 
       ### 授权举例
       # put_policy.bucket | put_policy.key | key     | 语义 | 授权

lib/qiniu/version.rb

@@ -4,7 +4,7 @@ module Qiniu
     module Version
       MAJOR = 6
       MINOR = 5
-      PATCH = 0
+      PATCH = 1
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

spec/qiniu/auth_spec.rb

@@ -3,6 +3,7 @@
 
 require 'spec_helper'
 require 'qiniu/auth'
+require 'qiniu/config'
 require 'qiniu/storage'
 require 'digest/sha1'
 
@@ -69,6 +70,25 @@ module Qiniu
         end
       end
     end
+
+    ### 测试回调签名
+    context ".authenticate_callback_request" do
+      it "should works" do
+        url = '/test.php'
+        body = 'name=xxx&size=1234'
+        false.should == Qiniu::Auth.authenticate_callback_request('ABCD', url, body)
+        false.should == Qiniu::Auth.authenticate_callback_request(Config.settings[:access_key], url, body)
+        false.should == Qiniu::Auth.authenticate_callback_request('QBox ' + Config.settings[:access_key] + ':', url, body)
+        false.should == Qiniu::Auth.authenticate_callback_request('QBox ' + Config.settings[:access_key] + ':????', url, body)
+
+        acctoken = Qiniu::Auth.generate_acctoken(url, body)
+        auth_str = 'QBox ' + acctoken
+
+        false.should == Qiniu::Auth.authenticate_callback_request(auth_str + '  ', url, body)
+        true.should == Qiniu::Auth.authenticate_callback_request(auth_str, url, body)
+        true.should == Qiniu::Auth.authenticate_callback_request(acctoken, url, body)
+      end
+    end
   end # module Auth
 
   module Exception_Auth

spec/qiniu/image_spec.rb

@@ -59,14 +59,18 @@ module Qiniu
         end
       end
 
-=begin
       context ".exif" do
         it "should works" do
-          code, data = Qiniu::Fop::Image.exif(@source_image_url)
+          result = Qiniu.get(@bucket, 'gogopher.jpg')
+          result["url"].should_not be_empty
+          puts result.inspect
+
+          code, data, headers = Qiniu::Fop::Image.exif(result["url"])
+          code.should == 200
           puts data.inspect
+          puts headers.inspect
         end
       end
-=end
 
       context ".mogrify_preview_url" do
         it "should works" do