Merge pull request #53 from functionland/blockchain

Blockchain

Author: ehsan6sha

README.md

@@ -23,7 +23,8 @@ const peerId //returns peerId as string
   bloxAddr: string, //leave empty for testing without a backend node
   exchange: 'noop'|'', //add noop for testing without a backend
   autoFlush: boolean, //Default to false. Always set to false unless you know what you are doing. explicitly write data to disk after each operation if set to true
-  useRelay: boolean //default to true. If true it forces the connection through relay
+  useRelay: boolean, //default to true. If true it forces the connection through relay
+  refresh: boolean? //forces the fula object to be recreated. default is false
 )
 ```
 
@@ -41,7 +42,8 @@ await fula.init(
     bloxAddr: string, //leave empty for testing without a backend node
     exchange: 'noop'|'', //add noop for testing without a backend
     autoFlush: boolean, //Default to false. Always set to false unless you know what you are doing. explicitly write data to disk after each operation if set to true
-    useRelay: boolean //default to true. If true it forces the connection through relay
+    useRelay: boolean, //default to true. If true it forces the connection through relay
+    refresh: boolean? //forces the fula object to be recreated. default is false
 );
 ```
 
@@ -131,7 +133,9 @@ await fula.isReady(
 //checks if client can reach server
 const result //returns true if it can, and false if it cannot
 = 
-await fula.checkConnection();
+await fula.checkConnection(
+    timeout: number? //default to 20. Maximum time in seconds that checkConnection waits before throwing an error
+);
 
 ```
 
@@ -141,7 +145,19 @@ const result //returns true if there are, and false if everything is synced with
 = 
 await fula.checkFailedActions(
     retry: boolean //if true, it tries to sync device with server, if not, it only checks
+    timeout: number? //default to 20. Maximum time in seconds that checkConnection waits before throwing an error
+);
+```
+
+```js
+//Gives access to the blox for a specific peerId. This call must be made from the authorizer only.
+const result //returns true if succesful and false if fails
+= 
+await fula.setAuth(
+    peerId: string, //peer ID of the app that needs access to the blox
+    allow: boolean, // true to allow and false to remove access
 );
+
 ```
 
 ```js

android/build.gradle

@@ -62,8 +62,9 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.github.functionland:fula-build-aar:v0.8.4' // From jitpack.io
+    implementation 'com.github.functionland:fula-build-aar:1.11.2' // From jitpack.io
     implementation 'com.github.functionland:wnfs-build-aar:v1.4.1' // From jitpack.io
     implementation 'commons-io:commons-io:20030203.000550'
+    implementation 'commons-codec:commons-codec:1.15'
     // implementation files('mobile.aar')
 }

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

@@ -3,10 +3,13 @@
 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;
@@ -17,24 +20,34 @@
 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, 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);
+    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, 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");
+    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;
   }