Fix RSA key validation #186

massivemadness · Apr 5, 2023 · 26c98f4 · 26c98f4
1 parent 8f1b693
commit 26c98f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/filesystems/filesystem-sftp/build.gradle b/filesystems/filesystem-sftp/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation files("libs/bcprov-jdk18on-172.jar")
 
     // Network
-    implementation library.sftpclient
+    implementation library.jsch
 
     // Coroutines
     implementation library.coroutines_core

diff --git a/...ms/filesystem-sftp/src/main/kotlin/com/blacksquircle/ui/filesystem/sftp/SFTPFilesystem.kt b/...ms/filesystem-sftp/src/main/kotlin/com/blacksquircle/ui/filesystem/sftp/SFTPFilesystem.kt
@@ -49,13 +49,12 @@ class SFTPFilesystem(
         return FileModel(SFTP_SCHEME + serverConfig.initialDir, serverConfig.uuid)
     }
 
-    @Suppress("UNCHECKED_CAST")
     override fun provideDirectory(parent: FileModel): FileTree {
         try {
             connect()
             return FileTree(
                 parent = sftpMapper.parent(parent),
-                children = (channel?.ls(parent.path) as Vector<ChannelSftp.LsEntry>)
+                children = channel?.ls(parent.path).orEmpty()
                     .filter { it.filename.isValidFileName() }
                     .map(sftpMapper::toFileModel),
             )

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -61,7 +61,7 @@ ext {
     // Network
     gson_version = '2.10.1'
     ftpclient_version = '3.9.0'
-    sftpclient_version = '0.1.55'
+    jsch_version = '0.2.8'
 
     // Coroutines
     coroutines_version = '1.6.4'
@@ -128,7 +128,7 @@ ext {
             // Network
             gson: "com.google.code.gson:gson:$gson_version",
             ftpclient: "commons-net:commons-net:$ftpclient_version",
-            sftpclient: "com.jcraft:jsch:$sftpclient_version",
+            jsch: "com.github.mwiede:jsch:$jsch_version",
 
             // Coroutines
             coroutines_core: "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version",