sjs/arq_restore
1
0
Fork 0
mirror of https://github.com/samsonjs/arq_restore.git synced 2026-04-27 15:07:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bugs in creating endpoint url when target type is 's3compatible'

Browse source
This commit is contained in:
Stefan Reitshamer 2015-07-07 12:05:15 -04:00
parent 43ac103875
commit 3675bc40a1
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ArqRestoreCommand.m
View file

@ -183,9 +183,7 @@
ret = [[[Target alloc] initWithEndpoint:endpoint secret:secret passphrase:keyfilePassphrase] autorelease]; ret = [[[Target alloc] initWithEndpoint:endpoint secret:secret passphrase:keyfilePassphrase] autorelease];
} else if ([theTargetType isEqualToString:@"greenqloud"] } else if ([theTargetType isEqualToString:@"greenqloud"]
|| [theTargetType isEqualToString:@"dreamobjects"] || [theTargetType isEqualToString:@"dreamobjects"]
|| [theTargetType isEqualToString:@"googlecloudstorage"] || [theTargetType isEqualToString:@"googlecloudstorage"]) {
|| [theTargetType isEqualToString:@"s3compatible"]) {
if ([theParams count] != 4) { if ([theParams count] != 4) {
SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid %@ parameters", theTargetType); SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid %@ parameters", theTargetType);
return nil; return nil;
@ -208,6 +206,33 @@
NSURL *endpoint = [NSURL URLWithString:[NSString stringWithFormat:@"https://%@@%@/%@", theAccessKey, theHostname, theBucketName]]; NSURL *endpoint = [NSURL URLWithString:[NSString stringWithFormat:@"https://%@@%@/%@", theAccessKey, theHostname, theBucketName]];
ret = [[[Target alloc] initWithEndpoint:endpoint secret:theSecretKey passphrase:nil] autorelease]; ret = [[[Target alloc] initWithEndpoint:endpoint secret:theSecretKey passphrase:nil] autorelease];
} else if ([theTargetType isEqualToString:@"s3compatible"]) {
if ([theParams count] != 5) {
SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid %@ parameters", theTargetType);
return nil;
}
NSURL *theURL = [NSURL URLWithString:[theParams objectAtIndex:1]];
if (theURL == nil) {
SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid url %@", [theParams objectAtIndex:1]);
return nil;
}
NSString *theAccessKey = [theParams objectAtIndex:2];
NSString *theSecretKey = [theParams objectAtIndex:3];
NSString *theBucketName = [theParams objectAtIndex:4];
NSMutableString *urlString = [NSMutableString stringWithString:[theURL scheme]];
[urlString appendFormat:@"://%@@%@", theAccessKey, [theURL host]];
NSNumber *port = [theURL port];
if (port != nil) {
[urlString appendFormat:@":%d", [port intValue]];
}
[urlString appendString:@"/"];
[urlString appendString:theBucketName];
NSURL *endpoint = [NSURL URLWithString:urlString];
ret = [[[Target alloc] initWithEndpoint:endpoint secret:theSecretKey passphrase:nil] autorelease];
} else if ([theTargetType isEqualToString:@"googledrive"]) { } else if ([theTargetType isEqualToString:@"googledrive"]) {
if ([theParams count] != 3) { if ([theParams count] != 3) {
SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid googledrive parameters"); SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid googledrive parameters");