Merge pull request #99 from lintianzhi/feature/is_qiniu_callback

isQiniuCallback

Author: longbai

docs/README.gist.md

@@ -351,6 +351,15 @@ PutExtra是上传时的可选信息，默认为null
 @gist(gist/fop.js#makeImageViewUrl)
 ```
 
+### 实用函数
+
+#### 测试是否来自七牛的callback
+在上传的`putPolicy`中指定`callbackUrl`和`callbackBody`，在上传成功后七牛会有一个回调函数，这个函数用来检测回调是否来自七牛。  
+
+```{javascript}
+@gist(../test/rs.test.js#isQiniuCallback)
+```
+
 ## 贡献代码
 
 + Fork

docs/README.md

@@ -174,7 +174,8 @@ function uptoken(bucketname) {
   //putPolicy.callbackBody = callbackBody;
   //putPolicy.returnUrl = returnUrl;
   //putPolicy.returnBody = returnBody;
-  //putPolicy.asyncOps = asyncOps;
+  //putpolicy.persistentOps = persistentops;
+  //putPolicy.persistentNotifyUrl = persistentNotifyUrl;
   //putPolicy.expires = expires;
 
   return putPolicy.token();
@@ -584,6 +585,22 @@ url = policy.makeRequest(url);
 console.log('在浏览器输入: ' + url);
 ```
 
+### 实用函数
+
+#### 测试是否来自七牛的callback
+在上传的`putPolicy`中指定`callbackUrl`和`callbackBody`，在上传成功后七牛会有一个回调函数，这个函数用来检测回调是否来自七牛。  
+
+```{javascript}
+// ------ auth应该是来自请求的header的'Authrization'字段，path是请求的路径，content是请求的内容
+        var auth = 'QBox nnwjTeUgpQdfZp9cb4-iHK0EUlebKCNk4kXwoStq:kyFuG6yYh6FlX1fZO0alTgJK2Jw=';
+        var path = '/callback';
+        var content = 'key=43850.6579994258936495&hash=FllOJrhvzorEKnyMwE-o7pfciiha';
+// ------
+
+        var ok = qiniu.util.isQiniuCallback(path, content, auth);
+        ok.should.be.ok;
+```
+
 ## 贡献代码
 
 + Fork

index.js

@@ -7,4 +7,6 @@ module.exports = {
   rsf: require(libpath + '/rsf.js'),
   fop: require(libpath + '/fop.js'),
   conf: require(libpath + '/conf.js'),
+  rpc: require(libpath + '/rpc.js'),
+  util: require(libpath + '/util.js'),
 };

qiniu/util.js

@@ -4,6 +4,8 @@ var path = require('path');
 var crypto = require('crypto');
 var conf = require('./conf');
 
+exports.isQiniuCallback = isQiniuCallback;
+
 // ------------------------------------------------------------------------------------------
 // func encode
 
@@ -41,3 +43,9 @@ exports.generateAccessToken = function(uri, body) {
   var safeDigest = exports.base64ToUrlSafe(digest);
   return 'QBox ' + conf.ACCESS_KEY + ':' + safeDigest;
 }
+
+function isQiniuCallback(path, body, callbackAuth) {
+
+  var auth = exports.generateAccessToken(path, body)
+  return auth === callbackAuth;
+}

test/rs.test.js

@@ -164,6 +164,25 @@ describe('test start step2:', function() {
       });
     });
 
+    describe('rs.isQiniuCallBack', function() {
+
+      it('test isQiniuCallback true', function(done) {
+// @gist isQiniuCallback
+// ------ auth应该是来自请求的header的'Authrization'字段，path是请求的路径，content是请求的内容
+        var auth = 'QBox nnwjTeUgpQdfZp9cb4-iHK0EUlebKCNk4kXwoStq:kyFuG6yYh6FlX1fZO0alTgJK2Jw=';
+        var path = '/callback';
+        var content = 'key=43850.6579994258936495&hash=FllOJrhvzorEKnyMwE-o7pfciiha';
+// ------
+
+        var ok = qiniu.util.isQiniuCallback(path, content, auth);
+        ok.should.be.ok;
+// @endgist
+        done();
+      });
+
+
+    });
+
     // rs.GetPolicy#makeRequest()
 
   });