Minor improvements

Author: ruslan-bikkinin

ios/CodePush/CodePush.h

@@ -184,9 +184,9 @@ failCallback:(void (^)(NSError *err))failCallback;
                    expectedHash:(NSString *)expectedHash
                           error:(NSError **)error;
 
-+ (NSString *)cleanPublicKey:(NSString *)publicKeyString;
++ (NSString *)preparePublicKeyForDecoding:(NSString *)publicKeyString;
 
-+ (NSDictionary *) verifyJWT:(NSString *) signature
++ (NSDictionary *) verifyAndDecodeJWT:(NSString *) jwt
                withPublicKey:(NSString *)publicKey
                        error:(NSError **)error;
 

ios/CodePush/CodePushConfig.m

@@ -35,7 +35,7 @@ - (instancetype)init
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
     NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
-    NSString *publicKey = [infoDictionary objectForKey:@"PublicKey"];
+    NSString *publicKey = [infoDictionary objectForKey:@"CodePushPublicKey"];
 
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *clientUniqueId = [userDefaults stringForKey:ClientUniqueIDConfigKey];

ios/CodePush/CodePushPackage.m

@@ -43,7 +43,7 @@ + (void) handleFailedDataIntegrityCheck:(void (^)(NSError *err))failCallback
                                    error:(NSError **)error
 {
     CPLog(@"The update contents failed the data integrity check.");
-    if (!error || !*error) {
+    if (!error) {
         failCallback([CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."]);
         return;
     }
@@ -244,10 +244,10 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                                                                 return;
                                                             }
                                                         }
-                                                        
-                                                        if(isDiffUpdate){
+
+                                                        if (isDiffUpdate) {
                                                             CPLog(@"Applying diff update.");
-                                                        }else{
+                                                        } else {
                                                             CPLog(@"Applying full update.");
                                                         }
 
@@ -256,26 +256,23 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                                                             BOOL isSignatureValid = [CodePushUpdateUtils verifySignatureFor:newUpdateFolderPath
                                                                                       withPublicKey:publicKey
                                                                                               error:&error];
-                                                            if(!isSignatureValid){
+                                                            if (!isSignatureValid) {
                                                                 [self handleFailedDataIntegrityCheck:failCallback error:&error];
                                                                 return;
-                                                            }else{
+                                                            } else {
                                                                 CPLog(@"The update contents succueded the data integrity check.");
                                                             }
-                                                        }else{
+                                                        } else {
                                                             if (isDiffUpdate) {
-                                                                
-                                                                if(![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
+                                                                if (![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
                                                                                              expectedHash:newUpdateHash
-                                                                                                    error:&error]){
+                                                                                                    error:&error]) {
 
                                                                     [self handleFailedDataIntegrityCheck:failCallback error:&error];
                                                                     return;
-                                                                }
-                                                                else{
+                                                                } else {
                                                                     CPLog(@"The update contents succueded the data integrity check.");
-                                                                }
-                                                                
+                                                                }                                                                
                                                             }
                                                         }
                                                     } else {
@@ -569,4 +566,4 @@ + (BOOL)updateCurrentPackageInfo:(NSDictionary *)packageInfo
     return YES;
 }
 
-@end
+@end

ios/CodePush/CodePushUpdateUtils.m

@@ -285,7 +285,7 @@ + (BOOL)verifyFolderHash:(NSString *)finalUpdateFolder
     return [updateContentsManifestHash isEqualToString:expectedHash];
 }
 
-+ (NSString *)cleanPublicKey:(NSString *)publicKeyString
++ (NSString *)preparePublicKeyForDecoding:(NSString *)publicKeyString
 {
     publicKeyString = [publicKeyString stringByReplacingOccurrencesOfString:@"-----BEGIN PUBLIC KEY-----\n"
                                                                  withString:@""];
@@ -303,14 +303,13 @@ + (NSString *)getSignatureFor:(NSString *)folderPath
     NSString *signatureFilePath = [NSString stringWithFormat:@"%@/%@/%@", folderPath, ManifestFolderPrefix, BundleJWTFile];
     if ([[NSFileManager defaultManager] fileExistsAtPath:signatureFilePath]) {
         return [NSString stringWithContentsOfFile:signatureFilePath encoding:NSUTF8StringEncoding error:error];
-    }else{
+    } else {
         *error = [CodePushErrorUtils errorWithMessage:[NSString stringWithFormat: @"Cannot find signature at %@", signatureFilePath]];
         return nil;
     }
-    return nil;
 }
 
-+ (NSDictionary *) verifyJWT:(NSString *) signature
++ (NSDictionary *) verifyAndDecodeJWT:(NSString *) jwt
      withPublicKey:(NSString *)publicKey
              error:(NSError **)error
 {
@@ -333,22 +332,22 @@ + (BOOL)verifySignatureFor:(NSString *)folderPath
 {
     NSLog(@"Verifying signature for folder path: %@", folderPath);
 
-    NSString *publicKey = [self cleanPublicKey: publicKeyString];
+    NSString *publicKey = [self preparePublicKeyForDecoding: publicKeyString];
 
+    NSError *signatureVerificationError;
     NSString *signature = [self getSignatureFor: folderPath
-                                          error: error];
-    if(signature == nil) {
-        if(error && *error){
-            CPLog(@"The update could not be verified because no signature was found. %@", *error);
-        }else{
-            CPLog(@"The update could not be verified because no signature was found.");
-        }
+                                          error: &signatureVerificationError];
+    if(signatureVerificationError) {
+        CPLog(@"The update could not be verified because no signature was found. %@", signatureVerificationError);
+        *error = signatureVerificationError;
         return false;
     }
 
-    NSDictionary *envelopedPayload = [self verifyJWT:signature withPublicKey:publicKey error:error];
-    if(envelopedPayload == nil){
-        CPLog(@"The update could not be verified because it was not signed by a trusted party. %@", *error);
+    NSError *payloadDecodingError;
+    NSDictionary *envelopedPayload = [self verifyAndDecodeJWT:signature withPublicKey:publicKey error:&payloadDecodingError];
+    if(payloadDecodingError){
+        CPLog(@"The update could not be verified because it was not signed by a trusted party. %@", payloadDecodingError);
+        *error = payloadDecodingError;
         return false;
     }