Merge pull request #21 from upyun/feature/new-signature

feat use new form api signature

Author: sabakugaara

src/Upyun/Api/Form.php

@@ -30,8 +30,8 @@ public function upload($path, $stream, $params) {
                     'contents' => $policy,
                 ),
                 array(
-                    'name' => 'signature',
-                    'contents' => $signature,
+                    'name' => 'authorization',
+                    'contents' => 'UPYUN ' . $this->config->operatorName . ':' . $signature,
                 ),
                 array(
                     'name' => 'file',

src/Upyun/Signature.php

@@ -65,7 +65,20 @@ public static function getPurgeSignHeader(Config $bucketConfig, $urlString) {
     public static function getFormSignature(Config $bucketConfig, $data) {
         $data['bucket'] = $bucketConfig->bucketName;
         $policy = Util::base64Json($data);
-        $signature = md5($policy . '&' . $bucketConfig->getFormApiKey());
+        $signParams = array(
+            'method' => 'POST',
+            'uri' => '/' . $bucketConfig->bucketName,
+        );
+        if (isset($data['date'])) {
+            $signParams['date'] = $data['date'];
+        }
+
+        $signParams['policy'] = $policy;
+        if (isset($data['content-md5'])) {
+            $signParams['md5'] = $data['content-md5'];
+        };
+
+        $signature = base64_encode(hash_hmac('sha1', implode('&', $signParams), $bucketConfig->operatorPassword, true));
         return array(
             'policy' => $policy,
             'signature' => $signature

src/Upyun/Util.php

@@ -20,7 +20,7 @@ public static function getHeaderParams($headers) {
         }
         return $params;
     }
-    
+
     public static function parseDir($body) {
         $files = array();
         if(!$body) {
@@ -38,7 +38,7 @@ public static function parseDir($body) {
     }
 
     public static function base64Json($params) {
-        return base64_encode(json_encode($params));
+        return base64_encode(json_encode($params, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
     }
 
     public static function stringifyHeaders($headers) {
@@ -48,7 +48,7 @@ public static function stringifyHeaders($headers) {
         }
         return $return;
     }
-    
+
     public static function md5Hash($resource) {
         rewind($resource);
         $ctx = hash_init('md5');

tests/SignatureTest.php

@@ -18,4 +18,16 @@ public function testGetSignature() {
         $sign = Signature::getSignature($this->config, array('a' => 'a', 'b' => 'b'), Signature::SIGN_MULTIPART, '123');
         $this->assertEquals($sign , '2aa0afd612df8fab4b3fded36c396234');
     }
-}
+
+    public function testGetFormSignature() {
+        $config = new Config('upyun-temp', 'upyun', 'upyun520');
+        $sign = Signature::getFormSignature($config, array(
+            'save-key' => '/demo.jpg',
+            'expiration' => '1478674618',
+            'date' => 'Wed, 9 Nov 2016 14:26:58 GMT',
+            'content-md5' => '7ac66c0f148de9519b8bd264312c4d64'
+        ));
+        $this->assertEquals($sign['policy'], 'eyJzYXZlLWtleSI6Ii9kZW1vLmpwZyIsImV4cGlyYXRpb24iOiIxNDc4Njc0NjE4IiwiZGF0ZSI6IldlZCwgOSBOb3YgMjAxNiAxNDoyNjo1OCBHTVQiLCJjb250ZW50LW1kNSI6IjdhYzY2YzBmMTQ4ZGU5NTE5YjhiZDI2NDMxMmM0ZDY0IiwiYnVja2V0IjoidXB5dW4tdGVtcCJ9');
+        $this->assertEquals($sign['signature'], 'aWqUna7XpJ3mJ6Clz6AMeay++Qk=');
+    }
+}