コミット: d370b734880cb161d644f7cb601a0919dc4148b9 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

コミットメタ情報

• リビジョン: d370b734880cb161d644f7cb601a0919dc4148b9 (tree)
• 日時: 2018-02-21 12:02:02
• 作者: IWAMOTO Kouichi <sue@iwmt...>
• コミッター: IWAMOTO Kouichi

ログメッセージ

設定で SSH_MSG_USERAUTH_BANNER の表示方法を設定できるようにした

[TTSSH]
; Authentication Banner
; 0 ... ignore
; 1 ... display in VT window
; 2 ... display by popup message box
; 3 ... display by balloon tip
AuthBanner=1

また、メッセージボックスでの表示にも対応した。

メッセージの表示されるタイミングが気に入らないけれど、対応が難しい……

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@7048 f5f01b69-1e22-0410-acbf-894ab4bd6246

変更サマリ

• modified: installer/release/TERATERM.INI
• modified: ttssh2/ttxssh/ssh.c
• modified: ttssh2/ttxssh/ttxssh.c
• modified: ttssh2/ttxssh/ttxssh.h

差分

--- a/installer/release/TERATERM.INI
+++ b/installer/release/TERATERM.INI
@@ -901,6 +901,13 @@ ForwardAgentNotify=1
 ; Verify host key by DNS (1=enabled 0=disabled)
 VerifyHostKeyDNS=0
 
+; Authentication Banner
+;  0 ... ignore
+;  1 ... display in VT window
+;  2 ... display by popup message box
+;  3 ... display by balloon tip
+AuthBanner=1
+
 ; SSH Icon
 SSHIcon=Default
 

--- a/ttssh2/ttxssh/ssh.c
+++ b/ttssh2/ttxssh/ssh.c
@@ -6951,9 +6951,20 @@ static BOOL handle_SSH2_userauth_banner(PTInstVar pvar)
 	}
 
 	if (msglen > 0) {
-		pvar->ssh_state.payload_datastart = 4;
-		pvar->ssh_state.payload_datalen = msglen;
-		NotifyInfoMessage(pvar->cv, buff, "Authentication Banner");
+		switch (pvar->settings.AuthBanner) {
+		case 0:
+			break;
+		case 1:
+			pvar->ssh_state.payload_datastart = 4;
+			pvar->ssh_state.payload_datalen = msglen;
+			break;
+		case 2:
+			MessageBox(pvar->cv->HWin, buff, "Authentication Banner", MB_OK | MB_ICONINFORMATION);
+			break;
+		case 3:
+			NotifyInfoMessage(pvar->cv, buff, "Authentication Banner");
+			break;
+		}
 		logprintf(LOG_LEVEL_NOTICE, "Banner len: %d, Banner message: %s.", msglen, buff);
 	}
 	else {

--- a/ttssh2/ttxssh/ttxssh.c
+++ b/ttssh2/ttxssh/ttxssh.c
@@ -542,6 +542,8 @@ static void read_ssh_options(PTInstVar pvar, PCHAR fileName)
 
 	settings->GexMinimalGroupSize = GetPrivateProfileInt("TTSSH", "GexMinimalGroupSize", 0, fileName);
 
+	settings->AuthBanner = GetPrivateProfileInt("TTSSH", "AuthBanner", 1, fileName);
+
 	clear_local_settings(pvar);
 }
 
@@ -665,6 +667,9 @@ static void write_ssh_options(PTInstVar pvar, PCHAR fileName,
 
 	_itoa_s(settings->GexMinimalGroupSize, buf, sizeof(buf), 10);
 	WritePrivateProfileString("TTSSH", "GexMinimalGroupSize", buf, fileName);
+
+	_itoa_s(settings->AuthBanner, buf, sizeof(buf), 10);
+	WritePrivateProfileString("TTSSH", "AuthBanner", buf, fileName);
 }
 
 

--- a/ttssh2/ttxssh/ttxssh.h
+++ b/ttssh2/ttxssh/ttxssh.h
@@ -192,6 +192,8 @@ typedef struct _TS_SSH {
 	int UpdateHostkeys;
 
 	int GexMinimalGroupSize;
+
+	int AuthBanner;
 } TS_SSH;
 
 typedef struct _TInstVar {