flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-15 18:02:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: handle IPv6 addresses correctly in RDP connection string

Browse Source
This commit is contained in:
hstyi
2025-12-22 09:13:23 +08:00
committed by GitHub
parent dad4d26fd8
commit 3ece32e427
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt
View File

@@ -10,6 +10,8 @@ import kotlinx.coroutines.launch
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import org.apache.commons.io.IOUtils import org.apache.commons.io.IOUtils
import org.apache.commons.lang3.StringUtils import org.apache.commons.lang3.StringUtils
import org.apache.commons.lang3.Strings
import org.apache.commons.lang3.SystemUtils
import java.awt.datatransfer.DataFlavor import java.awt.datatransfer.DataFlavor
import java.awt.datatransfer.StringSelection import java.awt.datatransfer.StringSelection
import java.net.URI import java.net.URI
@@ -64,7 +66,15 @@ internal class RDPProtocolProvider private constructor() : GenericProtocolProvid
} }
val sb = StringBuilder() val sb = StringBuilder()
sb.append("full address:s:").append(host.host).append(':').append(host.port).appendLine() sb.append("full address:s:")
if (SystemUtils.IS_OS_WINDOWS && Strings.CI.contains(host.host, ":")) {
var newHost = Strings.CI.removeStart(host.host, "[")
newHost = Strings.CI.removeEnd(newHost, "]")
sb.append('[').append(newHost).append(']')
} else {
sb.append(host.host)
}
sb.append(':').append(host.port).appendLine()
sb.append("username:s:").append(host.username).appendLine() sb.append("username:s:").append(host.username).appendLine()
val desktop = host.options.extras["desktop"] val desktop = host.options.extras["desktop"]
if (desktop.isNullOrBlank().not()) { if (desktop.isNullOrBlank().not()) {