mod(Runtime): prevent corrupted updates by verifying package hash (#86)

Author: floydkim

android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java

@@ -265,14 +265,15 @@ public void downloadPackage(JSONObject updatePackage, String expectedBundleFileN
                     CodePushUtils.log("Applying full update.");
                 }
 
+                CodePushUpdateUtils.verifyFolderHash(newUpdateFolderPath, newUpdateHash);
+
                 boolean isSignatureVerificationEnabled = (stringPublicKey != null);
 
                 String signaturePath = CodePushUpdateUtils.getSignatureFilePath(newUpdateFolderPath);
                 boolean isSignatureAppearedInBundle = FileUtils.fileAtPathExists(signaturePath);
 
                 if (isSignatureVerificationEnabled) {
                     if (isSignatureAppearedInBundle) {
-                        CodePushUpdateUtils.verifyFolderHash(newUpdateFolderPath, newUpdateHash);
                         CodePushUpdateUtils.verifyUpdateSignature(newUpdateFolderPath, newUpdateHash, stringPublicKey);
                     } else {
                         throw new CodePushInvalidUpdateException(
@@ -288,11 +289,6 @@ public void downloadPackage(JSONObject updatePackage, String expectedBundleFileN
                                 "Warning! JWT signature exists in codepush update but code integrity check couldn't be performed because there is no public key configured. " +
                                 "Please ensure that public key is properly configured within your application."
                         );
-                        CodePushUpdateUtils.verifyFolderHash(newUpdateFolderPath, newUpdateHash);
-                    } else {
-                        if (isDiffUpdate) {
-                            CodePushUpdateUtils.verifyFolderHash(newUpdateFolderPath, newUpdateHash);
-                        }
                     }
                 }
 

ios/CodePush/CodePushPackage.m

@@ -237,27 +237,28 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                                                         }
 
                                                         CPLog((isDiffUpdate) ? @"Applying diff update." : @"Applying full update.");
-                                                        
+
+                                                        if (![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
+                                                                                      expectedHash:newUpdateHash
+                                                                                             error:&error]) {
+                                                            CPLog(@"The update contents failed the data integrity check.");
+                                                            if (!error) {
+                                                                error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
+                                                            }
+
+                                                            failCallback(error);
+                                                            return;
+                                                        } else {
+                                                            CPLog(@"The update contents succeeded the data integrity check.");
+                                                        }
+
                                                         BOOL isSignatureVerificationEnabled = (publicKey != nil);
-                                                        
+
                                                         NSString *signatureFilePath = [CodePushUpdateUtils getSignatureFilePath:newUpdateFolderPath];
                                                         BOOL isSignatureAppearedInBundle = [[NSFileManager defaultManager] fileExistsAtPath:signatureFilePath];
-                                                        
+
                                                         if (isSignatureVerificationEnabled) {
                                                             if (isSignatureAppearedInBundle) {
-                                                                if (![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
-                                                                                              expectedHash:newUpdateHash
-                                                                                                     error:&error]) {
-                                                                    CPLog(@"The update contents failed the data integrity check.");
-                                                                    if (!error) {
-                                                                        error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
-                                                                    }
-                                                                    
-                                                                    failCallback(error);
-                                                                    return;
-                                                                } else {
-                                                                    CPLog(@"The update contents succeeded the data integrity check.");
-                                                                }
                                                                 BOOL isSignatureValid = [CodePushUpdateUtils verifyUpdateSignatureFor:newUpdateFolderPath
                                                                                                                          expectedHash:newUpdateHash
                                                                                                                         withPublicKey:publicKey
@@ -283,29 +284,10 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                                                             }
 
                                                         } else {
-                                                            BOOL needToVerifyHash;
                                                             if (isSignatureAppearedInBundle) {
                                                                 CPLog(@"Warning! JWT signature exists in codepush update but code integrity check couldn't be performed" \
                                                                       " because there is no public key configured. " \
                                                                       "Please ensure that public key is properly configured within your application.");
-                                                                needToVerifyHash = true;
-                                                            } else {
-                                                                needToVerifyHash = isDiffUpdate;
-                                                            }
-                                                            if(needToVerifyHash){
-                                                                if (![CodePushUpdateUtils verifyFolderHash:newUpdateFolderPath
-                                                                                              expectedHash:newUpdateHash
-                                                                                                     error:&error]) {
-                                                                    CPLog(@"The update contents failed the data integrity check.");
-                                                                    if (!error) {
-                                                                        error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
-                                                                    }
-                                                                    
-                                                                    failCallback(error);
-                                                                    return;
-                                                                } else {
-                                                                    CPLog(@"The update contents succeeded the data integrity check.");
-                                                                }
                                                             }
                                                         }
                                                     } else {