diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bbf39af..9e243d4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -106,7 +106,7 @@ eddsa = { module = "net.i2p.crypto:eddsa", version.ref = "eddsa" } exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } exposed-crypt = { module = "org.jetbrains.exposed:exposed-crypt", version.ref = "exposed" } exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" } -exposed-migration = { module = "org.jetbrains.exposed:exposed-migration", version.ref = "exposed" } +exposed-migration = { module = "org.jetbrains.exposed:exposed-migration-core", version.ref = "exposed" } h2 = { module = "com.h2database:h2", version.ref = "h2" } sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" } jug = { module = "com.fasterxml.uuid:java-uuid-generator", version.ref = "jug" } diff --git a/src/main/kotlin/app/termora/transfer/internal/sftp/SFTPTransferProtocolProvider.kt b/src/main/kotlin/app/termora/transfer/internal/sftp/SFTPTransferProtocolProvider.kt index 70bf82c..a3f9687 100644 --- a/src/main/kotlin/app/termora/transfer/internal/sftp/SFTPTransferProtocolProvider.kt +++ b/src/main/kotlin/app/termora/transfer/internal/sftp/SFTPTransferProtocolProvider.kt @@ -8,6 +8,8 @@ import org.apache.commons.io.IOUtils import org.apache.commons.lang3.StringUtils import org.apache.sshd.client.SshClient import org.apache.sshd.client.session.ClientSession +import org.apache.sshd.core.CoreModuleProperties +import org.apache.sshd.sftp.SftpModuleProperties import org.apache.sshd.sftp.client.SftpClientFactory internal class SFTPTransferProtocolProvider : TransferProtocolProvider { @@ -32,6 +34,11 @@ internal class SFTPTransferProtocolProvider : TransferProtocolProvider { client = if (owner == null) SshClients.openClient(requester.host) else SshClients.openClient(requester.host, owner) session = SshClients.openSession(requester.host, client) + + CoreModuleProperties.IO_CONNECT_TIMEOUT.get(client).ifPresent { e -> + SftpModuleProperties.SFTP_CHANNEL_OPEN_TIMEOUT.set(session, e) + } + val fileSystem = SftpClientFactory.instance().createSftpFileSystem(session) val host = requester.host