diff --git a/.travis.yml b/.travis.yml index c5845f1f..b32c5893 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,3 @@ before_script: - export QINIU_KEY_NAME="file_name" script: - cd tests; phpunit . - diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ff898f..b4c7ff01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## CHANGE LOG +### v6.1.8 + +2014-4-6 issues [#68](https://github.com/qiniu/php-sdk/pull/68) + +- [#66]上传策略[支持mimeLimit字段](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-mime-limit),用于限定上传文件的mimeType。 +- [#67] 新增接口的调用范例 + ### v6.1.7 2014-2-19 issues [#64](https://github.com/qiniu/php-sdk/pull/64) diff --git a/README.md b/README.md index 53c7cd14..0c7ecb1c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://api.travis-ci.org/qiniu/php-sdk.png?branch=master)](https://travis-ci.org/qiniu/php-sdk) -[![Qiniu Logo](http://qiniutek.com/images/logo-2.png)](http://qiniu.com/) +[![Qiniu Logo](http://qiniu-brand.qiniudn.com/5/logo-white-195x105.png)](http://www.qiniu.com/) ## 下载 @@ -34,7 +34,7 @@ ## 许可证 -Copyright (c) 2012 qiniu.com +Copyright (c) 2012-2014 qiniu.com 基于 MIT 协议发布: diff --git a/docs/README.md b/docs/README.md index 2e1cf38a..ae560b9d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -253,6 +253,13 @@ SDK源码地址: public $Expires; // 可选。默认是 3600 秒 public $PersistentOps; // 可选。 public $PersistentNotifyUrl; // 如果设置了PersistentOps,必须同时设置此项。 + public $InsertOnly; // 可选。如果设置为非0值,则无论scope设置为何种形式,都只能以`新增`方式上传,不能覆盖。 + public $DetectMime; // 可选。如果设为非0值,则忽略上传端传递的文件MimeType信息,使用七牛服务器侦测内容后的判断结果。 + public $FsizeLimit; // 可选。int类型,超过限制大小的上传内容会被判为上传失败,返回413状态码。 + public $SaveKey; // 可选。自定义资源名格式。 + public $Transform; // 可选。指定资源经过怎样的处理后再保存。 + public $FopTimeout; // 可选。int类型,指定transform的超时时间,如果文件处理超过此值,则认为上传失败。 + public $MimeLimit; // 可选。限定上传的文件类型。 } * `scope` 限定客户端的权限。如果 `scope` 是 bucket,则客户端只能新增文件到指定的 bucket,不能修改文件。如果 `scope` 为 bucket:key,则客户端可以修改指定的文件。**注意: key必须采用utf8编码,如使用非utf8编码访问七牛云存储将反馈错误** diff --git a/docs/gist/fetch.php b/docs/gist/fetch.php new file mode 100644 index 00000000..3514eca3 --- /dev/null +++ b/docs/gist/fetch.php @@ -0,0 +1,32 @@ + ($token, $error) } return $this->Sign($data); } + + public function VerifyCallback($auth, $url, $body) // ==> bool + { + $url = parse_url($url); + $data = ''; + if (isset($url['path'])) { + $data = $url['path']; + } + if (isset($url['query'])) { + $data .= '?' . $url['query']; + } + $data .= "\n"; + + $data .= $body; + $token = 'QBox ' . $this->Sign($data); + return $auth === $token; + } } function Qiniu_SetKeys($accessKey, $secretKey) diff --git a/qiniu/rs.php b/qiniu/rs.php index 9d3726ec..1166b5d8 100644 --- a/qiniu/rs.php +++ b/qiniu/rs.php @@ -57,6 +57,7 @@ class Qiniu_RS_PutPolicy public $PersistentNotifyUrl; public $Transform; public $FopTimeout; + public $MimeLimit; public function __construct($scope) { @@ -114,6 +115,10 @@ public function Token($mac) // => $token if (!empty($this->FopTimeout)) { $policy['fopTimeout'] = $this->FopTimeout; } + if (!empty($this->MimeLimit)) { + $policy['mimeLimit'] = $this->MimeLimit; + } + $b = json_encode($policy); return Qiniu_SignWithData($mac, $b); diff --git a/tests/AuthDigestTest.php b/tests/AuthDigestTest.php index 07cc7a80..e8486f7b 100644 --- a/tests/AuthDigestTest.php +++ b/tests/AuthDigestTest.php @@ -4,6 +4,7 @@ class AuthDigestTest extends PHPUnit_Framework_TestCase { + public function testEncode() { $cases = array( @@ -16,6 +17,17 @@ public function testEncode() } } + public function testVerifyCallback() + { + initKeys(); + $mac1 = Qiniu_RequireMac(null); + $auth = 'QBox Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ:JrRyg9So6DNrNDY5qj1sygt0SmQ='; + $url = 'http://rs.qbox.me/batch'; + $body = 'op=/delete/cGhwc2RrOnRlc3RPcDI=&op=/delete/cGhwc2RrOnRlc3RPcDM=&op=/delete/cGhwc2RrOnRlc3RPcDQ='; + $pass = $mac1->VerifyCallback($auth, $url, $body); + $this->assertTrue($pass); + } + /* public function testSetKeys() { $mac1 = Qiniu_RequireMac(null); diff --git a/tests/IoTest.php b/tests/IoTest.php index f8510c60..305bbf2c 100644 --- a/tests/IoTest.php +++ b/tests/IoTest.php @@ -169,5 +169,19 @@ public function testPut_transform() { $this->assertEquals($ret["mimeType"], "image/png"); var_dump($ret); } + public function testPut_mimeLimit() { + $key = 'testPut_mimeLimit' . getTid(); + $scope = $this->bucket . ':' . $key; + $err = Qiniu_RS_Delete($this->client, $this->bucket, $key); + + $putPolicy = new Qiniu_RS_PutPolicy($scope); + $putPolicy->MimeLimit = "image/*"; + $upToken = $putPolicy->Token(null); + + list($ret, $err) = Qiniu_PutFile($upToken, $key, __file__, null); + $this->assertNull($ret); + $this->assertEquals($err->Err, "limited mimeType: this file type is forbidden to upload"); + var_dump($err); + } }