validate region_id&suffix&network (#222)

Author: AxiosLeo

.travis.yml

@@ -19,6 +19,7 @@ matrix:
   allow_failures:
     - php: hhvm-3.24
     - php: nightly
+    - php: 7.4
   fast_finish: true
 
 sudo: false
@@ -37,8 +38,8 @@ install:
       echo "xdebug.overload_var_dump = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
     fi
   - >
-    if { [ $(phpenv version-name) == "7.2" ] || [ $(phpenv version-name) == "7.3" ] || [$(phpenv version-name) == "7.4"]; } && [ -v COMPOSER_OPTS ]; then
-      composer require --dev phpunit/phpunit "^5.7.11"
+    if { [ $(phpenv version-name) == "7.2" ] || [ $(phpenv version-name) == "7.3" ] || [ $(phpenv version-name) == "7.4" ] ; } && [ -v COMPOSER_OPTS ]; then
+      composer require --dev phpunit/phpunit "～5.7.27"
     fi
   # Resolve dependencies
   - composer --version

composer.json

@@ -49,7 +49,7 @@
     "drupal/coder": "^8.3",
     "symfony/dotenv": "^3.4",
     "league/climate": "^3.2.4",
-    "phpunit/phpunit": "^5.7.27",
+    "phpunit/phpunit": "～5.7.27",
     "monolog/monolog": "^1.24",
     "composer/composer": "^1.8",
     "mikey179/vfsstream": "^1.6",

src/Filter/ApiFilter.php

@@ -111,6 +111,13 @@ public static function endpointSuffix($endpointSuffix)
             );
         }
 
+        if (!preg_match("/^[a-zA-Z0-9_-]+$/", $endpointSuffix)) {
+            throw new ClientException(
+                'Invalid Endpoint Suffix',
+                SDK::INVALID_ARGUMENT
+            );
+        }
+
         return $endpointSuffix;
     }
 
@@ -138,6 +145,13 @@ public static function network($network)
             );
         }
 
+        if (!preg_match("/^[a-zA-Z0-9_-]+$/", $network)) {
+            throw new ClientException(
+                'Invalid Network Suffix',
+                SDK::INVALID_ARGUMENT
+            );
+        }
+
         return $network;
     }
 

src/Filter/ClientFilter.php

@@ -35,6 +35,13 @@ public static function regionId($regionId)
             );
         }
 
+        if (!preg_match("/^[a-zA-Z0-9_-]+$/", $regionId)) {
+            throw new ClientException(
+                'Invalid Region ID',
+                SDK::INVALID_ARGUMENT
+            );
+        }
+
         return strtolower($regionId);
     }
 

tests/Unit/Filter/ApiFilterTest.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace AlibabaCloud\Client\Tests\Unit\Filter;
+
+use PHPUnit\Framework\TestCase;
+use AlibabaCloud\Client\Filter\HttpFilter;
+use AlibabaCloud\Client\Filter\ApiFilter;
+use AlibabaCloud\Client\Exception\ClientException;
+
+class ApiFilterTest extends TestCase
+{
+    /**
+     * @dataProvider endpointSuffix
+     *
+     * @param $expected
+     * @param $contentType
+     * @param $exceptionMessage
+     */
+    public function testEndpointSuffix($expected, $contentType, $exceptionMessage)
+    {
+        try {
+            self::assertEquals($expected, ApiFilter::endpointSuffix($contentType));
+        } catch (ClientException $exception) {
+            self::assertEquals($exceptionMessage, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function endpointSuffix()
+    {
+        return [
+            [
+                1,
+                1,
+                'Endpoint Suffix must be a string',
+            ],
+            [
+                '',
+                '',
+                'Endpoint Suffix cannot be empty',
+            ],
+            [
+                'EndpointSuffix中文',
+                'EndpointSuffix中文',
+                'Invalid Endpoint Suffix',
+            ],
+            [
+                'suffix',
+                'suffix',
+                '',
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider network
+     *
+     * @param $expected
+     * @param $contentType
+     * @param $exceptionMessage
+     */
+    public function testNetwork($expected, $contentType, $exceptionMessage){
+        try {
+            self::assertEquals($expected, ApiFilter::network($contentType));
+        } catch (ClientException $exception) {
+            self::assertEquals($exceptionMessage, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function network(){
+        return [
+            [
+                1,
+                1,
+                'Network Suffix must be a string',
+            ],
+            [
+                '',
+                '',
+                'Network Suffix cannot be empty',
+            ],
+            [
+                'Network中文',
+                'Network中文',
+                'Invalid Network Suffix',
+            ],
+            [
+                'share',
+                'share',
+                '',
+            ]
+        ];
+    }
+}

tests/Unit/Filter/ClientFilterTest.php

@@ -49,6 +49,49 @@ public function retry()
         ];
     }
 
+    /**
+     * @dataProvider regionId
+     *
+     * @param $expected
+     * @param $contentType
+     * @param $exceptionMessage
+     */
+    public function testRegionId($expected, $contentType, $exceptionMessage){
+        try {
+            self::assertEquals($expected, ClientFilter::regionId($contentType));
+        } catch (ClientException $exception) {
+            self::assertEquals($exceptionMessage, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function regionId(){
+        return [
+            [
+                1,
+                1,
+                'Region ID must be a string',
+            ],
+            [
+                '',
+                '',
+                'Region ID cannot be empty',
+            ],
+            [
+                'regionId中文',
+                'regionId中文',
+                'Invalid Region ID',
+            ],
+            [
+                'cn-hangzhou',
+                'cn-hangzhou',
+                '',
+            ]
+        ];
+    }
+
     /**
      * @dataProvider accept
      *