Feature: Show TLS and MCP state in the server status bar

The main window's status bar now carries two short panes between the host
count and the FRP address. The first reports whether the server identity is
loaded, using the same ServerTlsIdentity::IsReady() check the rest of the UI
uses, so a menu that claims TLS is on cannot leave the bar saying otherwise
when the certificate failed to load. The second reports whether MCP is
enabled and, while it is, which protocol the endpoint speaks: (HTTP) or
(HTTPS) according to McpHttps. Both panes follow the existing 60 second
statistics tick, and toggling either switch in its dialog refreshes them at
once instead of leaving the bar stale until the next tick.

Pane widths are measured from the widest text each pane can show in the
current language instead of hardcoded pixels, and the measurement selects
the status bar's own font: DEFAULT_GUI_FONT is about 8% narrower than the
Segoe UI the bar paints with, which would have clipped "MCP: ... (HTTPS)"
at higher display scaling. Switching HTTP/HTTPS keeps the column width
steady, and turning MCP off lets it shrink again.

The MCP settings dialog was also missing translations for several of its
labels, the file write switch among them, which is why they stayed Chinese
in the English UI. Those keys, together with the status bar ones, are added
to all three language files.

Co-Authored-By: deepseek-flash
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-01 10:53:04 +01:00
1 parent e99092ca70
commit 559681ea01
7 files changed
+124 -23

No files matched your search

Binary file not shown.
+86 -17
View File
@@ -346,11 +346,42 @@ static bool ShouldLogAuth(const std::string& sn, int success) {
static UINT Indicators[] = {
IDR_STATUSBAR_STRING,
IDR_STATUSBAR_TLS, // 服务端 TLS 证书:有/无
IDR_STATUSBAR_MCP, // MCP 启用状态:开/关
IDR_STATUSBAR_FRP, // FRP 地址(由上级提供)
IDR_STATUSBAR_RUNTIME,
IDR_STATUSBAR_EXPIRE
};
// 状态栏短标签分区(TLS/MCP)的宽度:按当前语言下两种取值的实际文本宽度取大者,
// 再留出左右边距。硬编码像素在不同语言/DPI 下容易被截断或浪费空间。
static int CalcStatusFlagPaneWidth(const CStatusBar& bar, const CString& a, const CString& b)
{
CClientDC dc((CWnd*)&bar);
CFont* pOld = nullptr;
CFont* pFont = bar.GetFont();
// 状态栏没有显式设过字体时,绘制用的是系统的「状态栏字体」(Segoe UI 9pt),
// 比 DEFAULT_GUI_FONT 宽约 8%:100% 缩放下靠边距还能兜住,缩放比更高就会截断,
// 所以这里直接按状态栏字体测量。
CFont statusFont;
if (pFont == nullptr) {
NONCLIENTMETRICS ncm = {};
ncm.cbSize = sizeof(ncm);
if (::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)
&& statusFont.CreateFontIndirect(&ncm.lfStatusFont))
pFont = &statusFont;
}
if (pFont == nullptr)
pFont = CFont::FromHandle((HFONT)::GetStockObject(DEFAULT_GUI_FONT));
if (pFont != nullptr)
pOld = dc.SelectObject(pFont);
CSize szA = dc.GetTextExtent(a);
CSize szB = dc.GetTextExtent(b);
if (pOld != nullptr)
dc.SelectObject(pOld);
return max(szA.cx, szB.cx) + 16;
}
std::string EventName()
{
char eventName[64];
@@ -3404,8 +3435,8 @@ void CMy2015RemoteDlg::StartFrpcAuto(const FrpAutoConfig& cfg)
m_strFrpAddr.Format(_T("%hs:%d"), cfg.serverAddr.c_str(), cfg.remotePort);
// 直接更新状态栏 FRP 分区(不触发 OnSize 避免循环)
if (m_StatusBar.GetSafeHwnd()) {
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, 250);
m_StatusBar.SetPaneText(1, m_strFrpAddr);
m_StatusBar.SetPaneInfo(3, m_StatusBar.GetItemID(3), SBPS_NORMAL, 250);
m_StatusBar.SetPaneText(3, m_strFrpAddr);
}
Mprintf("[FRP-Auto] 启动自动代理: %s:%d -> frps:%d\n",
@@ -3434,8 +3465,8 @@ void CMy2015RemoteDlg::StopFrpcAuto()
m_strFrpAddr.Empty();
// 直接更新状态栏 FRP 分区(不触发 OnSize 避免循环)
if (m_StatusBar.GetSafeHwnd()) {
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, 0);
m_StatusBar.SetPaneText(1, _T(""));
m_StatusBar.SetPaneInfo(3, m_StatusBar.GetItemID(3), SBPS_NORMAL, 0);
m_StatusBar.SetPaneText(3, _T(""));
}
Mprintf("[FRP-Auto] 已停止\n");
@@ -3774,16 +3805,20 @@ void CMy2015RemoteDlg::OnSize(UINT nType, int cx, int cy)
Rect.right=cx;
Rect.bottom=cy;
m_StatusBar.MoveWindow(Rect);
// 4个分区:消息(自动拉伸)、FRP地址(250px)、运行统计(180px)、到期时间(180px)
// 6个分区:消息(自动拉伸)、TLS、MCP、FRP地址(250px)、运行统计(180px)、到期时间(180px)
int paneExpire = m_strExpireDate.IsEmpty() ? 0 : 180; // 无到期信息时隐藏
// 优先显示上级 FRPC,其次显示本机 FRPS
int paneFrp = 250;
int paneRuntime = 180;
int paneMsg = max(0, cx - paneFrp - paneRuntime - paneExpire - 20);
int paneTls = max(0, m_nPaneTlsWidth);
int paneMcp = max(0, m_nPaneMcpWidth);
int paneMsg = max(0, cx - paneTls - paneMcp - paneFrp - paneRuntime - paneExpire - 20);
m_StatusBar.SetPaneInfo(0, m_StatusBar.GetItemID(0), SBPS_STRETCH, paneMsg);
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, paneFrp);
m_StatusBar.SetPaneInfo(2, m_StatusBar.GetItemID(2), SBPS_NORMAL, paneRuntime);
m_StatusBar.SetPaneInfo(3, m_StatusBar.GetItemID(3), SBPS_NORMAL, paneExpire);
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, paneTls);
m_StatusBar.SetPaneInfo(2, m_StatusBar.GetItemID(2), SBPS_NORMAL, paneMcp);
m_StatusBar.SetPaneInfo(3, m_StatusBar.GetItemID(3), SBPS_NORMAL, paneFrp);
m_StatusBar.SetPaneInfo(4, m_StatusBar.GetItemID(4), SBPS_NORMAL, paneRuntime);
m_StatusBar.SetPaneInfo(5, m_StatusBar.GetItemID(5), SBPS_NORMAL, paneExpire);
}
if(m_ToolBar.m_hWnd!=NULL) { //工具条
@@ -3978,6 +4013,8 @@ void CMy2015RemoteDlg::OnTimer(UINT_PTR nIDEvent)
CRect rc;
GetClientRect(&rc);
OnSize(SIZE_RESTORED, rc.Width(), rc.Height());
// 此时服务端已 Activate、TLS 身份已加载,补一次刷新让 TLS/MCP 状态立刻正确
UpdateStatusBarStats();
}
__super::OnTimer(nIDEvent);
@@ -4030,7 +4067,7 @@ void CMy2015RemoteDlg::CheckHeartbeat()
}
}
// 更新状态栏统计信息(MTBF/运行时长、到期时间)
// 更新状态栏统计信息(TLS/MCP 状态、FRP 地址、MTBF/运行时长、到期时间)
void CMy2015RemoteDlg::UpdateStatusBarStats()
{
if (!m_StatusBar.GetSafeHwnd())
@@ -4038,7 +4075,32 @@ void CMy2015RemoteDlg::UpdateStatusBarStats()
CString strRuntime, strExpire;
// === 分区1:运行统计 ===
// === 分区1/2:TLS / MCP 状态 ===
// TLS:服务端身份已加载([tls] Enabled 且证书/私钥可用)。与协议切换等处用同一判定,
// 避免「菜单显示已启用但证书加载失败」时状态栏给出错误结论。
CString strTls = ServerTlsIdentity::IsReady() ? _TR("TLS: 有") : _TR("TLS: 无");
// MCP:读配置开关。启用后需重启才真正监听,此处反映的是「已启用」这一配置意图;
// 启用时一并标出访问协议(McpHttps=1 走 TLS 前端,证书坏了启动时整体 fail-closed)。
CString strMcp;
CString strMcpWidest;
if (THIS_CFG.GetInt("settings", "McpEnabled", 0)) {
strMcp = _TR("MCP: 开");
strMcp += THIS_CFG.GetInt("settings", "McpHttps", 0) ? _T(" (HTTPS)") : _T(" (HTTP)");
// 协议在 HTTP/HTTPS 之间切换时列宽保持稳定
strMcpWidest = _TR("MCP: 开") + _T(" (HTTPS)");
} else {
strMcp = _TR("MCP: 关");
strMcpWidest = strMcp;
}
// 宽度取当前状态下的最大取值(关闭时收窄,开启时按最长协议串留足)
m_nPaneTlsWidth = CalcStatusFlagPaneWidth(m_StatusBar, _TR("TLS: 有"), _TR("TLS: 无"));
m_nPaneMcpWidth = CalcStatusFlagPaneWidth(m_StatusBar, strMcp, strMcpWidest);
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, m_nPaneTlsWidth);
m_StatusBar.SetPaneText(1, strTls);
m_StatusBar.SetPaneInfo(2, m_StatusBar.GetItemID(2), SBPS_NORMAL, m_nPaneMcpWidth);
m_StatusBar.SetPaneText(2, strMcp);
// === 分区4:运行统计 ===
if (m_runNormal == 1) {
// 普通模式:显示程序运行时长
ULONGLONG uptime = GetTickCount64() - m_ullStartTime;
@@ -4094,7 +4156,7 @@ void CMy2015RemoteDlg::UpdateStatusBarStats()
strRuntime = _TR("运行:") + CString(_T(" ")) + strTime + _T(" ") + _TR("(无崩溃)");
}
}
// === 分区1:FRP 地址 ===
// === 分区3:FRP 地址 ===
// 优先显示上级配置的 FRPC,其次显示本机 FRPS
CString strFrpDisplay = m_strFrpAddr;
if (strFrpDisplay.IsEmpty()) {
@@ -4121,12 +4183,13 @@ void CMy2015RemoteDlg::UpdateStatusBarStats()
}
// 根据是否有内容设置分区宽度
int paneFrpWidth = 250;
m_StatusBar.SetPaneInfo(1, m_StatusBar.GetItemID(1), SBPS_NORMAL, paneFrpWidth);
m_StatusBar.SetPaneText(1, strFrpDisplay);
m_StatusBar.SetPaneInfo(3, m_StatusBar.GetItemID(3), SBPS_NORMAL, paneFrpWidth);
m_StatusBar.SetPaneText(3, strFrpDisplay);
m_StatusBar.SetPaneText(2, strRuntime);
// === 分区4:运行统计 ===
m_StatusBar.SetPaneText(4, strRuntime);
// === 分区3:到期时间 ===
// === 分区5:到期时间 ===
// 定期刷新到期时间(每 5 分钟从配置重新读取,以便反映上级延展)
static ULONGLONG lastExpireRefresh = 0;
ULONGLONG now = GetTickCount64();
@@ -4175,7 +4238,7 @@ void CMy2015RemoteDlg::UpdateStatusBarStats()
strDays.Format(_T("(%lld"), diffDays);
strExpire = _TR("到期:") + CString(_T(" ")) + strDate + _T(" ") + strDays + _TR("天") + _T(")");
}
m_StatusBar.SetPaneText(3, strExpire);
m_StatusBar.SetPaneText(5, strExpire);
}
}
@@ -12453,6 +12516,9 @@ void CMy2015RemoteDlg::OnMcpSettings()
pExtMenu->CheckMenuItem(ID_MCP_SETTINGS, MF_BYCOMMAND |
(THIS_CFG.GetInt("settings", "McpEnabled", 0) ? MF_CHECKED : MF_UNCHECKED));
}
// 状态栏 MCP 分区立即跟随切换结果(不等 60s 定时器)
UpdateStatusBarStats();
}
void CMy2015RemoteDlg::OnTlsCertificate()
@@ -12468,6 +12534,9 @@ void CMy2015RemoteDlg::OnTlsCertificate()
pExtMenu->CheckMenuItem(ID_TLS_CERTIFICATE, MF_BYCOMMAND |
(THIS_CFG.GetInt("tls", "Enabled", 0) ? MF_CHECKED : MF_UNCHECKED));
}
// 状态栏 TLS 分区立即跟随切换结果(对话框内已热重载身份,不等 60s 定时器)
UpdateStatusBarStats();
}
void CMy2015RemoteDlg::OnConnectionManage()
+2
View File
@@ -444,6 +444,8 @@ public:
ULONGLONG m_ullStartTime = 0; // 程序启动时间 (GetTickCount64)
CString m_strExpireDate; // 到期日期 (YYYYMMDD),空表示无授权
CString m_strFrpAddr; // FRP 地址 (IP:Port),由上级提供
int m_nPaneTlsWidth = 60; // 状态栏 TLS 分区宽度(按当前语言实测文本宽度)
int m_nPaneMcpWidth = 60; // 状态栏 MCP 分区宽度(按当前语言实测文本宽度)
void UpdateStatusBarStats(); // 更新状态栏统计信息
CTrueColorToolBar m_ToolBar;
CGridDialog * m_gridDlg = NULL;
+14 -2
View File
@@ -2011,12 +2011,12 @@ MCP
端口需为 1-65535 的数字=Port muss eine Zahl zwischen 1 und 65535 sein
Token 不能为空=Token darf nicht leer sein
MCP 设置已保存。=MCP-Einstellungen gespeichert.
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/管理操作/主机管理/危险主机操作的改动需重启程序生效。=Aenderungen an Aktivierung/Port/Bindeadresse/Token/Nur-Lesen/Whitelist/persistentem Terminal/Fernsteuerung/Dateiuebertragung/Verwaltungsoperationen/Maschinenverwaltung/gefaehrlichen Maschinenoperationen werden nach Neustart wirksam.
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/文件写入/管理操作/主机管理/危险主机操作的改动需重启程序生效。=Aenderungen an Aktivierung/Port/Bindeadresse/Token/Nur-Lesen/Whitelist/persistentem Terminal/Fernsteuerung/Dateiuebertragung/Dateischreiben/Verwaltungsoperationen/Maschinenverwaltung/gefaehrlichen Maschinenoperationen werden nach Neustart wirksam.
只读模式(禁命令执行)=Nur-Lesen-Modus (Befehlsausfuehrung deaktiviert)
命令白名单=Befehls-Whitelist
MCP命令执行=MCP-Befehlsausfuehrung
启用持久终端(全命令,无白名单)=Persistentes Terminal aktivieren (volle Befehle, keine Whitelist)
持久终端、远程控制与管理操作仅在只读模式关闭时生效。=Persistentes Terminal, Fernsteuerung und Verwaltungsoperationen werden nur wirksam, wenn der Nur-Lesen-Modus aus ist.
持久终端、远程控制、管理操作与文件写入仅在只读模式关闭时生效。=Persistentes Terminal, Fernsteuerung, Verwaltungsoperationen und Dateischreiben werden nur wirksam, wenn der Nur-Lesen-Modus aus ist.
MCP持久终端=MCP-persistentes Terminal
MCP远程控制=MCP-Fernsteuerung
MCP文件传输=MCP-Dateiuebertragung
@@ -2149,3 +2149,15 @@ Y
画面 %dx%d;上报 %s;系数为真实除以上报=Bild %dx%d; gemeldet %s; Faktor: echt/gemeldet
缩放系数需在 0.2 到 5.0 之间。=Skalierungsfaktoren muessen zwischen 0.2 und 5.0 liegen.
已按 画面/上报 自动填写,可修改=Automatisch aus Bild/Meldung; aenderbar
; ===== Status Bar TLS/MCP =====
TLS: 有=TLS: Ja
TLS: 无=TLS: Nein
MCP: 开=MCP: An
MCP: 关=MCP: Aus
; ===== MCP Settings (file write / HTTPS) =====
启用文件写入(删除/改名/建目录,不可恢复)=Dateischreiben aktivieren (Loeschen/Umbenennen/Ordner, nicht umkehrbar)
文件写入包含删除(不可恢复)、改名与建目录;删除会拒绝盘符根与系统目录。=Dateischreiben umfasst Loeschen (nicht umkehrbar), Umbenennen und Ordnererstellung; Loeschen lehnt Laufwerkswurzeln und Systemverzeichnisse ab.
启用 HTTPS(本端口同时接受 TLS 连接)=HTTPS aktivieren (dieser Port akzeptiert auch TLS-Verbindungen)
证书或私钥文件不存在,请检查路径。=Zertifikat- oder Schluesseldatei nicht vorhanden; bitte Pfad pruefen.
HTTPS 开关与证书路径的改动需重启程序生效。=Aenderungen am HTTPS-Schalter und an den Zertifikatspfaden werden nach Neustart wirksam.
证书须为 PEM 格式,私钥须为 PKCS#8 格式。=Zertifikat muss im PEM-Format vorliegen, Schluessel im PKCS#8-Format.
+10 -2
View File
@@ -2016,12 +2016,12 @@ MCP
端口需为 1-65535 的数字=Port must be a number between 1 and 65535
Token 不能为空=Token cannot be empty
MCP 设置已保存。=MCP settings saved.
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/管理操作/主机管理/危险主机操作的改动需重启程序生效。=Changes to enable/port/bind address/token/read-only/whitelist/persistent terminal/remote control/file transfer/management operations/host management/dangerous host operations take effect after restart.
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/文件写入/管理操作/主机管理/危险主机操作的改动需重启程序生效。=Changes to enable/port/bind address/token/read-only/whitelist/persistent terminal/remote control/file transfer/file write/management operations/host management/dangerous host operations take effect after restart.
只读模式(禁命令执行)=Read-only mode (disable command execution)
命令白名单=Command whitelist
MCP命令执行=MCP command execution
启用持久终端(全命令,无白名单)=Enable persistent terminal (full commands, no whitelist)
持久终端、远程控制与管理操作仅在只读模式关闭时生效。=Persistent terminal, remote control and management operations take effect only when read-only mode is off.
持久终端、远程控制、管理操作与文件写入仅在只读模式关闭时生效。=Persistent terminal, remote control, management operations and file writes take effect only when read-only mode is off.
MCP持久终端=MCP persistent terminal
MCP远程控制=MCP remote control
MCP文件传输=MCP file transfer
@@ -2169,3 +2169,11 @@ WSS
选中的主机里有客户端版本不支持协议切换(需要新版客户端)=Some selected hosts run a client without protocol switching support (a newer client is required)
确定把选中主机切回直连 TCP 吗?\n(客户端立即断线重连;若直连端口不可达,5 分钟后自动回退到当前入口)=Switch the selected hosts back to direct TCP?\n(Clients reconnect immediately; if the direct port stays unreachable, they revert to the current entry after 5 minutes)
确定切换选中主机的传输协议吗?\n(客户端立即断线重连,正在进行的远程会话会中断;新入口 5 分钟内连不上将自动回退)=Switch the transport protocol for the selected hosts?\n(Clients reconnect immediately and any active remote session is interrupted; if the new entry stays unreachable for 5 minutes, the client reverts automatically)
; ===== Status Bar TLS/MCP =====
TLS: 有=TLS: Yes
TLS: 无=TLS: No
MCP: 开=MCP: On
MCP: 关=MCP: Off
; ===== MCP Settings (file write / HTTPS) =====
启用文件写入(删除/改名/建目录,不可恢复)=Enable file writes (delete/rename/mkdir, irreversible)
文件写入包含删除(不可恢复)、改名与建目录;删除会拒绝盘符根与系统目录。=File writes include delete (irreversible), rename and create folder; delete refuses drive roots and system directories.
+10 -2
View File
@@ -2007,12 +2007,12 @@ MCP
端口需为 1-65535 的数字=連接埠需為 1-65535 的數字
Token 不能为空=Token 不能為空
MCP 设置已保存。=MCP 設定已儲存。
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/管理操作/主机管理/危险主机操作的改动需重启程序生效。=啟用/連接埠/綁定位址/Token/唯讀/白名單/持久終端/遠端控制/檔案傳輸/管理操作/主機管理/危險主機操作的變更需重新啟動程式後生效。
启用/端口/绑定地址/Token/只读/白名单/持久终端/远程控制/文件传输/文件写入/管理操作/主机管理/危险主机操作的改动需重启程序生效。=啟用/連接埠/綁定位址/Token/唯讀/白名單/持久終端/遠端控制/檔案傳輸/檔案寫入/管理操作/主機管理/危險主機操作的變更需重新啟動程式後生效。
只读模式(禁命令执行)=唯讀模式(禁命令執行)
命令白名单=命令白名單
MCP命令执行=MCP命令執行
启用持久终端(全命令,无白名单)=啟用持久終端(完整命令,無白名單)
持久终端、远程控制与管理操作仅在只读模式关闭时生效。=持久終端、遠端控制與管理操作僅在唯讀模式關閉時生效。
持久终端、远程控制、管理操作与文件写入仅在只读模式关闭时生效。=持久終端、遠端控制、管理操作與檔案寫入僅在唯讀模式關閉時生效。
MCP持久终端=MCP持久終端
MCP远程控制=MCP遠端控制
MCP文件传输=MCP檔案傳輸
@@ -2160,3 +2160,11 @@ WSS
选中的主机里有客户端版本不支持协议切换(需要新版客户端)=選取的主機中有用戶端版本不支援協定切換(需要新版用戶端)
确定把选中主机切回直连 TCP 吗?\n(客户端立即断线重连;若直连端口不可达,5 分钟后自动回退到当前入口)=確定將選取主機切回直連 TCP 嗎?\n(用戶端立即斷線重連;若直連連接埠不可達,5 分鐘後自動回退到目前入口)
确定切换选中主机的传输协议吗?\n(客户端立即断线重连,正在进行的远程会话会中断;新入口 5 分钟内连不上将自动回退)=確定切換選取主機的傳輸協定嗎?\n(用戶端立即斷線重連,正在進行的遠端工作階段會中斷;新入口 5 分鐘內連不上將自動回退)
; ===== Status Bar TLS/MCP =====
TLS: 有=TLS: 有
TLS: 无=TLS: 無
MCP: 开=MCP: 開
MCP: 关=MCP: 關
; ===== MCP Settings (file write / HTTPS) =====
启用文件写入(删除/改名/建目录,不可恢复)=啟用檔案寫入(刪除/改名/建立目錄,無法復原)
文件写入包含删除(不可恢复)、改名与建目录;删除会拒绝盘符根与系统目录。=檔案寫入包含刪除(無法復原)、改名與建立目錄;刪除會拒絕磁碟機根目錄與系統目錄。
+2
View File
@@ -13,6 +13,8 @@
#define IDR_STATUSBAR_RUNTIME 104
#define IDR_STATUSBAR_EXPIRE 105
#define IDR_STATUSBAR_FRP 106
#define IDR_STATUSBAR_TLS 107
#define IDR_STATUSBAR_MCP 108
#define IDR_MAINFRAME 128
#define IDR_MENU_LIST_ONLINE 129
#define IDB_BITMAP_ONLINE 130