@functionland/react-native-fula 1.2.1 → 1.2.3

package/android/src/main/java/land/fx/fula/Cryptography.java

@@ -1,47 +1,60 @@
-package land.fx.fula;
-
-import android.util.Base64;
-
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-public class Cryptography {
-  public static String encryptMsg(String message, SecretKey secret)
-    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, InvalidParameterSpecException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException {
-    Cipher cipher = null;
-    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-    cipher.init(Cipher.ENCRYPT_MODE, secret);
-    byte[] cipherText = cipher.doFinal(message.getBytes("UTF-8"));
-    return Base64.encodeToString(cipherText, Base64.NO_WRAP);
-  }
-
-  public static String decryptMsg(String cipherText, SecretKey secret)
-    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidParameterSpecException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, UnsupportedEncodingException {
-    Cipher cipher = null;
-    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-    cipher.init(Cipher.DECRYPT_MODE, secret);
-    byte[] decode = Base64.decode(cipherText, Base64.NO_WRAP);
-    String decryptString = new String(cipher.doFinal(decode), "UTF-8");
-    return decryptString;
-  }
-
-  public static SecretKey generateKey(byte[] key)
-    throws NoSuchAlgorithmException, InvalidKeySpecException {
-    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
-    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
-    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
-  }
-}
+package land.fx.fula;
+
+import android.util.Base64;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.SecureRandom;
+import java.nio.ByteBuffer;
+import java.security.spec.InvalidParameterSpecException;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.GCMParameterSpec;
+
+public class Cryptography {
+  public static String encryptMsg(String message, SecretKey secret)
+    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
+    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+    byte[] iv = new byte[12]; // Ensure this is randomly generated for each encryption.
+    new SecureRandom().nextBytes(iv);
+    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+    cipher.init(Cipher.ENCRYPT_MODE, secret, spec);
+    byte[] cipherText = cipher.doFinal(message.getBytes(StandardCharsets.UTF_8));
+    ByteBuffer byteBuffer = ByteBuffer.allocate(iv.length + cipherText.length);
+    byteBuffer.put(iv);
+    byteBuffer.put(cipherText);
+    return Base64.encodeToString(byteBuffer.array(), Base64.NO_WRAP);
+  }
+
+  public static String decryptMsg(String cipherText, SecretKey secret)
+    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+    ByteBuffer byteBuffer = ByteBuffer.wrap(Base64.decode(cipherText, Base64.NO_WRAP));
+    byte[] iv = new byte[12];
+    byteBuffer.get(iv);
+    byte[] cipherBytes = new byte[byteBuffer.remaining()];
+    byteBuffer.get(cipherBytes);
+    Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+    GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+    cipher.init(Cipher.DECRYPT_MODE, secret, spec);
+    String decryptString = new String(cipher.doFinal(cipherBytes), StandardCharsets.UTF_8);
+    return decryptString;
+  }
+
+  public static SecretKey generateKey(byte[] key)
+    throws NoSuchAlgorithmException, InvalidKeySpecException {
+    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
+    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
+    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
+  }
+}

package/android/src/main/java/land/fx/fula/FulaModule.java

@@ -16,15 +16,25 @@ import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.Contract;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeoutException;
 
 import org.json.JSONObject;
 import org.json.JSONArray;
@@ -263,42 +273,50 @@ public class FulaModule extends ReactContextBaseJavaModule {
 
   private boolean checkConnectionInternal(int timeout) throws Exception {
     try {
-        Log.d("ReactNative", "checkConnectionInternal started");
-        if (this.fula != null) {
+      Log.d("ReactNative", "checkConnectionInternal started");
+      if (this.fula != null) {
+        try {
+          Log.d("ReactNative", "connectToBlox started");
+
+          AtomicBoolean connectionStatus = new AtomicBoolean(false);
+          ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+          Future<?> future = executor.submit(() -> {
             try {
-                Log.d("ReactNative", "connectToBlox started");
-
-                AtomicBoolean connectionStatus = new AtomicBoolean(false);
-                ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-                executor.schedule(() -> {
-                    try {
-                        this.fula.connectToBlox();
-                        connectionStatus.set(true);
-                        Log.d("ReactNative", "checkConnectionInternal succeeded ");
-                    } catch (Exception e) {
-                        Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-                    }
-                }, 0, TimeUnit.SECONDS);
-
-                executor.schedule(() -> {
-                    executor.shutdown();
-                }, timeout, TimeUnit.SECONDS);
-
-                executor.awaitTermination(timeout, TimeUnit.SECONDS);
-                return connectionStatus.get();
+              this.fula.connectToBlox();
+              connectionStatus.set(true);
+              Log.d("ReactNative", "checkConnectionInternal succeeded ");
             } catch (Exception e) {
-                Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-                return false;
+              Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
             }
-        } else {
-            Log.d("ReactNative", "checkConnectionInternal failed because fula is not initialized ");
+          });
+
+          try {
+            future.get(timeout, TimeUnit.SECONDS);
+          } catch (TimeoutException te) {
+            // If the timeout occurs, shut down the executor and return false
+            executor.shutdownNow();
             return false;
+          } finally {
+            // If the future task is done, we can shut down the executor
+            if (future.isDone()) {
+              executor.shutdown();
+            }
+          }
+
+          return connectionStatus.get();
+        } catch (Exception e) {
+          Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
+          return false;
         }
+      } else {
+        Log.d("ReactNative", "checkConnectionInternal failed because fula is not initialized ");
+        return false;
+      }
     } catch (Exception e) {
-        Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-        throw (e);
+      Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
+      throw (e);
     }
-}
+  }
 
   @ReactMethod
   private void checkFailedActions(boolean retry, int timeout, Promise promise) throws Exception {
@@ -404,24 +422,32 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @NonNull
-  private byte[] createPeerIdentity(byte[] privateKey) throws Exception {
+  private byte[] createPeerIdentity(byte[] privateKey) throws GeneralSecurityException, IOException {
     try {
       // 1: First: create public key from provided private key
       // 2: Should read the local keychain store (if it is key-value, key is public key above,
       // 3: if found, decrypt using the private key
       // 4: If not found or decryption not successful, generate an identity
       // 5: then encrypt and store in keychain
-
       String encryptedKey = sharedPref.getValue(PRIVATE_KEY_STORE_ID);
       SecretKey secretKey = Cryptography.generateKey(privateKey);
-      if (encryptedKey == null) {
-        byte[] autoGeneratedIdentity = Fulamobile.generateEd25519Key();
-        encryptedKey = Cryptography.encryptMsg(StaticHelper.bytesToBase64(autoGeneratedIdentity), secretKey);
+
+      if (encryptedKey == null || !encryptedKey.startsWith("FULA_ENC_V2:")) {
+        byte[] autoGeneratedIdentity;
+        try {
+          autoGeneratedIdentity = Fulamobile.generateEd25519Key();
+        } catch (Exception e) {
+          Log.d("ReactNative", "Failed to generate key: " + e.getMessage());
+          throw new GeneralSecurityException("Failed to generate key", e);
+        }
+        encryptedKey = "FULA_ENC_V2:" + Cryptography.encryptMsg(StaticHelper.bytesToBase64(autoGeneratedIdentity), secretKey);
         sharedPref.add(PRIVATE_KEY_STORE_ID, encryptedKey);
       }
-      return StaticHelper.base64ToBytes(Cryptography.decryptMsg(encryptedKey, secretKey));
 
-    } catch (Exception e) {
+      String decryptedKey = Cryptography.decryptMsg(encryptedKey.replace("FULA_ENC_V2:", ""), secretKey);
+      return StaticHelper.base64ToBytes(decryptedKey);
+
+    } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e) {
       Log.d("ReactNative", "createPeerIdentity failed with Error: " + e.getMessage());
       throw (e);
     }
@@ -502,7 +528,8 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @NonNull
-  private byte[] newClientInternal(byte[] identity, String storePath, String bloxAddr, String exchange, boolean autoFlush, boolean useRelay, boolean refresh) throws Exception {
+  private byte[] newClientInternal(byte[] identity, String storePath, String bloxAddr, String exchange, boolean autoFlush, boolean useRelay, boolean refresh) throws GeneralSecurityException, IOException {
+    byte[] peerIdentity = null;
     try {
       fulaConfig = new Config();
       if (storePath == null || storePath.trim().isEmpty()) {
@@ -512,7 +539,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
       }
       Log.d("ReactNative", "newClientInternal storePath is set: " + fulaConfig.getStorePath());
 
-      byte[] peerIdentity = this.createPeerIdentity(identity);
+      peerIdentity = this.createPeerIdentity(identity);
       fulaConfig.setIdentity(peerIdentity);
       Log.d("ReactNative", "peerIdentity is set: " + toString(fulaConfig.getIdentity()));
       fulaConfig.setBloxAddr(bloxAddr);
@@ -525,19 +552,25 @@ public class FulaModule extends ReactContextBaseJavaModule {
       }
       if (this.fula == null || refresh) {
         Log.d("ReactNative", "Creating a new Fula instance");
-        shutdownInternal();
-        this.fula = Fulamobile.newClient(fulaConfig);
-      }
-      if (this.fula != null) {
-        this.fula.flush();
+        try {
+          shutdownInternal();
+          this.fula = Fulamobile.newClient(fulaConfig);
+          if (this.fula != null) {
+            this.fula.flush();
+          }
+        } catch (Exception e) {
+          Log.d("ReactNative", "Failed to create new Fula instance: " + e.getMessage());
+          throw new IOException("Failed to create new Fula instance", e);
+        }
       }
-      return peerIdentity;
-    } catch (Exception e) {
+    } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidAlgorithmParameterException e) {
       Log.d("ReactNative", "newclientInternal failed with Error: " + e.getMessage());
       throw (e);
     }
+    return peerIdentity;
   }
 
+
   @NonNull
   private String[] initInternal(byte[] identity, String storePath, String bloxAddr, String exchange, boolean autoFlush, String rootCid, boolean useRelay, boolean refresh) throws Exception {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionland/react-native-fula",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "This package is a bridge to use the Fula libp2p protocols in the react-native which is using wnfs",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -28,7 +28,7 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "prepare": "bob build",
     "release": "release-it",
-    "example": "set NODE_OPTIONS=--openssl-legacy-provider && yarn --cwd example",
+    "example": "set NODE_OPTIONS='' && yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
     "bootstrap": "yarn example && yarn && yarn pods"
   },