Fix: ED25519 SSH keys not working (#1595)

* Push testing stuffs for #1289 SFTP ED25519 KEYS

* remove: maverick-bc; use bc directly as workaround for now

* refactor: sftp log file to use a non-hard-coded value.

This commit removes a hard-coded file path for the log file, Using a `context` retrieved app data directory Path.

Docs Ref: https://developer.android.com/reference/android/content/Context#getExternalFilesDir(java.lang.String)

* Update Sftp.java

---------

Co-authored-by: Rohit Kushvaha <oldisg131@gmail.com>

Author: UnschooledGamer

build-extras.gradle

@@ -1,5 +1,15 @@
+android {
+    packagingOptions {
+        pickFirst 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
+    }
+}
+
 configurations {
   all {
       exclude module: 'commons-logging'
+      exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
+      exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
+      exclude group: 'org.bouncycastle', module: 'bcpkix-jdk18on'
+      exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
   }
 }

package-lock.json

@@ -25,7 +25,6 @@
       "cordova-clipboard": {},
       "cordova-plugin-device": {},
       "cordova-plugin-file": {},
-      "cordova-plugin-sftp": {},
       "cordova-plugin-server": {},
       "cordova-plugin-ftp": {},
       "cordova-plugin-sdcard": {},
@@ -37,7 +36,9 @@
       "cordova-plugin-buildinfo": {},
       "cordova-plugin-system": {},
       "cordova-plugin-browser": {},
-      "com.foxdebug.acode.rk.exec.terminal": {}
+      "com.foxdebug.acode.rk.exec.terminal": {},
+      "com.foxdebug.acode.rk.exec.proot": {},
+      "cordova-plugin-sftp": {}
     },
     "platforms": [
       "android"
@@ -62,6 +63,7 @@
     "@types/url-parse": "^1.4.11",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
+    "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
     "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
     "cordova-android": "^14.0.1",
     "cordova-clipboard": "^1.3.0",

package.json

@@ -26,5 +26,7 @@
 
     <framework src="commons-io:commons-io:2.11.0" />
     <framework src="com.sshtools:maverick-synergy-client:3.1.2" />
-    <framework src="com.sshtools:maverick-bc:3.1.2" />
+<!--    <framework src="com.sshtools:maverick-bc:3.1.2" />-->
+    <framework src="org.bouncycastle:bcprov-jdk15to18:1.79" />
+    <framework src="org.bouncycastle:bcpkix-jdk15to18:1.79" />
 </plugin>

src/plugins/sftp/plugin.xml

@@ -33,13 +33,16 @@
 import java.net.URLEncoder;
 import java.nio.channels.UnresolvedAddressException;
 import java.nio.charset.StandardCharsets;
+import java.security.Security;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import java.util.Arrays;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 public class Sftp extends CordovaPlugin {
 
@@ -178,7 +181,23 @@ public void run() {
               ContentResolver contentResolver = context.getContentResolver();
               InputStream in = contentResolver.openInputStream(uri);
 
-              JCEProvider.enableBouncyCastle(true);
+//            for `appDataDirectory`, Ref: https://developer.android.com/reference/android/content/Context#getExternalFilesDir(java.lang.String)
+//            the absolute path to application-specific directory. May return *null* if shared storage is not currently available.
+              File appDataDirectory = context.getExternalFilesDir(null);
+              if (appDataDirectory != null) {
+                com.sshtools.common.logger.Log.getDefaultContext().enableFile(com.sshtools.common.logger.Log.Level.DEBUG, new File(appDataDirectory,"synergy.log"));
+              }
+//            JCEProvider.enableBouncyCastle(false);
+
+              Log.i(TAG, "All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders()));
+              Log.i(TAG, "All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519")));
+              Log.i(TAG, "BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
+              Security.removeProvider("BC");
+              Security.insertProviderAt(new BouncyCastleProvider(), 1);
+
+              Log.i(TAG, "(After Inserting BC) All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders()));
+              Log.i(TAG, "(After Inserting BC) All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519")));
+              Log.i(TAG, "(After Inserting BC) BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
 
               SshKeyPair keyPair = null;
               try {