Reorganise code to build URLS for S3 stuff - we now delay building an S3 url until the last minute

Add support for S3 over HTTPS
Added a couple of new constants for access policies

@@ -60,15 +60,12 @@
 // Use for deleting buckets - they must be empty for this to succeed
 // Use for deleting buckets - they must be empty for this to succeed
 + (id)DELETERequestWithBucket:(NSString *)bucket;
 + (id)DELETERequestWithBucket:(NSString *)bucket;
 
 
-//Builds a query string out of the list parameters we supplied
-- (void)createQueryString;
-
-@property (retain) NSString *bucket;
-@property (retain) NSString *subResource;
-@property (retain) NSString *prefix;
-@property (retain) NSString *marker;
-@property (assign) int maxResultCount;
-@property (retain) NSString *delimiter;	
+@property (retain, nonatomic) NSString *bucket;
+@property (retain, nonatomic) NSString *subResource;
+@property (retain, nonatomic) NSString *prefix;
+@property (retain, nonatomic) NSString *marker;
+@property (assign, nonatomic) int maxResultCount;
+@property (retain, nonatomic) NSString *delimiter;
 @property (retain, readonly) NSMutableArray *objects;
 @property (retain, readonly) NSMutableArray *objects;
 @property (retain, readonly) NSMutableArray *commonPrefixes;
 @property (retain, readonly) NSMutableArray *commonPrefixes;
 @property (assign, readonly) BOOL isTruncated;
 @property (assign, readonly) BOOL isTruncated;

@@ -30,20 +30,19 @@
 
 
 + (id)requestWithBucket:(NSString *)bucket
 + (id)requestWithBucket:(NSString *)bucket
 {
 {
-	ASIS3BucketRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com",bucket]]] autorelease];
+	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	[request setBucket:bucket];
 	[request setBucket:bucket];
 	return request;
 	return request;
 }
 }
 
 
 + (id)requestWithBucket:(NSString *)bucket subResource:(NSString *)subResource
 + (id)requestWithBucket:(NSString *)bucket subResource:(NSString *)subResource
 {
 {
-	ASIS3BucketRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com/?%@",bucket,subResource]]] autorelease];
+	ASIS3BucketRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	[request setBucket:bucket];
 	[request setBucket:bucket];
 	[request setSubResource:subResource];
 	[request setSubResource:subResource];
 	return request;
 	return request;
 }
 }
 
 
-
 + (id)PUTRequestWithBucket:(NSString *)bucket
 + (id)PUTRequestWithBucket:(NSString *)bucket
 {
 {
 	ASIS3BucketRequest *request = [self requestWithBucket:bucket];
 	ASIS3BucketRequest *request = [self requestWithBucket:bucket];
@@ -80,8 +79,14 @@
 	return [NSString stringWithFormat:@"/%@/",[self bucket]];
 	return [NSString stringWithFormat:@"/%@/",[self bucket]];
 }
 }
 
 
-- (void)createQueryString
+- (void)buildURL
 {
 {
+	NSString *baseURL;
+	if ([self subResource]) {
+		baseURL = [NSString stringWithFormat:@"%@://%@.%@/?%@",[self requestScheme],[self bucket],[[self class] S3Host],[self subResource]];
+	} else {
+		baseURL = [NSString stringWithFormat:@"%@://%@.%@",[self requestScheme],[self bucket],[[self class] S3Host]];
+	}
 	NSMutableArray *queryParts = [[[NSMutableArray alloc] init] autorelease];
 	NSMutableArray *queryParts = [[[NSMutableArray alloc] init] autorelease];
 	if ([self prefix]) {
 	if ([self prefix]) {
 		[queryParts addObject:[NSString stringWithFormat:@"prefix=%@",[[self prefix] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 		[queryParts addObject:[NSString stringWithFormat:@"prefix=%@",[[self prefix] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
@@ -95,20 +100,16 @@
 	if ([self maxResultCount] > 0) {
 	if ([self maxResultCount] > 0) {
 		[queryParts addObject:[NSString stringWithFormat:@"max-keys=%hi",[self maxResultCount]]];
 		[queryParts addObject:[NSString stringWithFormat:@"max-keys=%hi",[self maxResultCount]]];
 	}
 	}
-	if ([queryParts count]) 
-    {
+	if ([queryParts count]) {
 		NSString* template = @"%@?%@";
 		NSString* template = @"%@?%@";
 		if ([[self subResource] length] > 0) {
 		if ([[self subResource] length] > 0) {
 			template = @"%@&%@";
 			template = @"%@&%@";
 		}
 		}
-		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:template,[[self url] absoluteString],[queryParts componentsJoinedByString:@"&"]]]];
-	}
-}
+		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:template,baseURL,[queryParts componentsJoinedByString:@"&"]]]];
+	} else {
+		[self setURL:[NSURL URLWithString:baseURL]];
 
 
-- (void)main
-{
-	[self createQueryString];
-	[super main];
+	}
 }
 }
 
 
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
@@ -146,7 +147,6 @@
 	}
 	}
 }
 }
 
 
-
 #pragma mark NSCopying
 #pragma mark NSCopying
 
 
 - (id)copyWithZone:(NSZone *)zone
 - (id)copyWithZone:(NSZone *)zone
@@ -161,9 +161,6 @@
 	return newRequest;
 	return newRequest;
 }
 }
 
 
-
-
-
 @synthesize bucket;
 @synthesize bucket;
 @synthesize subResource;
 @synthesize subResource;
 @synthesize currentObject;
 @synthesize currentObject;

@@ -60,11 +60,11 @@
 // Creates a HEAD request for the object at path
 // Creates a HEAD request for the object at path
 + (id)HEADRequestWithBucket:(NSString *)bucket key:(NSString *)key;
 + (id)HEADRequestWithBucket:(NSString *)bucket key:(NSString *)key;
 
 
-@property (retain) NSString *bucket;
-@property (retain) NSString *key;
-@property (retain) NSString *sourceBucket;
-@property (retain) NSString *sourceKey;
+@property (retain, nonatomic) NSString *bucket;
+@property (retain, nonatomic) NSString *key;
+@property (retain, nonatomic) NSString *sourceBucket;
+@property (retain, nonatomic) NSString *sourceKey;
 @property (retain, nonatomic) NSString *mimeType;
 @property (retain, nonatomic) NSString *mimeType;
-@property (retain) NSString *subResource;
+@property (retain, nonatomic) NSString *subResource;
 
 
 @end
 @end

@@ -21,8 +21,7 @@
 
 
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key
 {
 {
-	NSString *path = [ASIS3Request stringByURLEncodingForS3Path:key];
-	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com%@",bucket,path]]] autorelease];
+	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	[request setBucket:bucket];
 	[request setBucket:bucket];
 	[request setKey:key];
 	[request setKey:key];
 	return request;
 	return request;
@@ -30,8 +29,7 @@
 
 
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource
 + (id)requestWithBucket:(NSString *)bucket key:(NSString *)key subResource:(NSString *)subResource
 {
 {
-	NSString *path = [ASIS3Request stringByURLEncodingForS3Path:key];
-	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.s3.amazonaws.com%@?%@",bucket,path,subResource]]] autorelease];
+	ASIS3ObjectRequest *request = [[[self alloc] initWithURL:nil] autorelease];
 	[request setSubResource:subResource];
 	[request setSubResource:subResource];
 	[request setBucket:bucket];
 	[request setBucket:bucket];
 	[request setKey:key];
 	[request setKey:key];
@@ -79,8 +77,6 @@
 	return request;
 	return request;
 }
 }
 
 
-
-
 - (id)copyWithZone:(NSZone *)zone
 - (id)copyWithZone:(NSZone *)zone
 {
 {
 	ASIS3ObjectRequest *newRequest = [super copyWithZone:zone];
 	ASIS3ObjectRequest *newRequest = [super copyWithZone:zone];
@@ -103,6 +99,15 @@
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 
+- (void)buildURL
+{
+	if ([self subResource]) {
+		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.%@%@?%@",[self requestScheme],[[self class] S3Host],[ASIS3Request stringByURLEncodingForS3Path:[self key]],[self subResource]]]];
+	} else {
+		[self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.%@%@",[self requestScheme],[self bucket],[[self class] S3Host],[ASIS3Request stringByURLEncodingForS3Path:[self key]]]]];
+	}
+}
+
 - (NSString *)mimeType
 - (NSString *)mimeType
 {
 {
 	if (mimeType) {
 	if (mimeType) {

@@ -18,15 +18,18 @@
 // See http://docs.amazonwebservices.com/AmazonS3/2006-03-01/index.html?RESTAccessPolicy.html for what these mean
 // See http://docs.amazonwebservices.com/AmazonS3/2006-03-01/index.html?RESTAccessPolicy.html for what these mean
 extern NSString *const ASIS3AccessPolicyPrivate; // This is the default in S3 when no access policy header is provided
 extern NSString *const ASIS3AccessPolicyPrivate; // This is the default in S3 when no access policy header is provided
 extern NSString *const ASIS3AccessPolicyPublicRead;
 extern NSString *const ASIS3AccessPolicyPublicRead;
-extern NSString *const ASIS3AccessPolicyPublicReadWrote;
+extern NSString *const ASIS3AccessPolicyPublicReadWrite;
 extern NSString *const ASIS3AccessPolicyAuthenticatedRead;
 extern NSString *const ASIS3AccessPolicyAuthenticatedRead;
+extern NSString *const ASIS3AccessPolicyBucketOwnerRead;
+extern NSString *const ASIS3AccessPolicyBucketOwnerFullControl;
 
 
 typedef enum _ASIS3ErrorType {
 typedef enum _ASIS3ErrorType {
     ASIS3ResponseParsingFailedType = 1,
     ASIS3ResponseParsingFailedType = 1,
     ASIS3ResponseErrorType = 2
     ASIS3ResponseErrorType = 2
-	
 } ASIS3ErrorType;
 } ASIS3ErrorType;
 
 
+extern NSString *const ASIS3RequestSchemeHTTP;
+extern NSString *const ASIS3RequestSchemeHTTPS;
 
 
 @interface ASIS3Request : ASIHTTPRequest <NSCopying, NSXMLParserDelegate> {
 @interface ASIS3Request : ASIHTTPRequest <NSCopying, NSXMLParserDelegate> {
 	
 	
@@ -36,6 +39,9 @@ typedef enum _ASIS3ErrorType {
 	// Your S3 secret access key. Set it on the request, or set it globally using [ASIS3Request setSharedSecretAccessKey:]
 	// Your S3 secret access key. Set it on the request, or set it globally using [ASIS3Request setSharedSecretAccessKey:]
 	NSString *secretAccessKey;
 	NSString *secretAccessKey;
 	
 	
+	// Set to ASIS3RequestSchemeHTTPS to send your requests via HTTPS (default is ASIS3RequestSchemeHTTP)
+	NSString *requestScheme;
+
 	// The string that will be used in the HTTP date header. Generally you'll want to ignore this and let the class add the current date for you, but the accessor is used by the tests
 	// The string that will be used in the HTTP date header. Generally you'll want to ignore this and let the class add the current date for you, but the accessor is used by the tests
 	NSString *dateString;
 	NSString *dateString;
 
 
@@ -68,7 +74,7 @@ typedef enum _ASIS3ErrorType {
 + (void)setSharedAccessKey:(NSString *)newAccessKey;
 + (void)setSharedAccessKey:(NSString *)newAccessKey;
 + (NSString *)sharedSecretAccessKey;
 + (NSString *)sharedSecretAccessKey;
 + (void)setSharedSecretAccessKey:(NSString *)newAccessKey;
 + (void)setSharedSecretAccessKey:(NSString *)newAccessKey;
-	
+
 # pragma mark helpers
 # pragma mark helpers
 	
 	
 // Returns a date formatter than can be used to parse a date from S3
 // Returns a date formatter than can be used to parse a date from S3
@@ -82,7 +88,11 @@ typedef enum _ASIS3ErrorType {
 // You shouldn't normally need to use this yourself
 // You shouldn't normally need to use this yourself
 + (NSString *)stringByURLEncodingForS3Path:(NSString *)key;
 + (NSString *)stringByURLEncodingForS3Path:(NSString *)key;
 
 
+// Returns a string for the hostname used for S3 requests. You shouldn't ever need to change this.
++ (NSString *)S3Host;
 
 
+// This is called automatically before the request starts to build the request URL (if one has not been manually set already)
+- (void)buildURL;
 
 
 @property (retain) NSString *dateString;
 @property (retain) NSString *dateString;
 @property (retain) NSString *accessKey;
 @property (retain) NSString *accessKey;
@@ -90,4 +100,5 @@ typedef enum _ASIS3ErrorType {
 @property (retain) NSString *accessPolicy;
 @property (retain) NSString *accessPolicy;
 @property (retain) NSString *currentXMLElementContent;
 @property (retain) NSString *currentXMLElementContent;
 @property (retain) NSMutableArray *currentXMLElementStack;
 @property (retain) NSMutableArray *currentXMLElementStack;
+@property (retain) NSString *requestScheme;
 @end
 @end

@@ -9,10 +9,16 @@
 #import "ASIS3Request.h"
 #import "ASIS3Request.h"
 #import <CommonCrypto/CommonHMAC.h>
 #import <CommonCrypto/CommonHMAC.h>
 
 
-NSString* const ASIS3AccessPolicyPrivate = @"private";
-NSString* const ASIS3AccessPolicyPublicRead = @"public-read";
-NSString* const ASIS3AccessPolicyPublicReadWrote = @"public-read-write";
-NSString* const ASIS3AccessPolicyAuthenticatedRead = @"authenticated-read";
+NSString *const ASIS3AccessPolicyPrivate = @"private";
+NSString *const ASIS3AccessPolicyPublicRead = @"public-read";
+NSString *const ASIS3AccessPolicyPublicReadWrite = @"public-read-write";
+NSString *const ASIS3AccessPolicyAuthenticatedRead = @"authenticated-read";
+NSString *const ASIS3AccessPolicyBucketOwnerRead = @"bucket-owner-read";
+NSString *const ASIS3AccessPolicyBucketOwnerFullControl = @"bucket-owner-full-control";
+
+NSString *const ASIS3RequestSchemeHTTP = @"http";
+NSString *const ASIS3RequestSchemeHTTPS = @"https";
+
 
 
 static NSString *sharedAccessKey = nil;
 static NSString *sharedAccessKey = nil;
 static NSString *sharedSecretAccessKey = nil;
 static NSString *sharedSecretAccessKey = nil;
@@ -29,6 +35,7 @@ static NSString *sharedSecretAccessKey = nil;
 	self = [super initWithURL:newURL];
 	self = [super initWithURL:newURL];
 	// After a bit of experimentation/guesswork, this number seems to reduce the chance of a 'RequestTimeout' error
 	// After a bit of experimentation/guesswork, this number seems to reduce the chance of a 'RequestTimeout' error
 	[self setPersistentConnectionTimeoutSeconds:20];
 	[self setPersistentConnectionTimeoutSeconds:20];
+	[self setRequestScheme:ASIS3RequestSchemeHTTP];
 	return self;
 	return self;
 }
 }
 
 
@@ -41,6 +48,7 @@ static NSString *sharedSecretAccessKey = nil;
 	[accessKey release];
 	[accessKey release];
 	[secretAccessKey release];
 	[secretAccessKey release];
 	[accessPolicy release];
 	[accessPolicy release];
+	[requestScheme release];
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 
@@ -67,6 +75,14 @@ static NSString *sharedSecretAccessKey = nil;
 	return headers;
 	return headers;
 }
 }
 
 
+- (void)main
+{
+	if (![self url]) {
+		[self buildURL];
+	}
+	[super main];
+}
+
 - (NSString *)canonicalizedResource
 - (NSString *)canonicalizedResource
 {
 {
 	return @"/";
 	return @"/";
@@ -79,6 +95,9 @@ static NSString *sharedSecretAccessKey = nil;
 
 
 - (void)buildRequestHeaders
 - (void)buildRequestHeaders
 {
 {
+	if (![self url]) {
+		[self buildURL];
+	}
 	[super buildRequestHeaders];
 	[super buildRequestHeaders];
 
 
 	// If an access key / secret access key haven't been set for this request, let's use the shared keys
 	// If an access key / secret access key haven't been set for this request, let's use the shared keys
@@ -274,6 +293,14 @@ static NSString *sharedSecretAccessKey = nil;
 	return [NSData dataWithBytes:digest length:CC_SHA1_DIGEST_LENGTH];
 	return [NSData dataWithBytes:digest length:CC_SHA1_DIGEST_LENGTH];
 }
 }
 
 
++ (NSString *)S3Host
+{
+	return @"s3.amazonaws.com";
+}
+
+- (void)buildURL
+{
+}
 
 
 @synthesize dateString;
 @synthesize dateString;
 @synthesize accessKey;
 @synthesize accessKey;
@@ -281,4 +308,5 @@ static NSString *sharedSecretAccessKey = nil;
 @synthesize currentXMLElementContent;
 @synthesize currentXMLElementContent;
 @synthesize currentXMLElementStack;
 @synthesize currentXMLElementStack;
 @synthesize accessPolicy;
 @synthesize accessPolicy;
+@synthesize requestScheme;
 @end
 @end

@@ -21,10 +21,10 @@
 
 
 + (id)serviceRequest
 + (id)serviceRequest
 {
 {
-	return [[[self alloc] initWithURL:[NSURL URLWithString:@"http://s3.amazonaws.com"]] autorelease];
+	ASIS3ServiceRequest *request = [[[self alloc] initWithURL:nil] autorelease];
+	return request;
 }
 }
 
 
-
 - (id)initWithURL:(NSURL *)newURL
 - (id)initWithURL:(NSURL *)newURL
 {
 {
 	self = [super initWithURL:newURL];
 	self = [super initWithURL:newURL];
@@ -32,7 +32,6 @@
 	return self;
 	return self;
 }
 }
 
 
-
 - (void)dealloc
 - (void)dealloc
 {
 {
 	[buckets release];
 	[buckets release];
@@ -42,6 +41,11 @@
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 
+- (void)buildURL
+{
+	[self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://%@",[self requestScheme],[[self class] S3Host]]]];
+}
+
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName attributes:(NSDictionary *)attributeDict
 {
 {
 	if ([elementName isEqualToString:@"Bucket"]) {
 	if ([elementName isEqualToString:@"Bucket"]) {

@@ -452,7 +452,7 @@ static NSString *bucket = @"";
 	[listRequest setPrefix:@"foo"];
 	[listRequest setPrefix:@"foo"];
 	[listRequest setMarker:@"bar"];
 	[listRequest setMarker:@"bar"];
 	[listRequest setMaxResultCount:5];
 	[listRequest setMaxResultCount:5];
-	[listRequest createQueryString];
+	[listRequest buildURL];
 	NSString *expectedURL = [NSString stringWithFormat:@"http://%@.s3.amazonaws.com/?acl&prefix=foo&marker=bar&delimiter=/&max-keys=5",bucket];
 	NSString *expectedURL = [NSString stringWithFormat:@"http://%@.s3.amazonaws.com/?acl&prefix=foo&marker=bar&delimiter=/&max-keys=5",bucket];
 	success = ([[[listRequest url] absoluteString] isEqualToString:expectedURL]);
 	success = ([[[listRequest url] absoluteString] isEqualToString:expectedURL]);
 	GHAssertTrue(success,@"Generated the wrong url when requesting a subresource");
 	GHAssertTrue(success,@"Generated the wrong url when requesting a subresource");

--Subproject commit 99621b30f837502875d3591479a647193af4c031
++Subproject commit ffb51729219514fb7948b9be29bbae3dfabb1f4a