extract host & port from endpoint

Author: huiguangjun

src/OSS/Core/OssUtil.php

@@ -362,6 +362,43 @@ public static function isIPFormat($endpoint)
         }
     }
 
+    /**
+     * Get the host:port from endpoint.
+     *
+     * @param string $endpoint the endpoint.
+     * @return boolean
+     */
+    public static function getHostPortFromEndpoint($endpoint)
+    {
+        $str = $endpoint;
+        $pos = strpos($str, "://");
+        if ($pos !== false) {
+            $str = substr($str, $pos+3);
+        }
+    
+        $pos = strpos($str, '#');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '?');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '/');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '@');
+        if ($pos !== false) {
+            $str = substr($str, $pos+1);
+        }
+        
+        return $str;
+    }
+
     /**
      * Generate the xml message of DeleteMultiObjects.
      *

src/OSS/OssClient.php

@@ -2541,6 +2541,8 @@ private function checkEndpoint($endpoint, $isCName)
             $ret_endpoint = $endpoint;
         }
 
+        $ret_endpoint = OssUtil::getHostPortFromEndpoint($ret_endpoint);
+
         if ($isCName) {
             $this->hostType = self::OSS_HOST_TYPE_CNAME;
         } elseif (OssUtil::isIPFormat($ret_endpoint)) {

tests/OSS/Tests/OssClientObjectTest.php

@@ -580,6 +580,16 @@ public function testCheckMD5()
     	}
     }
 
+    public function testWithInvalidBucketName()
+    {
+        try {
+            $this->ossClient->createBucket("abcefc/", "test-key");
+            $this->assertFalse(true);
+        } catch (OssException $e) {
+            $this->assertEquals('"abcefc/"bucket name is invalid', $e->getMessage());
+        }
+    }
+
     public function setUp()
     {
         parent::setUp();

tests/OSS/Tests/OssUtilTest.php

@@ -222,4 +222,30 @@ private function cleanXml($xml)
         return str_replace("\n", "", str_replace("\r", "", $xml));
     }
 
+	public function testGetHostPortFromEndpoint()
+    {
+        $str =  OssUtil::getHostPortFromEndpoint('http://username:password@hostname:80/path?arg=value#anchor');
+        $this->assertEquals('hostname:80', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('hostname:80');
+        $this->assertEquals('hostname:80', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('www.hostname.com');
+        $this->assertEquals('www.hostname.com', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('http://www.hostname.com');
+        $this->assertEquals('www.hostname.com', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('https://www.hostname.com');
+        $this->assertEquals('www.hostname.com', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('192.168.1.10:8080');
+        $this->assertEquals('192.168.1.10:8080', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('http:///path?arg=value#anchor');
+        $this->assertEquals('', $str);
+
+        $str =  OssUtil::getHostPortFromEndpoint('file://username:password@hostname:80/path?arg=value#anchor');
+        $this->assertEquals('hostname:80', $str);
+    }
 }