feat 云处理、Rest API 使用新的签名方式

Author: sabakugaara

src/Upyun/Api/Pretreat.php

@@ -31,10 +31,12 @@ public function process($source, $tasks) {
             'accept' => 'json'
         );
 
-        $url = $this->url . '/pretreatment';
-        $signature = Signature::getSignature($this->config, $params, Signature::SIGN_VIDEO);
-        $response = $client->request('POST', $url, [
-            'headers' => array('Authorization' => "UPYUN {$this->config->operatorName}:$signature"),
+        $path = '/pretreatment/';
+        $method = 'POST';
+        $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
+
+        $response = $client->request($method, $this->url . $path, [
+            'headers' => $signedHeaders,
             'form_params' => $params
         ]);
 
@@ -49,15 +51,16 @@ public function query($taskIds, $path) {
         ]);
 
         $params = array(
-            'bucket_name' => $this->config->bucketName,
+            'service' => $this->config->bucketName,
             'task_ids' => implode(',', $taskIds)
         );
+        $path = $path . '?' . http_build_query($params);
 
+        $method = 'GET';
         $url = $this->url . $path;
-        $signature = Signature::getSignature($this->config, $params, Signature::SIGN_VIDEO);
-        $response = $client->request('GET', $url, [
-            'headers' => array('Authorization' => "UPYUN {$this->config->operatorName}:$signature"),
-            'query' => $params
+        $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
+        $response = $client->request($method, $url, [
+            'headers' => $signedHeaders
         ]);
 
         if ($response->getStatusCode() === 200) {
@@ -69,4 +72,4 @@ public function query($taskIds, $path) {
         }
         return false;
     }
-}
+}

src/Upyun/Api/Rest.php

@@ -28,7 +28,7 @@ public function __construct(Config $config) {
         $this->config   = $config;
         $this->endpoint = Config::$restApiEndPoint . '/' . $config->bucketName;
     }
-    
+
     public function request($method, $storagePath) {
         $this->method = strtoupper($method);
         $this->storagePath = '/' . ltrim($storagePath, '/');
@@ -57,14 +57,14 @@ public function send() {
         ]);
 
         $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint . $this->storagePath;
-        $bodySize = 0;
         $body = null;
         if($this->file && $this->method === 'PUT') {
-            $bodySize = $this->file->getSize();
             $body = $this->file;
         }
-        
-        $authHeader = Signature::getRestApiSignHeader($this->config, $this->method, $this->storagePath, $bodySize);
+        // TODO urlencode path
+        $path = '/' . $this->config->bucketName . '/' . ltrim($this->storagePath, '/');
+
+        $authHeader = Signature::getHeaderSign($this->config, $this->method, $path);
         $response = $client->request($this->method, $url, [
             'headers' => array_merge($authHeader, $this->headers),
             'body' => $body

src/Upyun/Signature.php

@@ -21,25 +21,34 @@ class Signature {
     const SIGN_VIDEO_NO_OPERATOR   = 3;
 
     /**
-     * 获取 RESET API 请求需要的签名头
+     * 获取 Header 签名
      *
      * @param Config $bucketConfig
      * @param $method
-     * @param $path
-     * @param $contentLength
+     * @param $path  请求路径
+     * @param $contentMd5 文件内容 md5
      *
      * @return array
      */
-    public static function getRestApiSignHeader($bucketConfig, $method, $remotePath, $contentLength) {
+    public static function getHeaderSign($bucketConfig, $method, $path, $contentMd5 = NULL) {
         $gmtDate = gmdate('D, d M Y H:i:s \G\M\T');
-        $path = '/' . $bucketConfig->bucketName . '/' . ltrim($remotePath, '/');
 
-        $sign = md5("$method&$path&$gmtDate&$contentLength&{$bucketConfig->operatorPassword}");
+        $signParams = array(
+            $method,
+            $path,
+            $gmtDate
+        );
+
+        if ($contentMd5) {
+            $signParams[] = $contentMd5;
+        }
+
+        $sign = self::calcSignature($bucketConfig, $signParams);
 
         $headers = array(
-            'Authorization' => "UpYun {$bucketConfig->operatorName}:$sign",
+            'Authorization' => "UPYUN {$bucketConfig->operatorName}:$sign",
             'Date' => $gmtDate,
-            'User-agent' => 'Php-Sdk/' . $bucketConfig->getVersion() . ' (rest api)'
+            'User-agent' => 'Php-Sdk/' . $bucketConfig->getVersion()
         );
         return $headers;
     }
@@ -62,6 +71,13 @@ public static function getPurgeSignHeader(Config $bucketConfig, $urlString) {
         );
     }
 
+    /**
+     * 获取表单 API 需要的签名，依据 body 签名规则计算
+     * @param Config $bucketConfig
+     * @param $data
+     *
+     * @return array
+     */
     public static function getFormSignature(Config $bucketConfig, $data) {
         $data['bucket'] = $bucketConfig->bucketName;
         $policy = Util::base64Json($data);
@@ -78,13 +94,17 @@ public static function getFormSignature(Config $bucketConfig, $data) {
             $signParams['md5'] = $data['content-md5'];
         };
 
-        $signature = base64_encode(hash_hmac('sha1', implode('&', $signParams), $bucketConfig->operatorPassword, true));
+        $signature = self::calcSignature($bucketConfig, $signParams);
         return array(
             'policy' => $policy,
             'signature' => $signature
         );
     }
 
+    private static function calcSignature( Config $bucketConfig, $signParams) {
+        return base64_encode(hash_hmac('sha1', implode('&', $signParams), $bucketConfig->operatorPassword, true));
+    }
+
     public static function getSignature( Config $bucketConfig, $data, $type, $tokenSecret = '') {
         if (is_array($data)) {
             ksort($data);

src/Upyun/Upyun.php

@@ -320,7 +320,7 @@ public function process($source, $tasks) {
      */
     public function queryProcessStatus($taskIds) {
         $video = new Api\Pretreat($this->config);
-        return $video->query($taskIds, '/status');
+        return $video->query($taskIds, '/status/');
     }
 
     /**
@@ -346,6 +346,6 @@ public function queryProcessStatus($taskIds) {
      */
     public function queryProcessResult($taskIds) {
         $video = new Api\Pretreat($this->config);
-        return $video->query($taskIds, '/result');
+        return $video->query($taskIds, '/result/');
     }
 }