Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-25953 Repository: Updated Amazon S3 library

  • Loading branch information...
commit b3b35530f966403962bbf5dbdd3bdc5dd3a2b058 1 parent 6975216
@FMCorz FMCorz authored
View
10 repository/s3/README_MOODLE.txt
@@ -0,0 +1,10 @@
+- S3.php -
+
+Amazon S3 PHP Class
+
+Cloned from git://github.com/tpyo/amazon-s3-php-class.git
+Branch master
+On July 23rd 2012
+
+https://github.com/tpyo/amazon-s3-php-class
+http://undesigned.org.za/2007/10/22/amazon-s3-php-class
View
1,233 repository/s3/S3.php
@@ -1,7 +1,8 @@
<?php
-
/**
-* Copyright (c) 2008, Donovan Schönknecht. All rights reserved.
+* $Id$
+*
+* Copyright (c) 2011, Donovan Schönknecht. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -31,18 +32,37 @@
* Amazon S3 PHP class
*
* @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class
-* @version 0.3.8
+* @version 0.5.0-dev
*/
-class S3 {
+class S3
+{
// ACL flags
const ACL_PRIVATE = 'private';
const ACL_PUBLIC_READ = 'public-read';
const ACL_PUBLIC_READ_WRITE = 'public-read-write';
+ const ACL_AUTHENTICATED_READ = 'authenticated-read';
+
+ const STORAGE_CLASS_STANDARD = 'STANDARD';
+ const STORAGE_CLASS_RRS = 'REDUCED_REDUNDANCY';
+
+ private static $__accessKey = null; // AWS Access key
+ private static $__secretKey = null; // AWS Secret key
+ private static $__sslKey = null;
+
+ public static $endpoint = 's3.amazonaws.com';
+ public static $proxy = null;
- public static $useSSL = true;
+ public static $useSSL = false;
+ public static $useSSLValidation = true;
+ public static $useExceptions = false;
- private static $__accessKey; // AWS Access key
- private static $__secretKey; // AWS Secret key
+ // SSL CURL SSL options - only needed if you are experiencing problems with your OpenSSL configuration
+ public static $sslKey = null;
+ public static $sslCert = null;
+ public static $sslCACert = null;
+
+ private static $__signingKeyPairId = null; // AWS Key Pair ID
+ private static $__signingKeyResource = false; // Key resource, freeSigningKey() must be called to clear it from memory
/**
@@ -53,45 +73,179 @@ class S3 {
* @param boolean $useSSL Enable SSL
* @return void
*/
- public function __construct($accessKey = null, $secretKey = null, $useSSL = true) {
+ public function __construct($accessKey = null, $secretKey = null, $useSSL = false, $endpoint = 's3.amazonaws.com')
+ {
if ($accessKey !== null && $secretKey !== null)
self::setAuth($accessKey, $secretKey);
self::$useSSL = $useSSL;
+ self::$endpoint = $endpoint;
}
/**
+ * Set the sertvice endpoint
+ *
+ * @param string $host Hostname
+ * @return void
+ */
+ public function setEndpoint($host)
+ {
+ self::$endpoint = $host;
+ }
+
+ /**
* Set AWS access key and secret key
*
* @param string $accessKey Access key
* @param string $secretKey Secret key
* @return void
*/
- public static function setAuth($accessKey, $secretKey) {
+ public static function setAuth($accessKey, $secretKey)
+ {
self::$__accessKey = $accessKey;
self::$__secretKey = $secretKey;
}
/**
+ * Check if AWS keys have been set
+ *
+ * @return boolean
+ */
+ public static function hasAuth() {
+ return (self::$__accessKey !== null && self::$__secretKey !== null);
+ }
+
+
+ /**
+ * Set SSL on or off
+ *
+ * @param boolean $enabled SSL enabled
+ * @param boolean $validate SSL certificate validation
+ * @return void
+ */
+ public static function setSSL($enabled, $validate = true)
+ {
+ self::$useSSL = $enabled;
+ self::$useSSLValidation = $validate;
+ }
+
+
+ /**
+ * Set SSL client certificates (experimental)
+ *
+ * @param string $sslCert SSL client certificate
+ * @param string $sslKey SSL client key
+ * @param string $sslCACert SSL CA cert (only required if you are having problems with your system CA cert)
+ * @return void
+ */
+ public static function setSSLAuth($sslCert = null, $sslKey = null, $sslCACert = null)
+ {
+ self::$sslCert = $sslCert;
+ self::$sslKey = $sslKey;
+ self::$sslCACert = $sslCACert;
+ }
+
+
+ /**
+ * Set proxy information
+ *
+ * @param string $host Proxy hostname and port (localhost:1234)
+ * @param string $user Proxy username
+ * @param string $pass Proxy password
+ * @param constant $type CURL proxy type
+ * @return void
+ */
+ public static function setProxy($host, $user = null, $pass = null, $type = CURLPROXY_SOCKS5)
+ {
+ self::$proxy = array('host' => $host, 'type' => $type, 'user' => null, 'pass' => 'null');
+ }
+
+
+ /**
+ * Set the error mode to exceptions
+ *
+ * @param boolean $enabled Enable exceptions
+ * @return void
+ */
+ public static function setExceptions($enabled = true)
+ {
+ self::$useExceptions = $enabled;
+ }
+
+
+ /**
+ * Set signing key
+ *
+ * @param string $keyPairId AWS Key Pair ID
+ * @param string $signingKey Private Key
+ * @param boolean $isFile Load private key from file, set to false to load string
+ * @return boolean
+ */
+ public static function setSigningKey($keyPairId, $signingKey, $isFile = true)
+ {
+ self::$__signingKeyPairId = $keyPairId;
+ if ((self::$__signingKeyResource = openssl_pkey_get_private($isFile ?
+ file_get_contents($signingKey) : $signingKey)) !== false) return true;
+ self::__triggerError('S3::setSigningKey(): Unable to open load private key: '.$signingKey, __FILE__, __LINE__);
+ return false;
+ }
+
+
+ /**
+ * Free signing key from memory, MUST be called if you are using setSigningKey()
+ *
+ * @return void
+ */
+ public static function freeSigningKey()
+ {
+ if (self::$__signingKeyResource !== false)
+ openssl_free_key(self::$__signingKeyResource);
+ }
+
+
+ /**
+ * Internal error handler
+ *
+ * @internal Internal error handler
+ * @param string $message Error message
+ * @param string $file Filename
+ * @param integer $line Line number
+ * @param integer $code Error code
+ * @return void
+ */
+ private static function __triggerError($message, $file, $line, $code = 0)
+ {
+ if (self::$useExceptions)
+ throw new S3Exception($message, $file, $line, $code);
+ else
+ trigger_error($message, E_USER_WARNING);
+ }
+
+
+ /**
* Get a list of buckets
*
* @param boolean $detailed Returns detailed bucket list when true
* @return array | false
*/
- public static function listBuckets($detailed = false) {
- $rest = new S3Request('GET', '', '');
+ public static function listBuckets($detailed = false)
+ {
+ $rest = new S3Request('GET', '', '', self::$endpoint);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::listBuckets(): [%s] %s", $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::listBuckets(): [%s] %s", $rest->error['code'],
+ $rest->error['message']), __FILE__, __LINE__);
return false;
}
- $results = array(); //var_dump($rest->body);
+ $results = array();
if (!isset($rest->body->Buckets)) return $results;
- if ($detailed) {
+ if ($detailed)
+ {
if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName))
$results['owner'] = array(
'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->ID
@@ -118,10 +272,13 @@ public static function listBuckets($detailed = false) {
* @param string $marker Marker (last file listed)
* @param string $maxKeys Max keys (maximum number of keys to return)
* @param string $delimiter Delimiter
+ * @param boolean $returnCommonPrefixes Set to true to return CommonPrefixes
* @return array | false
*/
- public static function getBucket($bucket, $prefix = null, $marker = null, $maxKeys = null, $delimiter = null) {
- $rest = new S3Request('GET', $bucket, '');
+ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKeys = null, $delimiter = null, $returnCommonPrefixes = false)
+ {
+ $rest = new S3Request('GET', $bucket, '', self::$endpoint);
+ if ($maxKeys == 0) $maxKeys = null;
if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
if ($marker !== null && $marker !== '') $rest->setParameter('marker', $marker);
if ($maxKeys !== null && $maxKeys !== '') $rest->setParameter('max-keys', $maxKeys);
@@ -129,49 +286,68 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
$response = $rest->getResponse();
if ($response->error === false && $response->code !== 200)
$response->error = array('code' => $response->code, 'message' => 'Unexpected HTTP status');
- if ($response->error !== false) {
- trigger_error(sprintf("S3::getBucket(): [%s] %s", $response->error['code'], $response->error['message']), E_USER_WARNING);
+ if ($response->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getBucket(): [%s] %s",
+ $response->error['code'], $response->error['message']), __FILE__, __LINE__);
return false;
}
$results = array();
- $lastMarker = null;
+ $nextMarker = null;
if (isset($response->body, $response->body->Contents))
- foreach ($response->body->Contents as $c) {
+ foreach ($response->body->Contents as $c)
+ {
+ $results[(string)$c->Key] = array(
+ 'name' => (string)$c->Key,
+ 'time' => strtotime((string)$c->LastModified),
+ 'size' => (int)$c->Size,
+ 'hash' => substr((string)$c->ETag, 1, -1)
+ );
+ $nextMarker = (string)$c->Key;
+ }
+
+ if ($returnCommonPrefixes && isset($response->body, $response->body->CommonPrefixes))
+ foreach ($response->body->CommonPrefixes as $c)
+ $results[(string)$c->Prefix] = array('prefix' => (string)$c->Prefix);
+
+ if (isset($response->body, $response->body->IsTruncated) &&
+ (string)$response->body->IsTruncated == 'false') return $results;
+
+ if (isset($response->body, $response->body->NextMarker))
+ $nextMarker = (string)$response->body->NextMarker;
+
+ // Loop through truncated results if maxKeys isn't specified
+ if ($maxKeys == null && $nextMarker !== null && (string)$response->body->IsTruncated == 'true')
+ do
+ {
+ $rest = new S3Request('GET', $bucket, '', self::$endpoint);
+ if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
+ $rest->setParameter('marker', $nextMarker);
+ if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
+
+ if (($response = $rest->getResponse()) == false || $response->code !== 200) break;
+
+ if (isset($response->body, $response->body->Contents))
+ foreach ($response->body->Contents as $c)
+ {
$results[(string)$c->Key] = array(
'name' => (string)$c->Key,
'time' => strtotime((string)$c->LastModified),
'size' => (int)$c->Size,
'hash' => substr((string)$c->ETag, 1, -1)
);
- $lastMarker = (string)$c->Key;
- //$response->body->IsTruncated = 'true'; break;
+ $nextMarker = (string)$c->Key;
}
+ if ($returnCommonPrefixes && isset($response->body, $response->body->CommonPrefixes))
+ foreach ($response->body->CommonPrefixes as $c)
+ $results[(string)$c->Prefix] = array('prefix' => (string)$c->Prefix);
- if (isset($response->body->IsTruncated) &&
- (string)$response->body->IsTruncated == 'false') return $results;
+ if (isset($response->body, $response->body->NextMarker))
+ $nextMarker = (string)$response->body->NextMarker;
- // Loop through truncated results if maxKeys isn't specified
- if ($maxKeys == null && $lastMarker !== null && (string)$response->body->IsTruncated == 'true')
- do {
- $rest = new S3Request('GET', $bucket, '');
- if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
- $rest->setParameter('marker', $lastMarker);
- if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
-
- if (($response = $rest->getResponse(true)) == false || $response->code !== 200) break;
- if (isset($response->body, $response->body->Contents))
- foreach ($response->body->Contents as $c) {
- $results[(string)$c->Key] = array(
- 'name' => (string)$c->Key,
- 'time' => strtotime((string)$c->LastModified),
- 'size' => (int)$c->Size,
- 'hash' => substr((string)$c->ETag, 1, -1)
- );
- $lastMarker = (string)$c->Key;
- }
} while ($response !== false && (string)$response->body->IsTruncated == 'true');
return $results;
@@ -186,14 +362,16 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
* @param string $location Set as "EU" to create buckets hosted in Europe
* @return boolean
*/
- public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location = false) {
- $rest = new S3Request('PUT', $bucket, '');
+ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location = false)
+ {
+ $rest = new S3Request('PUT', $bucket, '', self::$endpoint);
$rest->setAmzHeader('x-amz-acl', $acl);
- if ($location !== false) {
+ if ($location !== false)
+ {
$dom = new DOMDocument;
$createBucketConfiguration = $dom->createElement('CreateBucketConfiguration');
- $locationConstraint = $dom->createElement('LocationConstraint', strtoupper($location));
+ $locationConstraint = $dom->createElement('LocationConstraint', $location);
$createBucketConfiguration->appendChild($locationConstraint);
$dom->appendChild($createBucketConfiguration);
$rest->data = $dom->saveXML();
@@ -204,9 +382,10 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::putBucket({$bucket}, {$acl}, {$location}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::putBucket({$bucket}, {$acl}, {$location}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -219,14 +398,16 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
* @param string $bucket Bucket name
* @return boolean
*/
- public static function deleteBucket($bucket) {
- $rest = new S3Request('DELETE', $bucket);
+ public static function deleteBucket($bucket)
+ {
+ $rest = new S3Request('DELETE', $bucket, '', self::$endpoint);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 204)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::deleteBucket({$bucket}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::deleteBucket({$bucket}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -240,14 +421,15 @@ public static function deleteBucket($bucket) {
* @param mixed $md5sum Use MD5 hash (supply a string if you want to use your own)
* @return array | false
*/
- public static function inputFile($file, $md5sum = true) {
- if (!file_exists($file) || !is_file($file) || !is_readable($file)) {
- trigger_error('S3::inputFile(): Unable to open input file: '.$file, E_USER_WARNING);
+ public static function inputFile($file, $md5sum = true)
+ {
+ if (!file_exists($file) || !is_file($file) || !is_readable($file))
+ {
+ self::__triggerError('S3::inputFile(): Unable to open input file: '.$file, __FILE__, __LINE__);
return false;
}
- return array('file' => $file, 'size' => filesize($file),
- 'md5sum' => $md5sum !== false ? (is_string($md5sum) ? $md5sum :
- base64_encode(md5_file($file, true))) : '');
+ return array('file' => $file, 'size' => filesize($file), 'md5sum' => $md5sum !== false ?
+ (is_string($md5sum) ? $md5sum : base64_encode(md5_file($file, true))) : '');
}
@@ -259,9 +441,11 @@ public static function inputFile($file, $md5sum = true) {
* @param string $md5sum MD5 hash to send (optional)
* @return array | false
*/
- public static function inputResource(&$resource, $bufferSize, $md5sum = '') {
- if (!is_resource($resource) || $bufferSize <= 0) {
- trigger_error('S3::inputResource(): Invalid resource or buffer size', E_USER_WARNING);
+ public static function inputResource(&$resource, $bufferSize, $md5sum = '')
+ {
+ if (!is_resource($resource) || $bufferSize < 0)
+ {
+ self::__triggerError('S3::inputResource(): Invalid resource or buffer size', __FILE__, __LINE__);
return false;
}
$input = array('size' => $bufferSize, 'md5sum' => $md5sum);
@@ -279,13 +463,15 @@ public static function inputResource(&$resource, $bufferSize, $md5sum = '') {
* @param constant $acl ACL constant
* @param array $metaHeaders Array of x-amz-meta-* headers
* @param array $requestHeaders Array of request headers or content type as a string
+ * @param constant $storageClass Storage class constant
* @return boolean
*/
- public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array()) {
- if ($input == false) return false;
- $rest = new S3Request('PUT', $bucket, $uri);
+ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array(), $storageClass = self::STORAGE_CLASS_STANDARD)
+ {
+ if ($input === false) return false;
+ $rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
- if (is_string($input)) $input = array(
+ if (!is_array($input)) $input = array(
'data' => $input, 'size' => strlen($input),
'md5sum' => base64_encode(md5($input, true))
);
@@ -299,7 +485,7 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
$rest->data = $input['data'];
// Content-Length (required)
- if (isset($input['size']) && $input['size'] > -1)
+ if (isset($input['size']) && $input['size'] >= 0)
$rest->size = $input['size'];
else {
if (isset($input['file']))
@@ -315,7 +501,8 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
$input['type'] = $requestHeaders;
// Content-Type
- if (!isset($input['type'])) {
+ if (!isset($input['type']))
+ {
if (isset($requestHeaders['Content-Type']))
$input['type'] =& $requestHeaders['Content-Type'];
elseif (isset($input['file']))
@@ -324,8 +511,12 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
$input['type'] = 'application/octet-stream';
}
+ if ($storageClass !== self::STORAGE_CLASS_STANDARD) // Storage class
+ $rest->setAmzHeader('x-amz-storage-class', $storageClass);
+
// We need to post with Content-Length and Content-Type, MD5 is optional
- if ($rest->size > 0 && ($rest->fp !== false || $rest->data !== false)) {
+ if ($rest->size >= 0 && ($rest->fp !== false || $rest->data !== false))
+ {
$rest->setHeader('Content-Type', $input['type']);
if (isset($input['md5sum'])) $rest->setHeader('Content-MD5', $input['md5sum']);
@@ -337,8 +528,10 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
if ($rest->response->error === false && $rest->response->code !== 200)
$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
- if ($rest->response->error !== false) {
- trigger_error(sprintf("S3::putObject(): [%s] %s", $rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
+ if ($rest->response->error !== false)
+ {
+ self::__triggerError(sprintf("S3::putObject(): [%s] %s",
+ $rest->response->error['code'], $rest->response->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -356,7 +549,8 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
* @param string $contentType Content type
* @return boolean
*/
- public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = null) {
+ public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = null)
+ {
return self::putObject(self::inputFile($file), $bucket, $uri, $acl, $metaHeaders, $contentType);
}
@@ -372,7 +566,8 @@ public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIV
* @param string $contentType Content type
* @return boolean
*/
- public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = 'text/plain') {
+ public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = 'text/plain')
+ {
return self::putObject($string, $bucket, $uri, $acl, $metaHeaders, $contentType);
}
@@ -385,9 +580,11 @@ public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_
* @param mixed $saveTo Filename or resource to write to
* @return mixed
*/
- public static function getObject($bucket, $uri, $saveTo = false) {
- $rest = new S3Request('GET', $bucket, $uri);
- if ($saveTo !== false) {
+ public static function getObject($bucket, $uri, $saveTo = false)
+ {
+ $rest = new S3Request('GET', $bucket, $uri, self::$endpoint);
+ if ($saveTo !== false)
+ {
if (is_resource($saveTo))
$rest->fp =& $saveTo;
else
@@ -400,9 +597,10 @@ public static function getObject($bucket, $uri, $saveTo = false) {
if ($rest->response->error === false && $rest->response->code !== 200)
$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
- if ($rest->response->error !== false) {
- trigger_error(sprintf("S3::getObject({$bucket}, {$uri}): [%s] %s",
- $rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
+ if ($rest->response->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getObject({$bucket}, {$uri}): [%s] %s",
+ $rest->response->error['code'], $rest->response->error['message']), __FILE__, __LINE__);
return false;
}
return $rest->response;
@@ -417,14 +615,16 @@ public static function getObject($bucket, $uri, $saveTo = false) {
* @param boolean $returnInfo Return response information
* @return mixed | false
*/
- public static function getObjectInfo($bucket, $uri, $returnInfo = true) {
- $rest = new S3Request('HEAD', $bucket, $uri);
+ public static function getObjectInfo($bucket, $uri, $returnInfo = true)
+ {
+ $rest = new S3Request('HEAD', $bucket, $uri, self::$endpoint);
$rest = $rest->getResponse();
if ($rest->error === false && ($rest->code !== 200 && $rest->code !== 404))
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::getObjectInfo({$bucket}, {$uri}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getObjectInfo({$bucket}, {$uri}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return $rest->code == 200 ? $returnInfo ? $rest->headers : true : false;
@@ -439,18 +639,31 @@ public static function getObjectInfo($bucket, $uri, $returnInfo = true) {
* @param string $bucket Destination bucket name
* @param string $uri Destination object URI
* @param constant $acl ACL constant
+ * @param array $metaHeaders Optional array of x-amz-meta-* headers
+ * @param array $requestHeaders Optional array of request headers (content type, disposition, etc.)
+ * @param constant $storageClass Storage class constant
* @return mixed | false
*/
- public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = self::ACL_PRIVATE) {
- $rest = new S3Request('PUT', $bucket, $uri);
+ public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array(), $storageClass = self::STORAGE_CLASS_STANDARD)
+ {
+ $rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
+ $rest->setHeader('Content-Length', 0);
+ foreach ($requestHeaders as $h => $v) $rest->setHeader($h, $v);
+ foreach ($metaHeaders as $h => $v) $rest->setAmzHeader('x-amz-meta-'.$h, $v);
+ if ($storageClass !== self::STORAGE_CLASS_STANDARD) // Storage class
+ $rest->setAmzHeader('x-amz-storage-class', $storageClass);
$rest->setAmzHeader('x-amz-acl', $acl);
- $rest->setAmzHeader('x-amz-copy-source', sprintf('/%s/%s', $srcBucket, $srcUri));
+ $rest->setAmzHeader('x-amz-copy-source', sprintf('/%s/%s', $srcBucket, rawurlencode($srcUri)));
+ if (sizeof($requestHeaders) > 0 || sizeof($metaHeaders) > 0)
+ $rest->setAmzHeader('x-amz-metadata-directive', 'REPLACE');
+
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::copyObject({$srcBucket}, {$srcUri}, {$bucket}, {$uri}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::copyObject({$srcBucket}, {$srcUri}, {$bucket}, {$uri}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return isset($rest->body->LastModified, $rest->body->ETag) ? array(
@@ -468,14 +681,17 @@ public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = sel
* @param string $targetPrefix Log prefix (e,g; domain.com-)
* @return boolean
*/
- public static function setBucketLogging($bucket, $targetBucket, $targetPrefix = null) {
+ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix = null)
+ {
// The S3 log delivery group has to be added to the target bucket's ACP
- if ($targetBucket !== null && ($acp = self::getAccessControlPolicy($targetBucket, '')) !== false) {
+ if ($targetBucket !== null && ($acp = self::getAccessControlPolicy($targetBucket, '')) !== false)
+ {
// Only add permissions to the target bucket when they do not exist
$aclWriteSet = false;
$aclReadSet = false;
foreach ($acp['acl'] as $acl)
- if ($acl['type'] == 'Group' && $acl['uri'] == 'http://acs.amazonaws.com/groups/s3/LogDelivery') {
+ if ($acl['type'] == 'Group' && $acl['uri'] == 'http://acs.amazonaws.com/groups/s3/LogDelivery')
+ {
if ($acl['permission'] == 'WRITE') $aclWriteSet = true;
elseif ($acl['permission'] == 'READ_ACP') $aclReadSet = true;
}
@@ -491,7 +707,8 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
$dom = new DOMDocument;
$bucketLoggingStatus = $dom->createElement('BucketLoggingStatus');
$bucketLoggingStatus->setAttribute('xmlns', 'http://s3.amazonaws.com/doc/2006-03-01/');
- if ($targetBucket !== null) {
+ if ($targetBucket !== null)
+ {
if ($targetPrefix == null) $targetPrefix = $bucket . '-';
$loggingEnabled = $dom->createElement('LoggingEnabled');
$loggingEnabled->appendChild($dom->createElement('TargetBucket', $targetBucket));
@@ -501,7 +718,7 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
}
$dom->appendChild($bucketLoggingStatus);
- $rest = new S3Request('PUT', $bucket, '');
+ $rest = new S3Request('PUT', $bucket, '', self::$endpoint);
$rest->setParameter('logging', null);
$rest->data = $dom->saveXML();
$rest->size = strlen($rest->data);
@@ -509,9 +726,10 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::setBucketLogging({$bucket}, {$uri}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::setBucketLogging({$bucket}, {$targetBucket}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -527,15 +745,17 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
* @param string $bucket Bucket name
* @return array | false
*/
- public static function getBucketLogging($bucket) {
- $rest = new S3Request('GET', $bucket, '');
+ public static function getBucketLogging($bucket)
+ {
+ $rest = new S3Request('GET', $bucket, '', self::$endpoint);
$rest->setParameter('logging', null);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::getBucketLogging({$bucket}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getBucketLogging({$bucket}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
if (!isset($rest->body->LoggingEnabled)) return false; // No logging
@@ -552,7 +772,8 @@ public static function getBucketLogging($bucket) {
* @param string $bucket Bucket name
* @return boolean
*/
- public static function disableBucketLogging($bucket) {
+ public static function disableBucketLogging($bucket)
+ {
return self::setBucketLogging($bucket, null);
}
@@ -563,15 +784,17 @@ public static function disableBucketLogging($bucket) {
* @param string $bucket Bucket name
* @return string | false
*/
- public static function getBucketLocation($bucket) {
- $rest = new S3Request('GET', $bucket, '');
+ public static function getBucketLocation($bucket)
+ {
+ $rest = new S3Request('GET', $bucket, '', self::$endpoint);
$rest->setParameter('location', null);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::getBucketLocation({$bucket}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getBucketLocation({$bucket}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return (isset($rest->body[0]) && (string)$rest->body[0] !== '') ? (string)$rest->body[0] : 'US';
@@ -586,7 +809,8 @@ public static function getBucketLocation($bucket) {
* @param array $acp Access Control Policy Data (same as the data returned from getAccessControlPolicy)
* @return boolean
*/
- public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()) {
+ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array())
+ {
$dom = new DOMDocument;
$dom->formatOutput = true;
$accessControlPolicy = $dom->createElement('AccessControlPolicy');
@@ -598,17 +822,23 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
$owner->appendChild($dom->createElement('DisplayName', $acp['owner']['name']));
$accessControlPolicy->appendChild($owner);
- foreach ($acp['acl'] as $g) {
+ foreach ($acp['acl'] as $g)
+ {
$grant = $dom->createElement('Grant');
$grantee = $dom->createElement('Grantee');
$grantee->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
- if (isset($g['id'])) { // CanonicalUser (DisplayName is omitted)
+ if (isset($g['id']))
+ { // CanonicalUser (DisplayName is omitted)
$grantee->setAttribute('xsi:type', 'CanonicalUser');
$grantee->appendChild($dom->createElement('ID', $g['id']));
- } elseif (isset($g['email'])) { // AmazonCustomerByEmail
+ }
+ elseif (isset($g['email']))
+ { // AmazonCustomerByEmail
$grantee->setAttribute('xsi:type', 'AmazonCustomerByEmail');
$grantee->appendChild($dom->createElement('EmailAddress', $g['email']));
- } elseif ($g['type'] == 'Group') { // Group
+ }
+ elseif ($g['type'] == 'Group')
+ { // Group
$grantee->setAttribute('xsi:type', 'Group');
$grantee->appendChild($dom->createElement('URI', $g['uri']));
}
@@ -620,7 +850,7 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
$accessControlPolicy->appendChild($accessControlList);
$dom->appendChild($accessControlPolicy);
- $rest = new S3Request('PUT', $bucket, $uri);
+ $rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
$rest->setParameter('acl', null);
$rest->data = $dom->saveXML();
$rest->size = strlen($rest->data);
@@ -628,9 +858,10 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::setAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::setAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -644,28 +875,33 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
* @param string $uri Object URI
* @return mixed | false
*/
- public static function getAccessControlPolicy($bucket, $uri = '') {
- $rest = new S3Request('GET', $bucket, $uri);
+ public static function getAccessControlPolicy($bucket, $uri = '')
+ {
+ $rest = new S3Request('GET', $bucket, $uri, self::$endpoint);
$rest->setParameter('acl', null);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::getAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
$acp = array();
- if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName)) {
+ if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName))
$acp['owner'] = array(
'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->DisplayName
);
- }
- if (isset($rest->body->AccessControlList)) {
+
+ if (isset($rest->body->AccessControlList))
+ {
$acp['acl'] = array();
- foreach ($rest->body->AccessControlList->Grant as $grant) {
- foreach ($grant->Grantee as $grantee) {
+ foreach ($rest->body->AccessControlList->Grant as $grant)
+ {
+ foreach ($grant->Grantee as $grantee)
+ {
if (isset($grantee->ID, $grantee->DisplayName)) // CanonicalUser
$acp['acl'][] = array(
'type' => 'CanonicalUser',
@@ -700,14 +936,16 @@ public static function getAccessControlPolicy($bucket, $uri = '') {
* @param string $uri Object URI
* @return boolean
*/
- public static function deleteObject($bucket, $uri) {
- $rest = new S3Request('DELETE', $bucket, $uri);
+ public static function deleteObject($bucket, $uri)
+ {
+ $rest = new S3Request('DELETE', $bucket, $uri, self::$endpoint);
$rest = $rest->getResponse();
if ($rest->error === false && $rest->code !== 204)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::deleteObject(): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::deleteObject(): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -724,37 +962,169 @@ public static function deleteObject($bucket, $uri) {
* @param boolean $https Use HTTPS ($hostBucket should be false for SSL verification)
* @return string
*/
- public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false) {
+ public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false)
+ {
$expires = time() + $lifetime;
- $uri = str_replace('%2F', '/', rawurlencode($uri)); // URI should be encoded (thanks Sean O'Dea)
+ $uri = str_replace(array('%2F', '%2B'), array('/', '+'), rawurlencode($uri));
return sprintf(($https ? 'https' : 'http').'://%s/%s?AWSAccessKeyId=%s&Expires=%u&Signature=%s',
- $hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
+ // $hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
+ $hostBucket ? $bucket : 's3.amazonaws.com/'.$bucket, $uri, self::$__accessKey, $expires,
urlencode(self::__getHash("GET\n\n\n{$expires}\n/{$bucket}/{$uri}")));
}
/**
+ * Get a CloudFront signed policy URL
+ *
+ * @param array $policy Policy
+ * @return string
+ */
+ public static function getSignedPolicyURL($policy)
+ {
+ $data = json_encode($policy);
+ $signature = '';
+ if (!openssl_sign($data, $signature, self::$__signingKeyResource)) return false;
+
+ $encoded = str_replace(array('+', '='), array('-', '_', '~'), base64_encode($data));
+ $signature = str_replace(array('+', '='), array('-', '_', '~'), base64_encode($signature));
+
+ $url = $policy['Statement'][0]['Resource'] . '?';
+ foreach (array('Policy' => $encoded, 'Signature' => $signature, 'Key-Pair-Id' => self::$__signingKeyPairId) as $k => $v)
+ $url .= $k.'='.str_replace('%2F', '/', rawurlencode($v)).'&';
+ return substr($url, 0, -1);
+ }
+
+
+ /**
+ * Get a CloudFront canned policy URL
+ *
+ * @param string $string URL to sign
+ * @param integer $lifetime URL lifetime
+ * @return string
+ */
+ public static function getSignedCannedURL($url, $lifetime)
+ {
+ return self::getSignedPolicyURL(array(
+ 'Statement' => array(
+ array('Resource' => $url, 'Condition' => array(
+ 'DateLessThan' => array('AWS:EpochTime' => time() + $lifetime)
+ ))
+ )
+ ));
+ }
+
+
+ /**
+ * Get upload POST parameters for form uploads
+ *
+ * @param string $bucket Bucket name
+ * @param string $uriPrefix Object URI prefix
+ * @param constant $acl ACL constant
+ * @param integer $lifetime Lifetime in seconds
+ * @param integer $maxFileSize Maximum filesize in bytes (default 5MB)
+ * @param string $successRedirect Redirect URL or 200 / 201 status code
+ * @param array $amzHeaders Array of x-amz-meta-* headers
+ * @param array $headers Array of request headers or content type as a string
+ * @param boolean $flashVars Includes additional "Filename" variable posted by Flash
+ * @return object
+ */
+ public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl = self::ACL_PRIVATE, $lifetime = 3600,
+ $maxFileSize = 5242880, $successRedirect = "201", $amzHeaders = array(), $headers = array(), $flashVars = false)
+ {
+ // Create policy object
+ $policy = new stdClass;
+ $policy->expiration = gmdate('Y-m-d\TH:i:s\Z', (time() + $lifetime));
+ $policy->conditions = array();
+ $obj = new stdClass; $obj->bucket = $bucket; array_push($policy->conditions, $obj);
+ $obj = new stdClass; $obj->acl = $acl; array_push($policy->conditions, $obj);
+
+ $obj = new stdClass; // 200 for non-redirect uploads
+ if (is_numeric($successRedirect) && in_array((int)$successRedirect, array(200, 201)))
+ $obj->success_action_status = (string)$successRedirect;
+ else // URL
+ $obj->success_action_redirect = $successRedirect;
+ array_push($policy->conditions, $obj);
+
+ if ($acl !== self::ACL_PUBLIC_READ)
+ array_push($policy->conditions, array('eq', '$acl', $acl));
+
+ array_push($policy->conditions, array('starts-with', '$key', $uriPrefix));
+ if ($flashVars) array_push($policy->conditions, array('starts-with', '$Filename', ''));
+ foreach (array_keys($headers) as $headerKey)
+ array_push($policy->conditions, array('starts-with', '$'.$headerKey, ''));
+ foreach ($amzHeaders as $headerKey => $headerVal)
+ {
+ $obj = new stdClass;
+ $obj->{$headerKey} = (string)$headerVal;
+ array_push($policy->conditions, $obj);
+ }
+ array_push($policy->conditions, array('content-length-range', 0, $maxFileSize));
+ $policy = base64_encode(str_replace('\/', '/', json_encode($policy)));
+
+ // Create parameters
+ $params = new stdClass;
+ $params->AWSAccessKeyId = self::$__accessKey;
+ $params->key = $uriPrefix.'${filename}';
+ $params->acl = $acl;
+ $params->policy = $policy; unset($policy);
+ $params->signature = self::__getHash($params->policy);
+ if (is_numeric($successRedirect) && in_array((int)$successRedirect, array(200, 201)))
+ $params->success_action_status = (string)$successRedirect;
+ else
+ $params->success_action_redirect = $successRedirect;
+ foreach ($headers as $headerKey => $headerVal) $params->{$headerKey} = (string)$headerVal;
+ foreach ($amzHeaders as $headerKey => $headerVal) $params->{$headerKey} = (string)$headerVal;
+ return $params;
+ }
+
+
+ /**
* Create a CloudFront distribution
*
* @param string $bucket Bucket name
* @param boolean $enabled Enabled (true/false)
* @param array $cnames Array containing CNAME aliases
* @param string $comment Use the bucket name as the hostname
+ * @param string $defaultRootObject Default root object
+ * @param string $originAccessIdentity Origin access identity
+ * @param array $trustedSigners Array of trusted signers
* @return array | false
*/
- public static function createDistribution($bucket, $enabled = true, $cnames = array(), $comment = '') {
+ public static function createDistribution($bucket, $enabled = true, $cnames = array(), $comment = null, $defaultRootObject = null, $originAccessIdentity = null, $trustedSigners = array())
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", [], '$comment'): %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+ $useSSL = self::$useSSL;
+
self::$useSSL = true; // CloudFront requires SSL
- $rest = new S3Request('POST', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
- $rest->data = self::__getCloudFrontDistributionConfigXML($bucket.'.s3.amazonaws.com', $enabled, $comment, (string)microtime(true), $cnames);
+ $rest = new S3Request('POST', '', '2010-11-01/distribution', 'cloudfront.amazonaws.com');
+ $rest->data = self::__getCloudFrontDistributionConfigXML(
+ $bucket.'.s3.amazonaws.com',
+ $enabled,
+ (string)$comment,
+ (string)microtime(true),
+ $cnames,
+ $defaultRootObject,
+ $originAccessIdentity,
+ $trustedSigners
+ );
+
$rest->size = strlen($rest->data);
$rest->setHeader('Content-Type', 'application/xml');
$rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
if ($rest->error === false && $rest->code !== 201)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", '$comment'): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", [], '$comment'): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
} elseif ($rest->body instanceof SimpleXMLElement)
return self::__parseCloudFrontDistributionConfig($rest->body);
@@ -768,20 +1138,35 @@ public static function createDistribution($bucket, $enabled = true, $cnames = ar
* @param string $distributionId Distribution ID from listDistributions()
* @return array | false
*/
- public static function getDistribution($distributionId) {
+ public static function getDistribution($distributionId)
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::getDistribution($distributionId): %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+ $useSSL = self::$useSSL;
+
self::$useSSL = true; // CloudFront requires SSL
- $rest = new S3Request('GET', '', '2008-06-30/distribution/'.$distributionId, 'cloudfront.amazonaws.com');
+ $rest = new S3Request('GET', '', '2010-11-01/distribution/'.$distributionId, 'cloudfront.amazonaws.com');
$rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::getDistribution($distributionId): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::getDistribution($distributionId): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
- } elseif ($rest->body instanceof SimpleXMLElement) {
+ }
+ elseif ($rest->body instanceof SimpleXMLElement)
+ {
$dist = self::__parseCloudFrontDistributionConfig($rest->body);
$dist['hash'] = $rest->headers['hash'];
+ $dist['id'] = $distributionId;
return $dist;
}
return false;
@@ -794,19 +1179,42 @@ public static function getDistribution($distributionId) {
* @param array $dist Distribution array info identical to output of getDistribution()
* @return array | false
*/
- public static function updateDistribution($dist) {
+ public static function updateDistribution($dist)
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::updateDistribution({$dist['id']}): %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ $useSSL = self::$useSSL;
+
self::$useSSL = true; // CloudFront requires SSL
- $rest = new S3Request('PUT', '', '2008-06-30/distribution/'.$dist['id'].'/config', 'cloudfront.amazonaws.com');
- $rest->data = self::__getCloudFrontDistributionConfigXML($dist['origin'], $dist['enabled'], $dist['comment'], $dist['callerReference'], $dist['cnames']);
+ $rest = new S3Request('PUT', '', '2010-11-01/distribution/'.$dist['id'].'/config', 'cloudfront.amazonaws.com');
+ $rest->data = self::__getCloudFrontDistributionConfigXML(
+ $dist['origin'],
+ $dist['enabled'],
+ $dist['comment'],
+ $dist['callerReference'],
+ $dist['cnames'],
+ $dist['defaultRootObject'],
+ $dist['originAccessIdentity'],
+ $dist['trustedSigners']
+ );
+
$rest->size = strlen($rest->data);
$rest->setHeader('If-Match', $dist['hash']);
$rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::updateDistribution({$dist['id']}, ".(int)$enabled.", '$comment'): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::updateDistribution({$dist['id']}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
} else {
$dist = self::__parseCloudFrontDistributionConfig($rest->body);
@@ -823,17 +1231,30 @@ public static function updateDistribution($dist) {
* @param array $dist Distribution array info identical to output of getDistribution()
* @return boolean
*/
- public static function deleteDistribution($dist) {
+ public static function deleteDistribution($dist)
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::deleteDistribution({$dist['id']}): %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ $useSSL = self::$useSSL;
+
self::$useSSL = true; // CloudFront requires SSL
$rest = new S3Request('DELETE', '', '2008-06-30/distribution/'.$dist['id'], 'cloudfront.amazonaws.com');
$rest->setHeader('If-Match', $dist['hash']);
$rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
if ($rest->error === false && $rest->code !== 204)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::deleteDistribution({$dist['id']}): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::deleteDistribution({$dist['id']}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
}
return true;
@@ -845,27 +1266,189 @@ public static function deleteDistribution($dist) {
*
* @return array
*/
- public static function listDistributions() {
+ public static function listDistributions()
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::listDistributions(): [%s] %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ $useSSL = self::$useSSL;
self::$useSSL = true; // CloudFront requires SSL
- $rest = new S3Request('GET', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
+ $rest = new S3Request('GET', '', '2010-11-01/distribution', 'cloudfront.amazonaws.com');
$rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
if ($rest->error === false && $rest->code !== 200)
$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
- if ($rest->error !== false) {
- trigger_error(sprintf("S3::listDistributions(): [%s] %s",
- $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ if ($rest->error !== false)
+ {
+ self::__triggerError(sprintf("S3::listDistributions(): [%s] %s",
+ $rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
return false;
- } elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->DistributionSummary)) {
+ }
+ elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->DistributionSummary))
+ {
$list = array();
- if (isset($rest->body->Marker, $rest->body->MaxItems, $rest->body->IsTruncated)) {
+ if (isset($rest->body->Marker, $rest->body->MaxItems, $rest->body->IsTruncated))
+ {
//$info['marker'] = (string)$rest->body->Marker;
//$info['maxItems'] = (int)$rest->body->MaxItems;
//$info['isTruncated'] = (string)$rest->body->IsTruncated == 'true' ? true : false;
}
- foreach ($rest->body->DistributionSummary as $summary) {
+ foreach ($rest->body->DistributionSummary as $summary)
$list[(string)$summary->Id] = self::__parseCloudFrontDistributionConfig($summary);
- }
+
+ return $list;
+ }
+ return array();
+ }
+
+ /**
+ * List CloudFront Origin Access Identities
+ *
+ * @return array
+ */
+ public static function listOriginAccessIdentities()
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::listOriginAccessIdentities(): [%s] %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ self::$useSSL = true; // CloudFront requires SSL
+ $rest = new S3Request('GET', '', '2010-11-01/origin-access-identity/cloudfront', 'cloudfront.amazonaws.com');
+ $rest = self::__getCloudFrontResponse($rest);
+ $useSSL = self::$useSSL;
+
+ if ($rest->error === false && $rest->code !== 200)
+ $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+ if ($rest->error !== false)
+ {
+ trigger_error(sprintf("S3::listOriginAccessIdentities(): [%s] %s",
+ $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ return false;
+ }
+
+ if (isset($rest->body->CloudFrontOriginAccessIdentitySummary))
+ {
+ $identities = array();
+ foreach ($rest->body->CloudFrontOriginAccessIdentitySummary as $identity)
+ if (isset($identity->S3CanonicalUserId))
+ $identities[(string)$identity->Id] = array('id' => (string)$identity->Id, 's3CanonicalUserId' => (string)$identity->S3CanonicalUserId);
+ return $identities;
+ }
+ return false;
+ }
+
+
+ /**
+ * Invalidate objects in a CloudFront distribution
+ *
+ * Thanks to Martin Lindkvist for S3::invalidateDistribution()
+ *
+ * @param string $distributionId Distribution ID from listDistributions()
+ * @param array $paths Array of object paths to invalidate
+ * @return boolean
+ */
+ public static function invalidateDistribution($distributionId, $paths)
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::invalidateDistribution(): [%s] %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ $useSSL = self::$useSSL;
+ self::$useSSL = true; // CloudFront requires SSL
+ $rest = new S3Request('POST', '', '2010-08-01/distribution/'.$distributionId.'/invalidation', 'cloudfront.amazonaws.com');
+ $rest->data = self::__getCloudFrontInvalidationBatchXML($paths, (string)microtime(true));
+ $rest->size = strlen($rest->data);
+ $rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
+ if ($rest->error === false && $rest->code !== 201)
+ $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+ if ($rest->error !== false)
+ {
+ trigger_error(sprintf("S3::invalidate('{$distributionId}',{$paths}): [%s] %s",
+ $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ return false;
+ }
+ return true;
+ }
+
+
+ /**
+ * Get a InvalidationBatch DOMDocument
+ *
+ * @internal Used to create XML in invalidateDistribution()
+ * @param array $paths Paths to objects to invalidateDistribution
+ * @return string
+ */
+ private static function __getCloudFrontInvalidationBatchXML($paths, $callerReference = '0') {
+ $dom = new DOMDocument('1.0', 'UTF-8');
+ $dom->formatOutput = true;
+ $invalidationBatch = $dom->createElement('InvalidationBatch');
+ foreach ($paths as $path)
+ $invalidationBatch->appendChild($dom->createElement('Path', $path));
+
+ $invalidationBatch->appendChild($dom->createElement('CallerReference', $callerReference));
+ $dom->appendChild($invalidationBatch);
+ return $dom->saveXML();
+ }
+
+
+ /**
+ * List your invalidation batches for invalidateDistribution() in a CloudFront distribution
+ *
+ * http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListInvalidation.html
+ * returned array looks like this:
+ * Array
+ * (
+ * [I31TWB0CN9V6XD] => InProgress
+ * [IT3TFE31M0IHZ] => Completed
+ * [I12HK7MPO1UQDA] => Completed
+ * [I1IA7R6JKTC3L2] => Completed
+ * )
+ *
+ * @param string $distributionId Distribution ID from listDistributions()
+ * @return array
+ */
+ public static function getDistributionInvalidationList($distributionId)
+ {
+ if (!extension_loaded('openssl'))
+ {
+ self::__triggerError(sprintf("S3::getDistributionInvalidationList(): [%s] %s",
+ "CloudFront functionality requires SSL"), __FILE__, __LINE__);
+ return false;
+ }
+
+ $useSSL = self::$useSSL;
+ self::$useSSL = true; // CloudFront requires SSL
+ $rest = new S3Request('GET', '', '2010-11-01/distribution/'.$distributionId.'/invalidation', 'cloudfront.amazonaws.com');
+ $rest = self::__getCloudFrontResponse($rest);
+ self::$useSSL = $useSSL;
+
+ if ($rest->error === false && $rest->code !== 200)
+ $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+ if ($rest->error !== false)
+ {
+ trigger_error(sprintf("S3::getDistributionInvalidationList('{$distributionId}'): [%s]",
+ $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+ return false;
+ }
+ elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->InvalidationSummary))
+ {
+ $list = array();
+ foreach ($rest->body->InvalidationSummary as $summary)
+ $list[(string)$summary->Id] = (string)$summary->Status;
+
return $list;
}
return array();
@@ -875,26 +1458,46 @@ public static function listDistributions() {
/**
* Get a DistributionConfig DOMDocument
*
+ * http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/index.html?PutConfig.html
+ *
* @internal Used to create XML in createDistribution() and updateDistribution()
- * @param string $bucket Origin bucket
+ * @param string $bucket S3 Origin bucket
* @param boolean $enabled Enabled (true/false)
* @param string $comment Comment to append
* @param string $callerReference Caller reference
* @param array $cnames Array of CNAME aliases
+ * @param string $defaultRootObject Default root object
+ * @param string $originAccessIdentity Origin access identity
+ * @param array $trustedSigners Array of trusted signers
* @return string
*/
- private static function __getCloudFrontDistributionConfigXML($bucket, $enabled, $comment, $callerReference = '0', $cnames = array()) {
+ private static function __getCloudFrontDistributionConfigXML($bucket, $enabled, $comment, $callerReference = '0', $cnames = array(), $defaultRootObject = null, $originAccessIdentity = null, $trustedSigners = array())
+ {
$dom = new DOMDocument('1.0', 'UTF-8');
$dom->formatOutput = true;
$distributionConfig = $dom->createElement('DistributionConfig');
- $distributionConfig->setAttribute('xmlns', 'http://cloudfront.amazonaws.com/doc/2008-06-30/');
- $distributionConfig->appendChild($dom->createElement('Origin', $bucket));
+ $distributionConfig->setAttribute('xmlns', 'http://cloudfront.amazonaws.com/doc/2010-11-01/');
+
+ $origin = $dom->createElement('S3Origin');
+ $origin->appendChild($dom->createElement('DNSName', $bucket));
+ if ($originAccessIdentity !== null) $origin->appendChild($dom->createElement('OriginAccessIdentity', $originAccessIdentity));
+ $distributionConfig->appendChild($origin);
+
+ if ($defaultRootObject !== null) $distributionConfig->appendChild($dom->createElement('DefaultRootObject', $defaultRootObject));
+
$distributionConfig->appendChild($dom->createElement('CallerReference', $callerReference));
foreach ($cnames as $cname)
$distributionConfig->appendChild($dom->createElement('CNAME', $cname));
if ($comment !== '') $distributionConfig->appendChild($dom->createElement('Comment', $comment));
$distributionConfig->appendChild($dom->createElement('Enabled', $enabled ? 'true' : 'false'));
+
+ $trusted = $dom->createElement('TrustedSigners');
+ foreach ($trustedSigners as $id => $type)
+ $trusted->appendChild($id !== '' ? $dom->createElement($type, $id) : $dom->createElement($type));
+ $distributionConfig->appendChild($trusted);
+
$dom->appendChild($distributionConfig);
+ //var_dump($dom->saveXML());
return $dom->saveXML();
}
@@ -902,32 +1505,61 @@ private static function __getCloudFrontDistributionConfigXML($bucket, $enabled,
/**
* Parse a CloudFront distribution config
*
+ * See http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/index.html?GetDistribution.html
+ *
* @internal Used to parse the CloudFront DistributionConfig node to an array
* @param object &$node DOMNode
* @return array
*/
- private static function __parseCloudFrontDistributionConfig(&$node) {
+ private static function __parseCloudFrontDistributionConfig(&$node)
+ {
+ if (isset($node->DistributionConfig))
+ return self::__parseCloudFrontDistributionConfig($node->DistributionConfig);
+
$dist = array();
- if (isset($node->Id, $node->Status, $node->LastModifiedTime, $node->DomainName)) {
+ if (isset($node->Id, $node->Status, $node->LastModifiedTime, $node->DomainName))
+ {
$dist['id'] = (string)$node->Id;
$dist['status'] = (string)$node->Status;
$dist['time'] = strtotime((string)$node->LastModifiedTime);
$dist['domain'] = (string)$node->DomainName;
}
+
if (isset($node->CallerReference))
$dist['callerReference'] = (string)$node->CallerReference;
- if (isset($node->Comment))
- $dist['comment'] = (string)$node->Comment;
- if (isset($node->Enabled, $node->Origin)) {
- $dist['origin'] = (string)$node->Origin;
+
+ if (isset($node->Enabled))
$dist['enabled'] = (string)$node->Enabled == 'true' ? true : false;
- } elseif (isset($node->DistributionConfig)) {
- $dist = array_merge($dist, self::__parseCloudFrontDistributionConfig($node->DistributionConfig));
- }
- if (isset($node->CNAME)) {
- $dist['cnames'] = array();
- foreach ($node->CNAME as $cname) $dist['cnames'][(string)$cname] = (string)$cname;
+
+ if (isset($node->S3Origin))
+ {
+ if (isset($node->S3Origin->DNSName))
+ $dist['origin'] = (string)$node->S3Origin->DNSName;
+
+ $dist['originAccessIdentity'] = isset($node->S3Origin->OriginAccessIdentity) ?
+ (string)$node->S3Origin->OriginAccessIdentity : null;
}
+
+ $dist['defaultRootObject'] = isset($node->DefaultRootObject) ? (string)$node->DefaultRootObject : null;
+
+ $dist['cnames'] = array();
+ if (isset($node->CNAME))
+ foreach ($node->CNAME as $cname)
+ $dist['cnames'][(string)$cname] = (string)$cname;
+
+ $dist['trustedSigners'] = array();
+ if (isset($node->TrustedSigners))
+ foreach ($node->TrustedSigners as $signer)
+ {
+ if (isset($signer->Self))
+ $dist['trustedSigners'][''] = 'Self';
+ elseif (isset($signer->KeyPairId))
+ $dist['trustedSigners'][(string)$signer->KeyPairId] = 'KeyPairId';
+ elseif (isset($signer->AwsAccountNumber))
+ $dist['trustedSigners'][(string)$signer->AwsAccountNumber] = 'AwsAccountNumber';
+ }
+
+ $dist['comment'] = isset($node->Comment) ? (string)$node->Comment : null;
return $dist;
}
@@ -939,14 +1571,17 @@ private static function __parseCloudFrontDistributionConfig(&$node) {
* @param object &$rest S3Request instance
* @return object
*/
- private static function __getCloudFrontResponse(&$rest) {
+ private static function __getCloudFrontResponse(&$rest)
+ {
$rest->getResponse();
if ($rest->response->error === false && isset($rest->response->body) &&
- is_string($rest->response->body) && substr($rest->response->body, 0, 5) == '<?xml') {
+ is_string($rest->response->body) && substr($rest->response->body, 0, 5) == '<?xml')
+ {
$rest->response->body = simplexml_load_string($rest->response->body);
// Grab CloudFront errors
if (isset($rest->response->body->Error, $rest->response->body->Error->Code,
- $rest->response->body->Error->Message)) {
+ $rest->response->body->Error->Message))
+ {
$rest->response->error = array(
'code' => (string)$rest->response->body->Error->Code,
'message' => (string)$rest->response->body->Error->Message
@@ -965,13 +1600,16 @@ private static function __getCloudFrontResponse(&$rest) {
* @param string &$file File path
* @return string
*/
- public static function __getMimeType(&$file) {
+ public static function __getMimeType(&$file)
+ {
$type = false;
// Fileinfo documentation says fileinfo_open() will use the
// MAGIC env var for the magic file
if (extension_loaded('fileinfo') && isset($_ENV['MAGIC']) &&
- ($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false) {
- if (($type = finfo_file($finfo, $file)) !== false) {
+ ($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false)
+ {
+ if (($type = finfo_file($finfo, $file)) !== false)
+ {
// Remove the charset and grab the last content-type
$type = explode(' ', str_replace('; charset=', ';charset=', $type));
$type = array_pop($type);
@@ -1001,7 +1639,7 @@ public static function __getMimeType(&$file) {
'avi' => 'video/x-msvideo', 'mpg' => 'video/mpeg', 'mpeg' => 'video/mpeg',
'mov' => 'video/quicktime', 'flv' => 'video/x-flv', 'php' => 'text/x-php'
);
- $ext = strToLower(pathInfo($file, PATHINFO_EXTENSION));
+ $ext = strtolower(pathInfo($file, PATHINFO_EXTENSION));
return isset($exts[$ext]) ? $exts[$ext] : 'application/octet-stream';
}
@@ -1013,7 +1651,8 @@ public static function __getMimeType(&$file) {
* @param string $string String to sign
* @return string
*/
- public static function __getSignature($string) {
+ public static function __getSignature($string)
+ {
return 'AWS '.self::$__accessKey.':'.self::__getHash($string);
}
@@ -1027,7 +1666,8 @@ public static function __getSignature($string) {
* @param string $string String to sign
* @return string
*/
- private static function __getHash($string) {
+ private static function __getHash($string)
+ {
return base64_encode(extension_loaded('hash') ?
hash_hmac('sha1', $string, self::$__secretKey, true) : pack('H*', sha1(
(str_pad(self::$__secretKey, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
@@ -1037,8 +1677,9 @@ private static function __getHash($string) {
}
-final class S3Request {
- private $verb, $bucket, $uri, $resource = '', $parameters = array(),
+final class S3Request
+{
+ private $endpoint, $verb, $bucket, $uri, $resource = '', $parameters = array(),
$amzHeaders = array(), $headers = array(
'Host' => '', 'Date' => '', 'Content-MD5' => '', 'Content-Type' => ''
);
@@ -1053,21 +1694,42 @@ private static function __getHash($string) {
* @param string $uri Object URI
* @return mixed
*/
- function __construct($verb, $bucket = '', $uri = '', $defaultHost = 's3.amazonaws.com') {
+ function __construct($verb, $bucket = '', $uri = '', $endpoint = 's3.amazonaws.com')
+ {
+ $this->endpoint = $endpoint;
$this->verb = $verb;
- $this->bucket = strtolower($bucket);
+ $this->bucket = $bucket;
$this->uri = $uri !== '' ? '/'.str_replace('%2F', '/', rawurlencode($uri)) : '/';
- if ($this->bucket !== '') {
- $this->headers['Host'] = $this->bucket.'.'.$defaultHost;
- $this->resource = '/'.$this->bucket.$this->uri;
- } else {
- $this->headers['Host'] = $defaultHost;
- //$this->resource = strlen($this->uri) > 1 ? '/'.$this->bucket.$this->uri : $this->uri;
+ //if ($this->bucket !== '')
+ // $this->resource = '/'.$this->bucket.$this->uri;
+ //else
+ // $this->resource = $this->uri;
+
+ if ($this->bucket !== '')
+ {
+ if ($this->__dnsBucketName($this->bucket))
+ {
+ $this->headers['Host'] = $this->bucket.'.'.$this->endpoint;
+ $this->resource = '/'.$this->bucket.$this->uri;
+ }
+ else
+ {
+ $this->headers['Host'] = $this->endpoint;
+ $this->uri = $this->uri;
+ if ($this->bucket !== '') $this->uri = '/'.$this->bucket.$this->uri;
+ $this->bucket = '';
+ $this->resource = $this->uri;
+ }
+ }
+ else
+ {
+ $this->headers['Host'] = $this->endpoint;
$this->resource = $this->uri;
}
- $this->headers['Date'] = gmdate('D, d M Y H:i:s T');
+
+ $this->headers['Date'] = gmdate('D, d M Y H:i:s T');
$this->response = new STDClass;
$this->response->error = false;
}
@@ -1080,7 +1742,8 @@ function __construct($verb, $bucket = '', $uri = '', $defaultHost = 's3.amazonaw
* @param string $value Value
* @return void
*/
- public function setParameter($key, $value) {
+ public function setParameter($key, $value)
+ {
$this->parameters[$key] = $value;
}
@@ -1092,7 +1755,8 @@ public function setParameter($key, $value) {
* @param string $value Value
* @return void
*/
- public function setHeader($key, $value) {
+ public function setHeader($key, $value)
+ {
$this->headers[$key] = $value;
}
@@ -1104,7 +1768,8 @@ public function setHeader($key, $value) {
* @param string $value Value
* @return void
*/
- public function setAmzHeader($key, $value) {
+ public function setAmzHeader($key, $value)
+ {
$this->amzHeaders[$key] = $value;
}
@@ -1114,13 +1779,14 @@ public function setAmzHeader($key, $value) {
*
* @return object | false
*/
- public function getResponse() {
+ public function getResponse()
+ {
$query = '';
- if (sizeof($this->parameters) > 0) {
+ if (sizeof($this->parameters) > 0)
+ {
$query = substr($this->uri, -1) !== '?' ? '?' : '&';
foreach ($this->parameters as $var => $value)
if ($value == null || $value == '') $query .= $var.'&';
- // Parameters should be encoded (thanks Sean O'Dea)
else $query .= $var.'='.rawurlencode($value).'&';
$query = substr($query, 0, -1);
$this->uri .= $query;
@@ -1128,24 +1794,39 @@ public function getResponse() {
if (array_key_exists('acl', $this->parameters) ||
array_key_exists('location', $this->parameters) ||
array_key_exists('torrent', $this->parameters) ||
+ array_key_exists('website', $this->parameters) ||
array_key_exists('logging', $this->parameters))
$this->resource .= $query;
}
- $url = ((S3::$useSSL && extension_loaded('openssl')) ?
- 'https://':'http://').$this->headers['Host'].$this->uri;
- //var_dump($this->bucket, $this->uri, $this->resource, $url);
+ $url = (S3::$useSSL ? 'https://' : 'http://') . ($this->headers['Host'] !== '' ? $this->headers['Host'] : $this->endpoint) . $this->uri;
+
+ //var_dump('bucket: ' . $this->bucket, 'uri: ' . $this->uri, 'resource: ' . $this->resource, 'url: ' . $url);
// Basic setup
$curl = curl_init();
curl_setopt($curl, CURLOPT_USERAGENT, 'S3/php');
- if (S3::$useSSL) {
- curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
+ if (S3::$useSSL)
+ {
+ // SSL Validation can now be optional for those with broken OpenSSL installations
+ curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, S3::$useSSLValidation ? 1 : 0);
+ curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, S3::$useSSLValidation ? 1 : 0);
+
+ if (S3::$sslKey !== null) curl_setopt($curl, CURLOPT_SSLKEY, S3::$sslKey);
+ if (S3::$sslCert !== null) curl_setopt($curl, CURLOPT_SSLCERT, S3::$sslCert);
+ if (S3::$sslCACert !== null) curl_setopt($curl, CURLOPT_CAINFO, S3::$sslCACert);
}
curl_setopt($curl, CURLOPT_URL, $url);
+ if (S3::$proxy != null && isset(S3::$proxy['host']))
+ {
+ curl_setopt($curl, CURLOPT_PROXY, S3::$proxy['host']);
+ curl_setopt($curl, CURLOPT_PROXYTYPE, S3::$proxy['type']);
+ if (isset(S3::$proxy['user'], S3::$proxy['pass']) && S3::$proxy['user'] != null && S3::$proxy['pass'] != null)
+ curl_setopt($curl, CURLOPT_PROXYUSERPWD, sprintf('%s:%s', S3::$proxy['user'], S3::$proxy['pass']));
+ }
+
// Headers
$headers = array(); $amz = array();
foreach ($this->amzHeaders as $header => $value)
@@ -1155,20 +1836,32 @@ public function getResponse() {
// Collect AMZ headers for signature
foreach ($this->amzHeaders as $header => $value)
- if (strlen($value) > 0) $amz[] = strToLower($header).':'.$value;
+ if (strlen($value) > 0) $amz[] = strtolower($header).':'.$value;
// AMZ headers must be sorted
- if (sizeof($amz) > 0) {
- sort($amz);
+ if (sizeof($amz) > 0)
+ {
+ //sort($amz);
+ usort($amz, array(&$this, '__sortMetaHeadersCmp'));
$amz = "\n".implode("\n", $amz);
} else $amz = '';
- // Authorization string (CloudFront stringToSign should only contain a date)
- $headers[] = 'Authorization: ' . S3::__getSignature(
- $this->headers['Host'] == 'cloudfront.amazonaws.com' ? $this->headers['Date'] :
- $this->verb."\n".$this->headers['Content-MD5']."\n".
- $this->headers['Content-Type']."\n".$this->headers['Date'].$amz."\n".$this->resource
- );
+ if (S3::hasAuth())
+ {
+ // Authorization string (CloudFront stringToSign should only contain a date)
+ if ($this->headers['Host'] == 'cloudfront.amazonaws.com')
+ $headers[] = 'Authorization: ' . S3::__getSignature($this->headers['Date']);
+ else
+ {
+ $headers[] = 'Authorization: ' . S3::__getSignature(
+ $this->verb."\n".
+ $this->headers['Content-MD5']."\n".