@onekeyfe/react-native-get-random-values 1.1.19 → 1.1.21

package/ReactNativeGetRandomValues.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
+  s.dependency 'ReactNativeNativeLogger'
 
   load 'nitrogen/generated/ios/ReactNativeGetRandomValues+autolinking.rb'
   add_nitrogen_files(s)

package/android/build.gradle

@@ -125,4 +125,6 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation project(":react-native-nitro-modules")
+
+  implementation project(":onekeyfe_react-native-native-logger")
 }

package/android/src/main/java/com/margelo/nitro/reactnativegetrandomvalues/ReactNativeGetRandomValues.kt

@@ -1,15 +1,27 @@
 package com.margelo.nitro.reactnativegetrandomvalues
 
 import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.nativelogger.OneKeyLog
 
 @DoNotStrip
 class ReactNativeGetRandomValues : HybridReactNativeGetRandomValuesSpec() {
-  override fun getRandomBase64(byteLength: Double): String {
-    val data = ByteArray(byteLength.toInt())
-    val random = java.security.SecureRandom()
-
-    random.nextBytes(data)
+  companion object {
+    private const val MAX_BYTE_LENGTH = 65536  // 64 KB upper bound
+  }
 
-    return android.util.Base64.encodeToString(data, android.util.Base64.NO_WRAP)
+  override fun getRandomBase64(byteLength: Double): String {
+    val length = byteLength.toInt()
+    if (length <= 0 || length > MAX_BYTE_LENGTH) {
+      OneKeyLog.warn("RandomValues", "Invalid byteLength: $byteLength, must be 1..$MAX_BYTE_LENGTH")
+      throw IllegalArgumentException("Invalid byteLength: must be 1...$MAX_BYTE_LENGTH")
+    }
+    try {
+      val data = ByteArray(length)
+      java.security.SecureRandom().nextBytes(data)
+      return android.util.Base64.encodeToString(data, android.util.Base64.NO_WRAP)
+    } catch (e: Exception) {
+      OneKeyLog.error("RandomValues", "SecureRandom failed")
+      throw e
+    }
   }
 }

package/ios/ReactNativeGetRandomValues.swift

@@ -1,12 +1,22 @@
 import NitroModules
+import ReactNativeNativeLogger
 
 class ReactNativeGetRandomValues: HybridReactNativeGetRandomValuesSpec {
+    private static let maxByteLength = 65536  // 64 KB upper bound
+
     func getRandomBase64(byteLength: Double) throws -> String {
-        let data = NSMutableData(length: Int(byteLength))!
-        let result = SecRandomCopyBytes(kSecRandomDefault, Int(byteLength), data.mutableBytes)
+        let length = Int(byteLength)
+        guard length > 0, length <= ReactNativeGetRandomValues.maxByteLength,
+              let data = NSMutableData(length: length) else {
+            OneKeyLog.warn("RandomValues", "Invalid byteLength: \(byteLength), must be 1...\(ReactNativeGetRandomValues.maxByteLength)")
+            throw NSError(domain: "ReactNativeGetRandomValues", code: -1,
+                          userInfo: [NSLocalizedDescriptionKey: "Invalid byteLength: must be 1...\(ReactNativeGetRandomValues.maxByteLength)"])
+        }
+        let result = SecRandomCopyBytes(kSecRandomDefault, length, data.mutableBytes)
         if result != errSecSuccess {
+            OneKeyLog.error("RandomValues", "SecRandomCopyBytes failed with status: \(result)")
             throw NSError(domain: "ReactNativeGetRandomValues", code: Int(result), userInfo: nil)
         }
-        return data.base64EncodedString(options: .lineLength64Characters)
+        return data.base64EncodedString(options: [])
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-get-random-values",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "react-native-get-random-values",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",