chore: bump sshd core to 2.12.1

chore: bump sshd core to `2.10.0`

chore: bump sshd core to `2.8.0`

chore: bump sshd core to `2.6.0`

chore: bump sshd core to `2.4.0`

chore: bump sshd core to `2.3.0`

chore: bump sshd core to `2.2.0`

chore: bump sshd core to `2.1.0`

chore: bump sshd core to `2.0.0`

chore: bump sshd core to `1.7.0`

build.gradle.kts

@@ -154,7 +154,7 @@ abstract class FixPosixFilePermissionClassVisitorFactory :
                 signature: String?,
                 exceptions: Array<out String>?
             ): MethodVisitor {
-                if (name == "attributesToPermissions") { // org.apache.sshd.common.subsystem.sftp.SftpHelper.attributesToPermissions
+                if (name == "attributesToPermissions") { // org.apache.sshd.sftp.common.SftpHelper.attributesToPermissions
                     return object : MethodVisitor(instrumentationContext.apiVersion.get(), super.visitMethod(access, name, descriptor, signature, exceptions)) {
                         override fun visitTypeInsn(opcode: Int, type: String?) {
                             // We need to prevent Android Desugar modifying the `PosixFilePermission` classname.
@@ -179,7 +179,7 @@ abstract class FixPosixFilePermissionClassVisitorFactory :
     }
 
     override fun isInstrumentable(classData: ClassData): Boolean {
-        return (classData.className == "org.apache.sshd.common.subsystem.sftp.SftpHelper").also {
+        return (classData.className == "org.apache.sshd.sftp.common.SftpHelper").also {
             if (it) println("SftpHelper Found! Instrumenting...")
         }
     }
@@ -224,6 +224,8 @@ dependencies {
     implementation(libs.slf4j.handroid)
 
     implementation(libs.apache.sshd.core)
+    implementation(libs.apache.sshd.sftp)
+    implementation(libs.apache.sshd.scp)
     implementation(libs.apache.mina.core) //For some reason, makes sshd-core:0.14.0 work without NIO, which isn't available until Android 8 (api 26)
 
     //implementation("com.github.bright:slf4android:0.1.6") { transitive = true } // For org.apache.sshd debugging

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ reactiveStreams = "1.0.4"
 recyclerview = "1.3.2"
 rxjava = "2.2.21"
 sl4j = "2.0.4"
-sshdCore = "1.0.0"
+sshdCore = "2.12.1"
 swiperefreshlayout = "1.1.0"
 uiToolingPreview = "1.6.7"
 univocityParsers = "2.9.1"
@@ -74,6 +74,8 @@ logger = { module = "com.klinkerapps:logger", version.ref = "logger" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 apache-mina-core = { module = "org.apache.mina:mina-core", version.ref = "minaCore" }
 apache-sshd-core = { module = "org.apache.sshd:sshd-core", version.ref = "sshdCore" }
+apache-sshd-sftp = { module = "org.apache.sshd:sshd-sftp", version.ref = "sshdCore" }
+apache-sshd-scp = { module = "org.apache.sshd:sshd-scp", version.ref = "sshdCore" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
 reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactiveStreams" }
 rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava" }

src/org/kde/kdeconnect/Plugins/SftpPlugin/DHG14_256Factory.kt

@@ -11,7 +11,7 @@ import org.apache.sshd.common.kex.AbstractDH
 import org.apache.sshd.common.kex.DHFactory
 import org.apache.sshd.common.kex.DHG
 import org.apache.sshd.common.kex.DHGroupData
-import org.apache.sshd.common.util.SecurityUtils
+import org.apache.sshd.common.util.security.SecurityUtils
 import java.math.BigInteger
 
 object DHG14_256Factory : DHFactory {

src/org/kde/kdeconnect/Plugins/SftpPlugin/SignatureRSASHA256.kt

@@ -6,6 +6,7 @@
  */
 package org.kde.kdeconnect.Plugins.SftpPlugin
 
+import org.apache.sshd.common.session.SessionContext
 import org.apache.sshd.common.signature.AbstractSignature
 import org.apache.sshd.common.signature.Signature
 import org.apache.sshd.common.signature.SignatureFactory
@@ -23,22 +24,18 @@ class SignatureRSASHA256 : AbstractSignature("SHA256withRSA") {
     }
 
     @Throws(Exception::class)
-    override fun sign(): ByteArray {
+    override fun sign(session: SessionContext): ByteArray {
         return signature.sign()
     }
 
     @Throws(Exception::class)
-    override fun verify(sig: ByteArray): Boolean {
+    override fun verify(session: SessionContext, sig: ByteArray): Boolean {
         var data = sig
-        val encoding = extractEncodedSignature(data)
+        val encoding = extractEncodedSignature(data) { type ->
+            type == "rsa-sha2-256"
+        }
         if (encoding != null) {
-            val keyType = encoding.first
+            data = encoding.value
-            ValidateUtils.checkTrue(
-                "rsa-sha2-256" == keyType,
-                "Mismatched key type: %s",
-                keyType
-            )
-            data = encoding.second
         }
 
         return signature.verify(data)

src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.kt

@@ -9,20 +9,22 @@ package org.kde.kdeconnect.Plugins.SftpPlugin
 import android.content.Context
 import android.os.Build
 import android.util.Log
-import org.apache.sshd.common.NamedFactory
 import org.apache.sshd.common.file.nativefs.NativeFileSystemFactory
 import org.apache.sshd.common.kex.BuiltinDHFactories
 import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider
+import org.apache.sshd.common.session.SessionContext
 import org.apache.sshd.common.signature.BuiltinSignatures
-import org.apache.sshd.common.util.SecurityUtils
+import org.apache.sshd.common.util.io.PathUtils
-import org.apache.sshd.server.Command
+import org.apache.sshd.common.util.security.SecurityUtils.SECURITY_PROVIDER_REGISTRARS
+import org.apache.sshd.scp.server.ScpCommandFactory
+import org.apache.sshd.server.ServerBuilder
 import org.apache.sshd.server.SshServer
 import org.apache.sshd.server.auth.password.PasswordAuthenticator
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator
-import org.apache.sshd.server.command.ScpCommandFactory
 import org.apache.sshd.server.kex.DHGServer
 import org.apache.sshd.server.session.ServerSession
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory
+import org.apache.sshd.server.subsystem.SubsystemFactory
+import org.apache.sshd.sftp.server.SftpSubsystemFactory
 import org.kde.kdeconnect.Device
 import org.kde.kdeconnect.Helpers.RandomHelper
 import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper
@@ -30,6 +32,7 @@ import org.kde.kdeconnect.Helpers.SecurityHelpers.constantTimeCompare
 import org.kde.kdeconnect.Plugins.SftpPlugin.saf.SafFileSystemFactory
 import java.io.IOException
 import java.nio.charset.StandardCharsets
+import java.nio.file.Path
 import java.security.GeneralSecurityException
 import java.security.KeyPair
 import java.security.MessageDigest
@@ -47,7 +50,7 @@ internal class SimpleSftpServer {
 
     var isInitialized: Boolean = false
 
-    private val sshd: SshServer = SshServer.setUpDefaultServer()
+    private lateinit var sshd: SshServer
 
     private var safFileSystemFactory: SafFileSystemFactory? = null
 
@@ -57,18 +60,18 @@ internal class SimpleSftpServer {
 
     @Throws(GeneralSecurityException::class)
     fun initialize(context: Context?, device: Device) {
-        sshd.signatureFactories =
+        sshd = ServerBuilder.builder().apply {
-            listOf(
+            signatureFactories(
-                BuiltinSignatures.nistp256,
+                listOf(
-                BuiltinSignatures.nistp384,
+                    BuiltinSignatures.nistp256,
-                BuiltinSignatures.nistp521,
+                    BuiltinSignatures.nistp384,
-                BuiltinSignatures.dsa,
+                    BuiltinSignatures.nistp521,
-                SignatureRSASHA256.Factory,
+                    BuiltinSignatures.dsa,
-                BuiltinSignatures.rsa // Insecure SHA1, left for backwards compatibility
+                    SignatureRSASHA256.Factory,
+                    BuiltinSignatures.rsa // Insecure SHA1, left for backwards compatibility
+                )
             )
-
+            keyExchangeFactories(listOf(
-        sshd.keyExchangeFactories =
-            listOf(
                 BuiltinDHFactories.ecdhp256,  // ecdh-sha2-nistp256
                 BuiltinDHFactories.ecdhp384,  // ecdh-sha2-nistp384
                 BuiltinDHFactories.ecdhp521,  // ecdh-sha2-nistp521
@@ -76,8 +79,17 @@ internal class SimpleSftpServer {
                 BuiltinDHFactories.dhg14, // Insecure diffie-hellman-group14-sha1, left for backwards-compatibility.
             ).map {
                 DHGServer.newFactory(it)
-            }
+            })
 
+            fileSystemFactory(
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    NativeFileSystemFactory()
+                } else {
+                    safFileSystemFactory = SafFileSystemFactory(context!!)
+                    safFileSystemFactory // FIXME: This is not working
+                }
+            )
+        }.build()
 
         // Reuse this device keys for the ssh connection as well
         val keyPair = KeyPair(
@@ -85,18 +97,12 @@ internal class SimpleSftpServer {
             RsaHelper.getPrivateKey(context)
         )
         sshd.keyPairProvider = object : AbstractKeyPairProvider() {
-            override fun loadKeys(): Iterable<KeyPair> = listOf(keyPair)
+            override fun loadKeys(session: SessionContext): Iterable<KeyPair> = listOf(keyPair)
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            sshd.fileSystemFactory = NativeFileSystemFactory()
-        } else {
-            safFileSystemFactory = SafFileSystemFactory(context!!)
-            sshd.fileSystemFactory = safFileSystemFactory // FIXME: This is not working
-        }
         sshd.commandFactory = ScpCommandFactory()
         sshd.subsystemFactories =
-            listOf<NamedFactory<Command>>(SftpSubsystemFactory())
+            listOf<SubsystemFactory>(SftpSubsystemFactory())
 
         keyAuth.deviceKey = device.certificate.publicKey
 
@@ -182,7 +188,8 @@ internal class SimpleSftpServer {
         const val USER: String = "kdeconnect"
 
         init {
-            SecurityUtils.setRegisterBouncyCastle(false)
+            System.setProperty(SECURITY_PROVIDER_REGISTRARS, "") // disable BouncyCastle
+            PathUtils.setUserHomeFolderResolver { Path.of("/") } // TODO: Remove it when SSHD Core is fixed
         }
     }
 }

src/org/kde/kdeconnect/Plugins/SftpPlugin/saf/SafFileSystem.kt

@@ -3,7 +3,6 @@ package org.kde.kdeconnect.Plugins.SftpPlugin.saf
 import android.content.Context
 import android.util.Log
 import org.apache.sshd.common.file.util.BaseFileSystem
-import org.apache.sshd.common.file.util.ImmutableList
 import java.nio.file.attribute.UserPrincipalLookupService
 import java.nio.file.spi.FileSystemProvider
 
@@ -26,7 +25,7 @@ class SafFileSystem(
         throw UnsupportedOperationException("SAF does not support user principal lookup")
     }
 
-    override fun create(root: String, names: ImmutableList<String>): SafPath {
+    override fun create(root: String, names: List<String>): SafPath {
         Log.v(TAG, "create: $root, $names")
         return SafPath(this, root, names)
     }

src/org/kde/kdeconnect/Plugins/SftpPlugin/saf/SafFileSystemFactory.kt

@@ -8,10 +8,11 @@ package org.kde.kdeconnect.Plugins.SftpPlugin.saf
 
 import android.content.Context
 import android.util.Log
-import org.apache.sshd.common.session.Session
 import org.apache.sshd.common.file.FileSystemFactory
+import org.apache.sshd.common.session.SessionContext
 import org.kde.kdeconnect.Plugins.SftpPlugin.SftpPlugin
 import java.nio.file.FileSystem
+import java.nio.file.Path
 
 class SafFileSystemFactory(private val context: Context) : FileSystemFactory {
     private val provider = SafFileSystemProvider()
@@ -38,11 +39,13 @@ class SafFileSystemFactory(private val context: Context) : FileSystemFactory {
         }
     }
 
-    override fun createFileSystem(session: Session): FileSystem {
+    override fun createFileSystem(session: SessionContext?): FileSystem {
-        return SafFileSystem(provider, roots, session.username, context)
+        return SafFileSystem(provider, roots, session!!.username, context)
     }
 
     companion object {
         private const val TAG = "SafFileSystemFactory"
     }
+
+    override fun getUserHomeDir(session: SessionContext?): Path? = null
 }

src/org/kde/kdeconnect/Plugins/SftpPlugin/saf/SafPath.kt

@@ -1,13 +1,12 @@
 package org.kde.kdeconnect.Plugins.SftpPlugin.saf
 
 import org.apache.sshd.common.file.util.BasePath
-import org.apache.sshd.common.file.util.ImmutableList
 import java.nio.file.LinkOption
 import java.nio.file.Path
 
 class SafPath(
     fileSystem: SafFileSystem,
-    root: String, names: ImmutableList<String>
+    root: String, names: List<String>
 ) : BasePath<SafPath, SafFileSystem>(fileSystem, root, names) {
     override fun toRealPath(vararg options: LinkOption?): Path {
         return this // FIXME