release v2.2.1

Author: jda258

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.1
+* Fix bug in isConnected that affected sftp connections in iOS
+* Add function to get host fingerprint
+* Add function to get host banner
+
 ## 2.2.0
 * Change NMSSH to GZ-NMSSH: https://github.com/gaetanzanella/NMSSH/tree/feature/catalyst
   * Updated libssh and libssl

README.md

@@ -10,7 +10,7 @@ Add `ssh2` as a [dependency in your pubspec.yaml file](https://flutter.io/using-
 
 ## Known issue
 
-- Older Gradle versions are not supported due to incompatibilities with the newer JSch depencendy. This release was tested with Gradle version 7.0.2.
+- Older Gradle versions are not supported due to incompatibilities with the newer JSch dependency. This release was tested with Gradle version 7.0.2.
 
 ## Usage
 
@@ -73,6 +73,16 @@ await client.disconnect();
 var result = await client.execute("ps");
 ```
 
+### Get the fingerprint of the remote host
+```dart
+var result = await client.getHostFingerprint();
+```
+
+### Get the banner of the remote host
+```dart
+var result = await client.getBanner();
+```
+
 ### Shell
 
 #### Start shell: 

android/src/main/java/flutter/ssh2/SshPlugin.java

@@ -13,6 +13,7 @@
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.ChannelShell;
+import com.jcraft.jsch.HostKey;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
@@ -195,8 +196,14 @@ public void onMethodCall(MethodCall call, @NonNull Result rawResult) {
       case "disconnect":
         disconnect((HashMap) call.arguments);
         break;
-      case "isConnected":
-        isConnected((HashMap) call.arguments, result);
+      case "flutterIsConnected":
+        flutterIsConnected((HashMap) call.arguments, result);
+        break;
+      case "getHostFingerprint":
+        getHostFingerprint((HashMap) call.arguments, result);
+        break;
+      case "getRemoteBanner":
+        getRemoteBanner((HashMap) call.arguments, result);
         break;
       default:
         result.notImplemented();
@@ -207,6 +214,7 @@ public void onMethodCall(MethodCall call, @NonNull Result rawResult) {
   private static class SSHClient {
     Session _session;
     String _key;
+    String _hostKey;
     BufferedReader _bufferedReader;
     DataOutputStream _dataOutputStream;
     Channel _channel = null;
@@ -275,6 +283,11 @@ private void connectToHost(final HashMap args, final Result result) {
           SSHClient client = new flutter.ssh2.SshPlugin.SSHClient();
           client._session = session;
           client._key = key;
+
+          HostKey hostKey = session.getHostKey();
+          client._hostKey = hostKey.getHost()+" "+
+                  hostKey.getType()+" "+
+                  hostKey.getFingerPrint(jsch);
           clientPool.put(key, client);
 
           Log.d(LOGTAG, "Session connected");
@@ -443,7 +456,6 @@ private void sftpLs(final HashMap args, final Result result) {
         SSHClient client = clientPool.get(args.get("id"));
         ChannelSftp channelSftp = Objects.requireNonNull(client)._sftpSession;
 
-        @SuppressWarnings("unchecked")
         Vector<LsEntry> files = channelSftp.ls(Objects.requireNonNull(args.get("path")).toString());
         List<Map<String, Object>> response = new ArrayList<>();
 
@@ -601,15 +613,29 @@ private void disconnect(final HashMap args) {
     client._session.disconnect();
   }
 
-  private void isConnected(final HashMap args, final Result result) {
+  private void flutterIsConnected(final HashMap args, final Result result) {
     SSHClient client = clientPool.get(args.get("id"));
     if (client == null) {
 		result.success("false");
     } else if ( client._session == null || ! client._session.isConnected()) {
 		result.success("false");
     } else {
       result.success("true");
-    }   
+    }
+  }
+
+  private void getHostFingerprint(final HashMap args, final Result result) {
+    SSHClient client = clientPool.get(args.get("id"));
+    if (client != null) {
+      result.success(client._hostKey);
+    }
+  }
+
+  private void getRemoteBanner(final HashMap args, final Result result) {
+    SSHClient client = clientPool.get(args.get("id"));
+    if (client != null) {
+      result.success(client._session.getServerVersion());
+    }
   }
 
   private void sendEvent(Map<String, Object> event) {

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/ios/Podfile.lock

@@ -0,0 +1,35 @@
+PODS:
+  - Flutter (1.0.0)
+  - GZ-NMSSH (4.1.5)
+  - path_provider (0.0.1):
+    - Flutter
+  - ssh2 (2.2.1):
+    - Flutter
+    - GZ-NMSSH (~> 4.1.5)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - ssh2 (from `.symlinks/plugins/ssh2/ios`)
+
+SPEC REPOS:
+  trunk:
+    - GZ-NMSSH
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  path_provider:
+    :path: ".symlinks/plugins/path_provider/ios"
+  ssh2:
+    :path: ".symlinks/plugins/ssh2/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  GZ-NMSSH: d749f8ae2fd0094b953cd1d5abd8e0cab3c93f8d
+  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  ssh2: e3b392bc3ccaad3cb058c0e0d3630907033cf143
+
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+
+COCOAPODS: 1.10.2

example/pubspec.lock

@@ -70,14 +70,14 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -115,21 +115,21 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -143,28 +143,28 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   platform:
     dependency: transitive
     description:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.2"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.1"
+    version: "4.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -183,7 +183,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.1.2"
+    version: "2.2.1"
   stack_trace:
     dependency: transitive
     description:
@@ -246,7 +246,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.2.7"
   xdg_directories:
     dependency: transitive
     description:
@@ -255,5 +255,5 @@ packages:
     source: hosted
     version: "0.2.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.13.0 <3.0.0"
   flutter: ">=2.0.0"