sjs/arq_restore
1
0
Fork 0
mirror of https://github.com/samsonjs/arq_restore.git synced 2026-03-25 09:25:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

If the bucket plist is missing, skip trying to read the bucket name.

Browse source
This commit is contained in:
Stefan Reitshamer 2013-03-09 07:19:18 -05:00
parent 1e5fc7028b
commit d4466f4314
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ArqRestoreCommand.m
View file

@ -229,29 +229,26 @@
}
}
NSData *data = [s3 dataAtPath:path error:error];
if (data == nil) {
return NO;
}
if (!strncmp([data bytes], "encrypted", 9)) {
data = [data subdataWithRange:NSMakeRange(9, [data length] - 9)];
CryptoKey *cryptoKey = [[[CryptoKey alloc] initWithPassword:encryptionPassword salt:salt error:error] autorelease];
if (cryptoKey == nil) {
return NO;
NSString *bucketName = @"(unknown)";
NSData *data = [s3 dataAtPath:path error:NULL];
if (data != nil) {
if (!strncmp([data bytes], "encrypted", 9)) {
data = [data subdataWithRange:NSMakeRange(9, [data length] - 9)];
CryptoKey *cryptoKey = [[[CryptoKey alloc] initWithPassword:encryptionPassword salt:salt error:error] autorelease];
if (cryptoKey == nil) {
return NO;
}
data = [data decryptWithCryptoKey:cryptoKey error:error];
if (data == nil) {
HSLogError(@"failed to decrypt %@", path);
return NO;
}
}
data = [data decryptWithCryptoKey:cryptoKey error:error];
if (data == nil) {
HSLogError(@"failed to decrypt %@", path);
return NO;
DictNode *plist = [DictNode dictNodeWithXMLData:data error:NULL];
if (plist != nil) {
bucketName = [[plist stringNodeForKey:@"BucketName"] stringValue];
}
}
DictNode *plist = [DictNode dictNodeWithXMLData:data error:error];
if (plist == nil) {
return NO;
}
NSString *bucketName = [[plist stringNodeForKey:@"BucketName"] stringValue];
NSError *uacError = nil;
NSData *uacData = [s3 dataAtPath:[NSString stringWithFormat:@"/%@/%@/computerinfo", s3BucketName, computerUUID] error:&uacError];