feat: Implement configurable hasher

Author: zanechua

README.md

@@ -20,16 +20,49 @@ Compatibility Table
 
 ## Usage
 
-`rawHash` is the hexadecimal representation
-
-`encodedHash` is the string representation
-
 ```javascript
 import argon2 from 'react-native-argon2';
 const password = 'password';
 const salt = '1234567891011121314151617181920212223242526272829303132333435363';
-const result = await argon2(password, salt);
+const result = await argon2(password, salt, {});
 const { rawHash, encodedHash } = result;
 // rawHash: 031d6c82ddede1200f4794605052745dd562bd4db358e23dac1b11c052eff8d9
 // encodedHash: $argon2id$v=19$m=32768,t=2,p=1$MTIzNDU2Nzg5MTAxMTEyMTMxNDE1MTYxNzE4MTkyMDIxMjIyMzI0MjUyNjI3MjgyOTMwMzEzMjMzMzQzNTM2Mw$Ax1sgt3t4SAPR5RgUFJ0XdVivU2zWOI9rBsRwFLv+Nk
 ```
+
+### Input
+The package takes in the following variables:
+
+| Parameter           | Type    |
+|---------------------|---------|
+| password            | string  |
+| salt                | string  |
+| config              | object  |
+| config.iterations   | integer |
+| config.memory       | integer |
+| config.parallelism  | integer |
+| config.hashLength   | integer |
+| config.mode         | string  |
+
+You are not required to configure the third parameter which is the `config` object, however you do have to provide an empty object to it if you are not changing any of the values. You can set config values with the following example:
+
+```javascript
+const result = await argon2(
+    password,
+    salt,
+    {
+      iterations: 5,
+      memory: 16 * 1024,
+      parallelism: 2,
+      hashLength: 20,
+      mode: 'argon2i'
+    }
+);
+```
+
+
+### Output
+
+`rawHash` is the hexadecimal representation
+
+`encodedHash` is the string representation

android/src/main/java/com/poowf/argon2/RNArgon2Module.java

@@ -7,6 +7,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.Promise;
@@ -29,19 +30,21 @@ public String getName() {
     }
 
     @ReactMethod
-    public void argon2(String password, String salt, Promise promise) {
+    public void argon2(String password, String salt, ReadableMap config, Promise promise) {
         try {
             final byte[] passwordBytes = password.getBytes("UTF-8");
             final byte[] saltBytes = salt.getBytes("UTF-8");
-            Integer iterations = new Integer(2);
-            Integer memory = new Integer(32 * 1024);
-            Integer parallelism = new Integer(1);
-            Integer hashLength = new Integer(32);
+
+            Integer iterations = config.hasKey("iterations") ? new Integer(config.getInt("iterations")) : new Integer(2);
+            Integer memory = config.hasKey("memory") ? new Integer(config.getInt("memory")) : new Integer(32 * 1024);
+            Integer parallelism = config.hasKey("parallelism") ? new Integer(config.getInt("parallelism")) : new Integer(1);
+            Integer hashLength = config.hasKey("hashLength") ? new Integer(config.getInt("hashLength")) : new Integer(32);
+            Argon2Mode mode = config.hasKey("mode") ? getArgon2Mode(config.getString("mode")) : Argon2Mode.ARGON2_ID;
 
             final Argon2Kt argon2Kt = new Argon2Kt();
 
             final Argon2KtResult hashResult = argon2Kt.hash(
-                    Argon2Mode.ARGON2_ID,
+                    mode,
                     passwordBytes,
                     saltBytes,
                     iterations,
@@ -60,4 +63,24 @@ public void argon2(String password, String salt, Promise promise) {
             promise.reject("Failed to generate argon2 hash", exception);
         }
     }
+
+    public Argon2Mode getArgon2Mode(String mode) {
+        Argon2Mode selectedMode;
+        switch (mode) {
+            case "argon2d":
+                selectedMode = Argon2Mode.ARGON2_D;
+                break;
+            case "argon2i":
+                selectedMode = Argon2Mode.ARGON2_I;
+                break;
+            case "argon2id":
+                selectedMode = Argon2Mode.ARGON2_ID;
+                break;
+            default:
+                selectedMode = Argon2Mode.ARGON2_ID;
+                break;
+        }
+
+        return selectedMode;
+    }
 }

android/src/main/java/com/poowf/argon2/RNArgon2Package.java

@@ -11,7 +11,6 @@
 import java.util.List;
 
 public class RNArgon2Package implements ReactPackage {
-
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
@@ -20,14 +19,8 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         return modules;
     }
 
-    // Deprecated since React Native 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return Collections.emptyList();
     }
-
 }

ios/RNArgon2.swift

@@ -3,21 +3,22 @@ import CatCrypto
 
 @objc(RNArgon2)
 class RNArgon2: NSObject {
-
   @objc
   static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   @objc
-  func argon2(_ password: String, salt: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
+  func argon2(_ password: String, salt: String, config: NSDictionary? = nil, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
     let argon2Context = CatArgon2Context.init();
-    argon2Context.iterations = 2;
-    argon2Context.memory = 32 * 1024;
-    argon2Context.parallelism = 1;
+    let configDict = config as! Dictionary<String,Any>
+
+    argon2Context.iterations = configDict["iterations", default: 2 ] as! Int;
+    argon2Context.memory = configDict["memory", default: 32 * 1024 ] as! Int;
+    argon2Context.parallelism = configDict["parallelism", default: 1 ] as! Int;
     argon2Context.salt = salt;
-    argon2Context.hashLength = 32;
-    argon2Context.mode = .argon2id;
+    argon2Context.hashLength = configDict["hashLength", default: 32 ] as! Int;
+    argon2Context.mode = getArgon2Mode(mode: configDict["mode", default: "argon2id" ] as! String);
 
     let argon2Crypto = CatArgon2Crypto.init(context: argon2Context);
     let encodedResult = argon2Crypto.hash(password: password);
@@ -41,4 +42,23 @@ class RNArgon2: NSObject {
     resolve(resultDictionary);
   }
 
+  func getArgon2Mode(mode: String) -> CatArgon2Mode {
+    var selectedMode: CatArgon2Mode;
+    switch mode {
+        case "argon2d":
+            selectedMode = CatArgon2Mode.argon2d;
+            break;
+        case "argon2i":
+            selectedMode = CatArgon2Mode.argon2i;
+            break;
+        case "argon2id":
+            selectedMode = CatArgon2Mode.argon2id;
+            break;
+        default:
+            selectedMode = CatArgon2Mode.argon2id;
+            break;
+    }
+
+    return selectedMode;
+  }
 }

ios/RNArgon2Bridge.m

@@ -2,6 +2,6 @@
 
 @interface RCT_EXTERN_MODULE(RNArgon2, NSObject)
 
-RCT_EXTERN_METHOD(argon2: (NSString *)password salt:(NSString *)salt resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(argon2: (NSString *)password salt:(NSString *)salt config:(NSDictionary *)config resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 @end