From 9b84fb4ec8e2e5212c726e66d7d21a5c0cb85b99 Mon Sep 17 00:00:00 2001 From: hstyi Date: Thu, 27 Mar 2025 11:52:36 +0800 Subject: [PATCH] chore: ignore verify server key (#398) --- src/main/kotlin/app/termora/SshClients.kt | 25 +------------------ src/main/resources/i18n/messages.properties | 1 - .../resources/i18n/messages_zh_CN.properties | 1 - .../resources/i18n/messages_zh_TW.properties | 1 - 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/main/kotlin/app/termora/SshClients.kt b/src/main/kotlin/app/termora/SshClients.kt index 02c219f..bef56ce 100644 --- a/src/main/kotlin/app/termora/SshClients.kt +++ b/src/main/kotlin/app/termora/SshClients.kt @@ -336,30 +336,7 @@ private class MyDialogServerKeyVerifier(private val owner: Window) : ServerKeyVe remoteAddress: SocketAddress, serverKey: PublicKey ): Boolean { - - if (SshClients.isMiddleware(clientSession)) { - return true - } - - val result = AtomicBoolean(false) - - SwingUtilities.invokeAndWait { - result.set( - OptionPane.showConfirmDialog( - parentComponent = owner, - message = I18n.getString( - "termora.host.verify-server-key", - remoteAddress.toString().replace("/", StringUtils.EMPTY), - KeyUtils.getKeyType(serverKey), - KeyUtils.getFingerPrint(serverKey) - ), - optionType = JOptionPane.OK_CANCEL_OPTION, - messageType = JOptionPane.WARNING_MESSAGE, - ) == JOptionPane.OK_OPTION - ) - } - - return result.get() + return true } override fun acceptModifiedServerKey( diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 393b695..6683f08 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -39,7 +39,6 @@ termora.doorman.mnemonic.incorrect=Incorrect mnemonic # Hosts -termora.host.verify-server-key=Host [{0}] key has been changed

{1} key fingerprint is {2}

Are you sure you want to continue connecting? termora.host.modified-server-key=HOST [{0}] IDENTIFICATION HAS CHANGED

Expected: {1} key fingerprint is {2}

Actual: {3} key fingerprint is {4}

Are you sure you want to continue connecting? diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index bdf5d2d..78abb16 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -37,7 +37,6 @@ termora.doorman.mnemonic.incorrect=助记词错误 # Hosts -termora.host.verify-server-key=主机 [{0}] 密钥已经改变

{1} 的指纹 {2}

你确定要继续连接吗? termora.host.modified-server-key=主机 [{0}] 身份已发生变化

期待: {1} 的指纹 {2}

实际: {3} 的指纹 {4}

你确定要继续连接吗? diff --git a/src/main/resources/i18n/messages_zh_TW.properties b/src/main/resources/i18n/messages_zh_TW.properties index b84cc58..55574c3 100644 --- a/src/main/resources/i18n/messages_zh_TW.properties +++ b/src/main/resources/i18n/messages_zh_TW.properties @@ -38,7 +38,6 @@ termora.doorman.mnemonic.incorrect=助記詞錯誤 # Hosts -termora.host.verify-server-key=主機 [{0}] 金鑰已經改變

{1} 的指紋 {2}

你確定要繼續連線嗎? termora.host.modified-server-key=主機 [{0}] 身分已變更

期待: {1} 的指紋 {2}

實際: {3} 的指紋 {4}

你確定要繼續連線嗎?