Merge branch 'sign_v4'

Author: racklin

S3.php

@@ -93,6 +93,15 @@ class S3
 	 */
 	public static $endpoint = 's3.amazonaws.com';
 
+	/**
+	 * AWS Region
+	 *
+	 * @var string
+	 * @acess public
+	 * @static
+	 */
+	public static $region = '';
+
 	/**
 	 * Proxy information
 	 *
@@ -217,12 +226,13 @@ class S3
 	* @param string $endpoint Amazon URI
 	* @return void
 	*/
-	public function __construct($accessKey = null, $secretKey = null, $useSSL = false, $endpoint = 's3.amazonaws.com')
+	public function __construct($accessKey = null, $secretKey = null, $useSSL = false, $endpoint = 's3.amazonaws.com', $region = '')
 	{
 		if ($accessKey !== null && $secretKey !== null)
 			self::setAuth($accessKey, $secretKey);
 		self::$useSSL = $useSSL;
 		self::$endpoint = $endpoint;
+		self::$region = $region;
 	}
 
 
@@ -238,6 +248,39 @@ public function setEndpoint($host)
 	}
 
 
+	/**
+	* Set the service region
+	*
+	* @param string $region
+	* @return void
+	*/
+	public function setRegion($region)
+	{
+		self::$region = $region;
+	}
+
+
+	/**
+	* Get the service region
+	*
+	* @return string $region
+	* @static
+	*/
+	public static function getRegion()
+	{
+		$region = self::$region;
+
+		// parse region from endpoint if not specific
+		if (empty($region)) {
+			if (preg_match("/s3[.-](?:website-|dualstack\.)?(.+)\.amazonaws\.com/i",self::$endpoint,$match) !== 0 && strtolower($match[1]) !== "external-1") {
+				$region = $match[1];
+			}		
+		}
+
+		return empty($region) ? 'us-east-1' : $region;
+	}
+
+
 	/**
 	* Set AWS access key and secret key
 	*
@@ -560,6 +603,8 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
 		$rest = new S3Request('PUT', $bucket, '', self::$endpoint);
 		$rest->setAmzHeader('x-amz-acl', $acl);
 
+		if ($location === false) $location = self::getRegion();
+
 		if ($location !== false)
 		{
 			$dom = new DOMDocument;
@@ -1958,13 +2003,14 @@ private static function __getHash($string)
 	* @param array $headers
 	* @param string $method 
 	* @param string $uri
+	* @param string $data
 	* @param array $parameters
 	* @return array $headers
 	*/
-	public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri='', $parameters=array())
-	{
-		// calculate the service name and region from the endpoint hostname: dynamodb.us-east-1.amazonaws.com
-		list( $service, $region, $junk ) = explode( '.', self::$endpoint );
+	public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri='', $data = '', $parameters=array())
+	{		
+		$service = 's3';
+		$region = S3::getRegion();
 
 		$algorithm = 'AWS4-HMAC-SHA256';
 		$amzHeaders = array();
@@ -1986,7 +2032,7 @@ public static function __getSignatureV4($aHeaders, $headers, $method='GET', $uri
 		uksort( $amzHeaders, 'strcmp' );
 
 		// payload
-		$payloadHash = isset($amzHeaders['x-amz-content-sha256']) ? $amzHeaders['x-amz-content-sha256'] :  hash('sha256', '');
+		$payloadHash = isset($amzHeaders['x-amz-content-sha256']) ? $amzHeaders['x-amz-content-sha256'] :  hash('sha256', $data);
 
 		// CanonicalRequests
 		$amzRequests[] = $method;
@@ -2346,6 +2392,7 @@ public function getResponse()
 						$this->headers, 
 						$this->verb, 
 						$this->uri,
+						$this->data,
 						$this->parameters
 					);
 					foreach ($amzHeaders as $k => $v) {