Patch url token (#146)

* update select object

* Add Demo

* patch geturl with token

* fix Test

Co-authored-by: lewzylu <[email protected]>

Author: lewzylu

src/Qcloud/Cos/Client.php

@@ -67,7 +67,7 @@ public function __construct($cosConfig) {
             }));
         }
         $handler->push($this::handleErrors());
-        $this->signature = new Signature($this->cosConfig['secretId'], $this->cosConfig['secretKey']);
+        $this->signature = new Signature($this->cosConfig['secretId'], $this->cosConfig['secretKey'], $this->cosConfig['token']);
         $this->httpClient = new HttpClient([
             'base_uri' => $this->cosConfig['schema'].'://cos.' . $this->cosConfig['region'] . '.myqcloud.com/',
             'timeout' => $this->cosConfig['timeout'],

src/Qcloud/Cos/Signature.php

@@ -7,9 +7,10 @@
 class Signature {
     private $accessKey;           // string: access key.
     private $secretKey;           // string: secret key.
-    public function __construct($accessKey, $secretKey) {
+    public function __construct($accessKey, $secretKey, $token=null) {
         $this->accessKey = $accessKey;
         $this->secretKey = $secretKey;
+        $this->token = $token;
         date_default_timezone_set("PRC");
     }
     public function __destruct() {
@@ -34,7 +35,11 @@ public function createAuthorization(RequestInterface $request, $expires = "+30 m
     public function createPresignedUrl(RequestInterface $request, $expires = "+30 minutes") {
         $authorization = $this->createAuthorization($request, $expires);
         $uri = $request->getUri();
-        $uri = $uri->withQuery("sign=".urlencode($authorization));
+        $query = "sign=".urlencode($authorization);
+        if ($this->token != null) {
+            $query = $query."&x-cos-security-token=".$this->token;
+        }
+        $uri = $uri->withQuery($query);
         return $uri;
     }
 }

src/Qcloud/Cos/Tests/Test.php

@@ -1627,4 +1627,57 @@ public function testPutObjectAclByBodyToAnyone()
         }
     }
 
+    /*
+    * selectobject，select检索数据
+    * 200
+    */
+    public function testSelectObjectContent()
+    {
+        $key = '你好.txt';
+        try {
+            $body = "appid,bucket,region
+12500001,22weqwe,sh
+12500002,we2qwe,sh
+12500003,weq3we,sh
+12500004,weqw4e,sh
+3278522,azxc,gz
+4343,ewqew,tj";
+            $this->cosClient->putObject(array('Bucket' => $this->bucket,'Key' => $key, 'Body' => $body));
+            $result = $this->cosClient->selectObjectContent(array(
+                        'Bucket' => $this->bucket, //格式：BucketName-APPID
+                        'Key' => $key,
+                        'Expression' => 'Select * from COSObject s',
+                        'ExpressionType' => 'SQL',
+                        'InputSerialization' => array(
+                            'CompressionType' => 'None',
+                            'CSV' => array(
+                                'FileHeaderInfo' => 'USE',
+                                'RecordDelimiter' => '\n',
+                                'FieldDelimiter' => ',',
+                                'QuoteEscapeCharacter' => '"',
+                                'Comments' => '#',
+                                'AllowQuotedRecordDelimiter' => 'FALSE'
+                                )   
+                            ),  
+                        'OutputSerialization' => array(
+                            'CSV' => array(
+                                'QuoteField' => 'ASNEEDED',
+                                'RecordDelimiter' => '\n',
+                                'FieldDelimiter' => ',',
+                                'QuoteCharacter' => '"',
+                                'QuoteEscapeCharacter' => '"' 
+                                )   
+                            ),  
+                        'RequestProgress' => array(
+                                'Enabled' => 'FALSE'
+                                )   
+                            )); 
+            foreach ($result['Data'] as $data) {
+            }
+        } catch (\Exception $e) {
+            print ($e);
+            $this->assertFalse(TRUE);
+        }
+    }
+
 }