Bump 0.6.5, support https (#48)

Author: crimson-gao

Aliyun/Log/Client.php

@@ -52,6 +52,11 @@ class Aliyun_Log_Client {
      * @var string the local machine ip address.
      */
     protected $source;
+
+    /**
+     * @var bool use https or use http.
+     */
+    protected $useHttps;
 
     /**
      * Aliyun_Log_Client constructor.
@@ -91,23 +96,25 @@ public function __construct(
         $this->source = Aliyun_Log_Util::getLocalIp();
     }
     private function setEndpoint($endpoint) {
-        $pos = strpos ( $endpoint, "://" );
-        if ($pos !== false) { // be careful, !==
-            $pos += 3;
-            $endpoint = substr ( $endpoint, $pos );
+        if (strpos($endpoint, '://') === false) {
+            $endpoint = 'http://' . $endpoint; // default use http
+        }
+        $urlComponents = parse_url($endpoint);
+        if ($urlComponents === false || !isset($urlComponents['host'])) {
+            throw new InvalidArgumentException("Invalid endpoint: $endpoint");
+        }
+
+        $this->useHttps = isset($urlComponents['scheme']) && $urlComponents['scheme'] === 'https';
+        $this->logHost = $urlComponents['host'];
+
+        if (isset($urlComponents['port'])) {
+            $this->port = $urlComponents['port'];
+            $this->endpoint = $this->logHost . ':' . $this->port;
+        } else {
+            $this->port = $this->useHttps ? 443 : 80;
+            $this->endpoint = $this->logHost;
         }
-        $pos = strpos ( $endpoint, "/" );
-        if ($pos !== false) // be careful, !==
-            $endpoint = substr ( $endpoint, 0, $pos );
-        $pos = strpos ( $endpoint, ':' );
-        if ($pos !== false) { // be careful, !==
-            $this->port = ( int ) substr ( $endpoint, $pos + 1 );
-            $endpoint = substr ( $endpoint, 0, $pos );
-        } else
-            $this->port = 80;
-        $this->isRowIp = Aliyun_Log_Util::isIp ( $endpoint );
-        $this->logHost = $endpoint;
-        $this->endpoint = $endpoint . ':' . ( string ) $this->port;
+        $this->isRowIp = Aliyun_Log_Util::isIp($this->logHost);
     }
 
     /**
@@ -228,17 +235,23 @@ private function send($method, $project, $body, $resource, $params, $headers) {
         $signature = Aliyun_Log_Util::getRequestAuthorization ( $method, $resource, $credentials->getAccessKeySecret(), $credentials->getSecurityToken(), $params, $headers );
         $headers ['Authorization'] = "LOG ".$credentials->getAccessKeyId().":$signature";
 
+        $url = $this->buildUrl($project, $resource, $params);
+        return $this->sendRequest ( $method, $url, $body, $headers );
+    }
+
+    private function buildUrl($project, $resource, $params) {
         $url = $resource;
-        if ($params)
-            $url .= '?' . Aliyun_Log_Util::urlEncode ( $params );
-        if ($this->isRowIp)
-            $url = "http://$this->endpoint$url";
-        else{
-          if(is_null($project))
-              $url = "http://$this->endpoint$url";
-          else  $url = "http://$project.$this->endpoint$url";           
+        $schema = $this->useHttps ? "https://" : "http://";
+        if ($params) {
+            $url .= '?' . Aliyun_Log_Util::urlEncode($params);
         }
-        return $this->sendRequest ( $method, $url, $body, $headers );
+        if ($this->isRowIp) {
+            return "$schema$this->endpoint$url";
+        }
+        if (is_null($project)) {
+            return "$schema$this->endpoint$url";
+        }
+        return "$schema$project.$this->endpoint$url";
     }
 
     /**

composer.json

@@ -11,6 +11,7 @@
     "php": ">=7.1.7"
   },
   "require-dev": {
+    "phpunit/phpunit": "^11.2"
   },
   "authors": [
     {
@@ -33,5 +34,5 @@
   },
   "name": "alibabacloud/aliyun-log-php-sdk",
   "license": "MIT",
-  "version": "0.6.4"
+  "version": "0.6.5"
 }

tests/EndpointTest.php

@@ -0,0 +1,30 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+require_once realpath(dirname(__FILE__) . '/../Log_Autoload.php');
+
+class EndpointTest extends TestCase {
+    public function testBuildUrl() {
+        $this->assertEquals($this->getUrl('https://cn-hangzhou.log.aliyuncs.com', 'test', '/', array()), 'https://test.cn-hangzhou.log.aliyuncs.com/');
+        $this->assertEquals($this->getUrl('cn-hangzhou.log.aliyuncs.com', 'test', '/', array()), 'http://test.cn-hangzhou.log.aliyuncs.com/');
+        $this->assertEquals($this->getUrl('http://cn-hangzhou.log.aliyuncs.com', 'test', '/logstores', array()), 'http://test.cn-hangzhou.log.aliyuncs.com/logstores');
+        $this->assertEquals($this->getUrl('https://cn-hangzhou.log.aliyuncs.com:443', 'test', '/logstores', array()), 'https://test.cn-hangzhou.log.aliyuncs.com:443/logstores');
+        $this->assertEquals($this->getUrl('https://111.111.111.111:80', 'test', '/logstores', array()), 'https://111.111.111.111:80/logstores');
+        $this->assertEquals($this->getUrl('111.111.111.111:442', 'test', '/test', array()), 'http://111.111.111.111:442/test');
+        $this->assertEquals($this->getUrl('111.111.111.111:442', null, '/test', array()), 'http://111.111.111.111:442/test');
+        $this->assertEquals($this->getUrl('http://111.111.111.111:442', 'test', '/cursor', array('type' => 'cursor')), 'http://111.111.111.111:442/cursor?type=cursor');
+        $this->assertEquals($this->getUrl('https://cn-hangzhou.log.aliyuncs.com', null, '/cursor', array('type' => 'cursor')), 'https://cn-hangzhou.log.aliyuncs.com/cursor?type=cursor');
+        $this->assertEquals($this->getUrl('cn-hangzhou.log.aliyuncs.com', null, '/', array()), 'http://cn-hangzhou.log.aliyuncs.com/');
+    }
+
+    public function getUrl($endpoint, $project, $resource, $params) {
+        $accessKeyId = 'testKey';
+        $accessKey = 'testAccessKey';
+        $client = new Aliyun_Log_Client($endpoint, $accessKeyId, $accessKey);
+        $reflection = new ReflectionClass($client);
+        $method = $reflection->getMethod('buildUrl');
+        $method->setAccessible(true);
+        return $method->invokeArgs($client, [$project, $resource, $params]);
+    }
+}