| @@ -79,8 +79,8 @@ | ||
| 79 | 79 | /** | 
| 80 | 80 | * generate Authorization. | 
| 81 | 81 | * | 
| 82 | - * @param $headersToSign | |
| 83 | - * @param $datetime | |
| 82 | + * @param string[] $headersToSign | |
| 83 | + * @param string $datetime | |
| 84 | 84 | * @param $headers | 
| 85 | 85 | * @param Config $config | 
| 86 | 86 | * @return string | 
| @@ -27,7 +27,7 @@ discard block | ||
| 27 | 27 | const ENDPOINT_URI = '/bce/v2/message'; | 
| 28 | 28 | const BCE_AUTH_VERSION = 'bce-auth-v1'; | 
| 29 | 29 | const DEFAULT_EXPIRATION_IN_SECONDS = 1800; //签名有效期默认1800秒 | 
| 30 | - const SUCCESS_CODE=1000; | |
| 30 | + const SUCCESS_CODE = 1000; | |
| 31 | 31 | |
| 32 | 32 | /** | 
| 33 | 33 | * Send message. | 
| @@ -54,14 +54,14 @@ discard block | ||
| 54 | 54 |          $timestamp->setTimezone(new \DateTimeZone("UTC")); | 
| 55 | 55 |          $datetime = $timestamp->format("Y-m-d\TH:i:s\Z"); | 
| 56 | 56 | //生成json格式 | 
| 57 | -        $headers = ['Host'=>self::ENDPOINT_HOST,"Content-Type" => 'application/json',  'x-bce-date' => $datetime, 'x-bce-content-sha256' => hash('sha256', json_encode($params))]; | |
| 58 | -        $headersToSign =array('host', 'x-bce-content-sha256',);//需要签名的header头 | |
| 59 | - $headers['Authorization']=$this->generateSign($headersToSign, $datetime,$headers,$config); | |
| 57 | +        $headers = ['Host'=>self::ENDPOINT_HOST, "Content-Type" => 'application/json', 'x-bce-date' => $datetime, 'x-bce-content-sha256' => hash('sha256', json_encode($params))]; | |
| 58 | +        $headersToSign = array('host', 'x-bce-content-sha256',); //需要签名的header头 | |
| 59 | + $headers['Authorization'] = $this->generateSign($headersToSign, $datetime, $headers, $config); | |
| 60 | 60 | |
| 61 | -        $result=$this->request('post',self::buildEndpoint(), ['headers' => $headers, 'json' => $params]); | |
| 61 | +        $result = $this->request('post', self::buildEndpoint(), ['headers' => $headers, 'json' => $params]); | |
| 62 | 62 | |
| 63 | -        if($result['code']!=self::SUCCESS_CODE){ | |
| 64 | - throw new GatewayErrorException($result['message'],$result['code'],$result); | |
| 63 | +        if ($result['code'] != self::SUCCESS_CODE) { | |
| 64 | + throw new GatewayErrorException($result['message'], $result['code'], $result); | |
| 65 | 65 | } | 
| 66 | 66 | return $result; | 
| 67 | 67 | } | 
| @@ -88,23 +88,23 @@ discard block | ||
| 88 | 88 | public function generateSign($headersToSign, $datetime, $headers, Config $config) | 
| 89 | 89 |      { | 
| 90 | 90 | //生成authString | 
| 91 | -        $authString = self::BCE_AUTH_VERSION . '/' . $config->get('ak') . '/' | |
| 92 | - . $datetime . '/' . self::DEFAULT_EXPIRATION_IN_SECONDS; | |
| 91 | +        $authString = self::BCE_AUTH_VERSION.'/'.$config->get('ak').'/' | |
| 92 | + . $datetime.'/'.self::DEFAULT_EXPIRATION_IN_SECONDS; | |
| 93 | 93 | //使用sk和authString生成signKey | 
| 94 | 94 |          $signingKey = hash_hmac('sha256', $authString, $config->get('sk')); | 
| 95 | 95 | //生成标准化URI | 
| 96 | -        $canonicalURI = str_replace('%2F', '/', rawurlencode(self::ENDPOINT_URI));// 根据RFC 3986,除了:1.大小写英文字符2.阿拉伯数字3.点'.'、波浪线'~'、减号'-'以及下划线'_' 以外都要编码 | |
| 96 | +        $canonicalURI = str_replace('%2F', '/', rawurlencode(self::ENDPOINT_URI)); // 根据RFC 3986,除了:1.大小写英文字符2.阿拉伯数字3.点'.'、波浪线'~'、减号'-'以及下划线'_' 以外都要编码 | |
| 97 | 97 | |
| 98 | 98 | //生成标准化QueryString | 
| 99 | - $canonicalQueryString = '';//此api不需要此项。返回空字符串 | |
| 99 | + $canonicalQueryString = ''; //此api不需要此项。返回空字符串 | |
| 100 | 100 | |
| 101 | - $signHeaders = self::getHeadersToSign($headers, $headersToSign);//获得需要签名的数据 | |
| 101 | + $signHeaders = self::getHeadersToSign($headers, $headersToSign); //获得需要签名的数据 | |
| 102 | 102 | //整理headersToSign,以';'号连接 | 
| 103 | 103 |          $signedHeaders = empty($signHeaders) ? '' : strtolower(trim(implode(";", array_keys($signHeaders)))); | 
| 104 | 104 | //生成标准化header | 
| 105 | 105 | $canonicalHeader = self::getCanonicalHeaders($signHeaders); | 
| 106 | 106 | //组成标准请求串 | 
| 107 | - $canonicalRequest = "POST\n$canonicalURI\n" . "$canonicalQueryString\n$canonicalHeader"; | |
| 107 | + $canonicalRequest = "POST\n$canonicalURI\n"."$canonicalQueryString\n$canonicalHeader"; | |
| 108 | 108 | //使用signKey和标准请求串完成签名 | 
| 109 | 109 |          $signature = hash_hmac('sha256', $canonicalRequest, $signingKey); | 
| 110 | 110 | |
| @@ -137,7 +137,7 @@ discard block | ||
| 137 | 137 | $v = ''; | 
| 138 | 138 | } | 
| 139 | 139 | //trim后再encode,之后使用':'号连接起来 | 
| 140 | - $headerStrings[] = rawurlencode((strtolower(trim($k)))) . ':' . rawurlencode((trim($v))); | |
| 140 | + $headerStrings[] = rawurlencode((strtolower(trim($k)))).':'.rawurlencode((trim($v))); | |
| 141 | 141 | } | 
| 142 | 142 | //字典序排序 | 
| 143 | 143 | sort($headerStrings); | 
| @@ -157,7 +157,7 @@ discard block | ||
| 157 | 157 |      { | 
| 158 | 158 | //value被trim后为空串的header不参与签名 | 
| 159 | 159 |          $filter_empty = function ($v) { | 
| 160 | - return trim((string)$v) !== ''; | |
| 160 | + return trim((string) $v) !== ''; | |
| 161 | 161 | }; | 
| 162 | 162 | $headers = array_filter($headers, $filter_empty); | 
| 163 | 163 | |