@onekeyfe/react-native-bundle-update 6.7.0-alpha.310 → 6.7.0-alpha.312

package/android/src/main/java/com/margelo/nitro/reactnativebundleupdate/ReactNativeBundleUpdate.kt

@@ -395,9 +395,9 @@ object BundleUpdateStoreAndroid {
             }
 
             val metadata = parseMetadataJson(readFileContent(metadataFile))
-            if (!validateEntryBundlesSha256(bundleDirPath.absolutePath, metadata)) {
-                OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask: entry bundle SHA256 verification failed for $folderName")
-                failPendingTask(mmkv, taskObj, "ERR_VERIFY_FAILED:Entry bundle SHA256 verification failed")
+            if (!validateAllFilesInDir(context, bundleDirPath.absolutePath, metadata, appVersion, bundleVersion)) {
+                OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask: extracted file verification failed for $folderName")
+                failPendingTask(mmkv, taskObj, "ERR_VERIFY_FAILED:Extracted file verification failed")
                 return
             }
             if (!validateBundlePairCompatibility(context, bundleDirPath.absolutePath, metadata)) {
@@ -2075,8 +2075,8 @@ class ReactNativeBundleUpdate : HybridReactNativeBundleUpdateSpec() {
             }
 
             val metadata = BundleUpdateStoreAndroid.parseMetadataJson(BundleUpdateStoreAndroid.readFileContent(metadataFile))
-            if (!BundleUpdateStoreAndroid.validateEntryBundlesSha256(bundleDirPath.absolutePath, metadata)) {
-                OneKeyLog.error("BundleUpdate", "installBundle: entry bundle SHA256 verification failed for $folderName")
+            if (!BundleUpdateStoreAndroid.validateAllFilesInDir(context, bundleDirPath.absolutePath, metadata, appVersion, bundleVersion)) {
+                OneKeyLog.error("BundleUpdate", "installBundle: extracted file verification failed for $folderName")
                 throw BundleUpdateError("INTEGRITY_FAILED", "install")
             }
             if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(context, bundleDirPath.absolutePath, metadata)) {
@@ -2466,8 +2466,8 @@ class ReactNativeBundleUpdate : HybridReactNativeBundleUpdateSpec() {
                 throw BundleUpdateError("PACKAGE_MISSING", "install")
             }
             val metadata = BundleUpdateStoreAndroid.parseMetadataJson(BundleUpdateStoreAndroid.readFileContent(metadataFile))
-            if (!BundleUpdateStoreAndroid.validateEntryBundlesSha256(bundleDirPath.absolutePath, metadata)) {
-                OneKeyLog.error("BundleUpdate", "setCurrentUpdateBundleData: entry bundle SHA256 verification failed")
+            if (!BundleUpdateStoreAndroid.validateAllFilesInDir(context, bundleDirPath.absolutePath, metadata, params.appVersion, params.bundleVersion)) {
+                OneKeyLog.error("BundleUpdate", "setCurrentUpdateBundleData: extracted file verification failed")
                 throw BundleUpdateError("INTEGRITY_FAILED", "install")
             }
             if (!BundleUpdateStoreAndroid.validateBundlePairCompatibility(context, bundleDirPath.absolutePath, metadata)) {

package/ios/ReactNativeBundleUpdate.swift

@@ -444,9 +444,9 @@ public class BundleUpdateStore: NSObject {
                 failPendingTask(mmkv: mmkv, taskDict: taskDict, reason: "ERR_VERIFY_FAILED:Failed to read metadata.json")
                 return
             }
-            if !validateEntryBundlesSha256(bundleDirPath: bundleDirPath, metadata: metadata) {
-                OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask: entry bundle SHA256 verification failed for \(folderName)")
-                failPendingTask(mmkv: mmkv, taskDict: taskDict, reason: "ERR_VERIFY_FAILED:Entry bundle SHA256 verification failed")
+            if !validateAllFilesInDir(bundleDirPath, metadata: metadata, appVersion: appVersion, bundleVersion: bundleVersion) {
+                OneKeyLog.error("BundleUpdate", "processPreLaunchPendingTask: extracted file verification failed for \(folderName)")
+                failPendingTask(mmkv: mmkv, taskDict: taskDict, reason: "ERR_VERIFY_FAILED:Extracted file verification failed")
                 return
             }
             if !validateBundlePairCompatibility(bundleDirPath: bundleDirPath, metadata: metadata) {
@@ -2192,8 +2192,8 @@ class ReactNativeBundleUpdate: HybridReactNativeBundleUpdateSpec {
                 OneKeyLog.error("BundleUpdate", "installBundle: failed to read metadata.json content for \(folderName)")
                 throw BundleUpdateError(.missing, .install)
             }
-            if !BundleUpdateStore.validateEntryBundlesSha256(bundleDirPath: bundleDirPath, metadata: metadata) {
-                OneKeyLog.error("BundleUpdate", "installBundle: entry bundle SHA256 verification failed for \(folderName)")
+            if !BundleUpdateStore.validateAllFilesInDir(bundleDirPath, metadata: metadata, appVersion: appVersion, bundleVersion: bundleVersion) {
+                OneKeyLog.error("BundleUpdate", "installBundle: extracted file verification failed for \(folderName)")
                 throw BundleUpdateError(.integrity, .install)
             }
             if !BundleUpdateStore.validateBundlePairCompatibility(bundleDirPath: bundleDirPath, metadata: metadata) {
@@ -2538,8 +2538,8 @@ class ReactNativeBundleUpdate: HybridReactNativeBundleUpdateSpec {
                 OneKeyLog.error("BundleUpdate", "setCurrentUpdateBundleData: failed to read metadata.json content")
                 throw BundleUpdateError(.missing, .install)
             }
-            if !BundleUpdateStore.validateEntryBundlesSha256(bundleDirPath: bundleDirPath, metadata: metadata) {
-                OneKeyLog.error("BundleUpdate", "setCurrentUpdateBundleData: entry bundle SHA256 verification failed")
+            if !BundleUpdateStore.validateAllFilesInDir(bundleDirPath, metadata: metadata, appVersion: params.appVersion, bundleVersion: params.bundleVersion) {
+                OneKeyLog.error("BundleUpdate", "setCurrentUpdateBundleData: extracted file verification failed")
                 throw BundleUpdateError(.integrity, .install)
             }
             if !BundleUpdateStore.validateBundlePairCompatibility(bundleDirPath: bundleDirPath, metadata: metadata) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-bundle-update",
-  "version": "6.7.0-alpha.310",
+  "version": "6.7.0-alpha.312",
   "description": "Native JavaScript bundle download, verification and version management for OneKey",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",