Pre-release 2.4.3 (#248)

* prerelease 2.4.1

Author: tuuna

CHANGELOG.md

@@ -1,5 +1,12 @@
 cos-php-sdk-v5 Upgrade Guide
 ====================
+2.4.2 to 2.4.3
+---------
+- 优化审核接口返回相关字段
+- 增加host开关功能
+- GetObject接口支持万象自定义样式
+- 修复ip的host bug
+
 2.4.1 to 2.4.2
 ---------
 - 修复图片处理相关接口403签名不对的bug

composer.json

@@ -42,7 +42,6 @@
     "config": {
         "platform-check": false
     },
-
     "scripts": {
         "test": [
             "@putenv XDEBUG_MODE=coverage",

src/Client.php

@@ -114,7 +114,7 @@
  * @see \Qcloud\Cos\Service::getService()
  */
 class Client extends GuzzleClient {
-    const VERSION = '2.4.2';
+    const VERSION = '2.4.3';
 
     public $httpClient;
 
@@ -133,7 +133,7 @@ public function __construct(array $cosConfig) {
         $this->cosConfig['appId'] = isset($cosConfig['credentials']['appId']) ? $cosConfig['credentials']['appId'] : null;
         $this->cosConfig['secretId'] = isset($cosConfig['credentials']['secretId']) ? $cosConfig['credentials']['secretId'] : '';
         $this->cosConfig['secretKey'] = isset($cosConfig['credentials']['secretKey']) ? $cosConfig['credentials']['secretKey'] : '';
-        $this->cosConfig['anonymous'] = isset($cosConfig['credentials']['anonymous']) ? $cosConfig['anonymous']['anonymous'] : false;
+        $this->cosConfig['anonymous'] = isset($cosConfig['credentials']['anonymous']) ? $cosConfig['credentials']['anonymous'] : false;
         $this->cosConfig['token'] = isset($cosConfig['credentials']['token']) ? $cosConfig['credentials']['token'] : null;
         $this->cosConfig['timeout'] = isset($cosConfig['timeout']) ? $cosConfig['timeout'] : 3600;
         $this->cosConfig['connect_timeout'] = isset($cosConfig['connect_timeout']) ? $cosConfig['connect_timeout'] : 3600;
@@ -145,6 +145,7 @@ public function __construct(array $cosConfig) {
         $this->cosConfig['retry'] = isset($cosConfig['retry']) ? $cosConfig['retry'] : 1;
         $this->cosConfig['userAgent'] = isset($cosConfig['userAgent']) ? $cosConfig['userAgent'] : 'cos-php-sdk-v5.'. Client::VERSION;
         $this->cosConfig['pathStyle'] = isset($cosConfig['pathStyle']) ? $cosConfig['pathStyle'] : false;
+        $this->cosConfig['signHost'] = isset($cosConfig['signHost']) ? $cosConfig['signHost'] : true;
         $this->cosConfig['allow_redirects'] = isset($cosConfig['allow_redirects']) ? $cosConfig['allow_redirects'] : false;
         $this->cosConfig['allow_accelerate'] = isset($cosConfig['allow_accelerate']) ? $cosConfig['allow_accelerate'] : false;
 
@@ -158,15 +159,15 @@ public function __construct(array $cosConfig) {
 			return $request->withHeader('User-Agent', $this->cosConfig['userAgent']);
         }));
         if ($this->cosConfig['anonymous'] != true) {
-            $handler->push($this::handleSignature($this->cosConfig['secretId'], $this->cosConfig['secretKey']));
+            $handler->push($this::handleSignature($this->cosConfig['secretId'], $this->cosConfig['secretKey'], $this->cosConfig['signHost']));
         }
         if ($this->cosConfig['token'] != null) {
             $handler->push(Middleware::mapRequest(function (RequestInterface $request) {
                 return $request->withHeader('x-cos-security-token', $this->cosConfig['token']);
             }));
         }
         $handler->push($this::handleErrors());
-        $this->signature = new Signature(trim($this->cosConfig['secretId']), trim($this->cosConfig['secretKey']), trim($this->cosConfig['token']));
+        $this->signature = new Signature(trim($this->cosConfig['secretId']), trim($this->cosConfig['secretKey']), $this->cosConfig, trim($this->cosConfig['token'] ));
         $area = $this->cosConfig['allow_accelerate'] ? 'accelerate' : $this->cosConfig['region'];
         $this->httpClient = new HttpClient([
             'base_uri' => $this->cosConfig['schema'].'://cos.' . $area . '.myqcloud.com/',
@@ -289,10 +290,6 @@ private function createPresignedUrl(RequestInterface $request, $expires) {
         return $this->signature->createPresignedUrl($request, $expires);
     }
 
-    public function getPresignetUrl($method, $args, $expires = "+30 minutes") {
-        return $this->getPresignedUrl($method, $args, $expires);
-    }
-
     public function getPresignedUrl($method, $args, $expires = "+30 minutes") {
         $command = $this->getCommand($method, $args);
         $request = $this->commandToRequestTransformer($command);
@@ -460,9 +457,9 @@ public static function explodeKey($key) {
     }
 
 
-    public static function handleSignature($secretId, $secretKey) {
-            return function (callable $handler) use ($secretId, $secretKey) {
-                    return new SignatureMiddleware($handler, $secretId, $secretKey);
+    public static function handleSignature($secretId, $secretKey, $signHost) {
+            return function (callable $handler) use ($secretId, $secretKey, $signHost) {
+                    return new SignatureMiddleware($handler, $secretId, $secretKey, $signHost);
             };
     }
 

src/CommandToRequestTransformer.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Command\CommandInterface;
 use GuzzleHttp\Psr7\Uri;
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 
 class CommandToRequestTransformer {
     private $config;
@@ -96,7 +97,7 @@ public function bucketStyleTransformer( CommandInterface $command, RequestInterf
         }
         $uri = $uri->withQuery( $query );
         $request = $request->withUri( $uri );
-//        $request = $request->withHeader( 'Host', $origin_host );
+        $request = $request->withHeader( 'Host', $origin_host );
         return $request;
     }
 
@@ -201,6 +202,10 @@ public function specialParamTransformer( CommandInterface $command, $request ) {
         public function ciParamTransformer( CommandInterface $command, $request ) {
             $action = $command->getName();
             if ( $action == 'GetObject' ) {
+                if(str_contains($uri = $request->getUri(), '%21') ) {
+                    $uri = new Uri( str_replace('%21', '!', $uri) );
+                    $request = $request->withUri( $uri );
+                }
                 if(isset($command['ImageHandleParam']) && $command['ImageHandleParam']){
                     $uri = $request->getUri();
                     $query = $uri->getQuery();

src/Signature.php

@@ -5,14 +5,19 @@
 use Psr\Http\Message\RequestInterface;
 
 class Signature {
-    private $accessKey;
     // string: access key.
-    private $secretKey;
+    private $accessKey;
+
     // string: secret key.
+    private $secretKey;
+
+    // bool: host trigger
+    private $signHost;
 
-    public function __construct( $accessKey, $secretKey, $token = null ) {
+    public function __construct( $accessKey, $secretKey, $signHost, $token = null ) {
         $this->accessKey = $accessKey;
         $this->secretKey = $secretKey;
+        $this->signHost = $signHost;
         $this->token = $token;
         $this->signHeader = [
             'cache-control',
@@ -69,12 +74,16 @@ public function createAuthorization( RequestInterface $request, $expires = '+30
         foreach ( explode( '&', $request->getUri()->getQuery() ) as $query ) {
             if (!empty($query)) {
                 $tmpquery = explode( '=', $query );
-                $key = strtolower( urlencode( $tmpquery[0] ));
+                $key = strtolower( urlencode($tmpquery[0]) );
                 if (count($tmpquery) >= 2) {
                     $value = $tmpquery[1];
                 } else {
                     $value = "";
                 }
+                //host开关
+                if (!$this->signHost && $key == 'host') {
+                    continue;
+                }
                 $urlParamListArray[$key] = $key. '='. $value;
             }
         }
@@ -86,6 +95,9 @@ public function createAuthorization( RequestInterface $request, $expires = '+30
         foreach ( $request->getHeaders() as $key => $value ) {
             $key = strtolower( urlencode( $key ) );
             $value = rawurlencode( $value[0] );
+            if ( !$this->signHost && $key == 'host' ) {
+                continue;
+            }
             if ( $this->needCheckHeader( $key ) ) {
                 $headerListArray[$key] = $key. '='. $value;
             }
@@ -106,7 +118,7 @@ public function createAuthorization( RequestInterface $request, $expires = '+30
     }
 
     public function createPresignedUrl( RequestInterface $request, $expires = '+30 minutes' ) {
-        $authorization = $this->createAuthorization( $request, $expires );
+        $authorization = $this->createAuthorization( $request, $expires);
         $uri = $request->getUri();
         $query = 'sign='.urlencode( $authorization ) . '&' . $uri->getQuery();
         if ( $this->token != null ) {

src/SignatureMiddleware.php

@@ -11,9 +11,9 @@ class SignatureMiddleware {
     /**
      * @param callable $nextHandler Next handler to invoke.
      */
-    public function __construct(callable $nextHandler, $accessKey, $secretKey) {
+    public function __construct(callable $nextHandler, $accessKey, $secretKey, $signHost) {
         $this->nextHandler = $nextHandler;
-        $this->signature = new Signature($accessKey, $secretKey);
+        $this->signature = new Signature($accessKey, $secretKey, $signHost);
     }
 
     public function __invoke(RequestInterface $request, array $options) {

tests/Common.php

@@ -69,6 +69,47 @@ public static function getCosClient()
         return $cosClient;
     }
 
+    public static function getCiClient() {
+        try {
+            $cosClient = new Client(
+                array(
+                    'region' => self::getRegion(),
+                    'schema' => 'https',
+                    'credentials' => array(
+                        'secretId' => getenv('CI_KEY'),
+                        'secretKey' => getenv('CI_SECRET')
+                    )
+                )
+            );
+        } catch (\Exception $e) {
+            return null;
+        }
+        return $cosClient;
+    }
+
+    public static function getCertainRegionClient($region) {
+        try {
+            $cosClient = new Client(
+                array(
+                    'region' => $region,
+                    'schema' => 'https',
+                    'credentials' => array(
+                        'secretId' => getenv('CI_KEY'),
+                        'secretKey' => getenv('CI_SECRET')
+                    )
+                )
+            );
+        } catch (\Exception $e) {
+            return null;
+        }
+        return $cosClient;
+    }
+
+    public static function getCiBucketName()
+    {
+        return getenv('CI_BUCKET');
+    }
+
 
     public static function getBucketName()
     {

tests/CosClientBucketTest.php

@@ -816,11 +816,11 @@ protected function setUp(): void
         $this->bucket2 = "tmp-".$this->bucket;
         $this->prBucket = 'public-read' . $this->bucket2;
         $this->hyphenBucket = '12345-'. $this->bucket;
-        $this->doubleHyphenBucket = '12-333-4445' . $this->bucket;
+        $this->doubleHyphenBucket = '12-333-4445' . $this->bucket2;
     }
 
     protected function tearDown(): void {
-        parent::setUp();
+        parent::tearDown();
         try {
             $this->cosClient->deleteBucket(array('Bucket' => $this->bucket2));
         } catch(\Exception $e) {

tests/CosClientCiTest.php

@@ -1,10 +1,14 @@
 <?php
 
-
 namespace Qcloud\Cos\Tests;
 
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestCosClientBase.php';
+
+use Qcloud\Cos\Exception\ServiceResponseException;
+
+use Qcloud\Cos\Client;
 
-class CosClientCiTest
+class CosClientCiTest extends TestCosClientBase
 {
     //TODO
 }

tests/CosClientObjectTest.php

@@ -972,7 +972,7 @@ protected function setUp(): void
     }
 
     protected function tearDown(): void {
-        parent::setUp();
+        parent::tearDown();
         try {
             $this->cosClient->deleteObject(array('Bucket' => $this->bucket, 'Key' => $this->appendKey));
         } catch(\Exception $e) {