From 559681ea017c05d95a50c9f0d5e04927fb6fc068 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Sun, 1 Nov 2026 10:53:04 +0100 Subject: [PATCH] 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 --- server/2015Remote/2015Remote.rc | Bin 180094 -> 180234 bytes server/2015Remote/2015RemoteDlg.cpp | 103 +++++++++++++++++++++++----- server/2015Remote/2015RemoteDlg.h | 2 + server/2015Remote/lang/de_DE.ini | 16 ++++- server/2015Remote/lang/en_US.ini | 12 +++- server/2015Remote/lang/zh_TW.ini | 12 +++- server/2015Remote/resource.h | 2 + 7 files changed, 124 insertions(+), 23 deletions(-) diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index 61c3929a5f1ab2588c8aae57c893acdf4dd70f53..93fbd516c81bf23a413c79ee496fa6613f962391 100644 GIT binary patch delta 92 zcmezOkE^SJyP<_~3)8x()2~cnQjrN^@L>pMP(Xo73=q-j=cX`e$@nrjGX$W>D=;WA SKt!j1n91a^{liqIK1~2TC>5mu delta 33 pcmeBb;QsfItD%K)3)8x(lhe}qrcao~WHMbZiAiXC-!!HgO#t-<4Lkq< diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index 0518ab3..1a25bd0 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -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() diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 987928e..ace12b0 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -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; diff --git a/server/2015Remote/lang/de_DE.ini b/server/2015Remote/lang/de_DE.ini index f8e7c6a..5986a20 100644 --- a/server/2015Remote/lang/de_DE.ini +++ b/server/2015Remote/lang/de_DE.ini @@ -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. diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index ccc0ea4..ad4deda 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -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. diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index e5b4738..84eec48 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -2007,12 +2007,12 @@ MCP ¶Ë¿ÚÐèΪ 1-65535 µÄÊý×Ö=ßB½Ó²ºÐèžé 1-65535 µÄ”µ×Ö Token ²»ÄÜΪ¿Õ=Token ²»ÄÜžé¿Õ MCP ÉèÖÃÒѱ£´æ¡£=MCP ÔO¶¨Òу¦´æ¡£ -ÆôÓÃ/¶Ë¿Ú/°ó¶¨µØÖ·/Token/Ö»¶Á/°×Ãûµ¥/³Ö¾ÃÖÕ¶Ë/Ô¶³Ì¿ØÖÆ/Îļþ´«Êä/¹ÜÀí²Ù×÷/Ö÷»ú¹ÜÀí/ΣÏÕÖ÷»ú²Ù×÷µÄ¸Ä¶¯ÐèÖØÆô³ÌÐòÉúЧ¡£=†¢ÓÃ/ßB½Ó²º/½‰¶¨Î»Ö·/Token/Ψ×x/°×Ãû†Î/³Ö¾Ã½K¶Ë/ßh¶Ë¿ØÖÆ/™n°¸‚÷Ý”/¹ÜÀí²Ù×÷/Ö÷™C¹ÜÀí/ΣëUÖ÷™C²Ù×÷µÄ׃¸üÐèÖØÐ†¢„Ó³ÌʽááÉúЧ¡£ +ÆôÓÃ/¶Ë¿Ú/°ó¶¨µØÖ·/Token/Ö»¶Á/°×Ãûµ¥/³Ö¾ÃÖÕ¶Ë/Ô¶³Ì¿ØÖÆ/Îļþ´«Êä/ÎļþдÈë/¹ÜÀí²Ù×÷/Ö÷»ú¹ÜÀí/ΣÏÕÖ÷»ú²Ù×÷µÄ¸Ä¶¯ÐèÖØÆô³ÌÐòÉúЧ¡£=†¢ÓÃ/ßB½Ó²º/½‰¶¨Î»Ö·/Token/Ψ×x/°×Ãû†Î/³Ö¾Ã½K¶Ë/ßh¶Ë¿ØÖÆ/™n°¸‚÷Ý”/™n°¸Œ‘Èë/¹ÜÀí²Ù×÷/Ö÷™C¹ÜÀí/ΣëUÖ÷™C²Ù×÷µÄ׃¸üÐèÖØÐ†¢„Ó³ÌʽááÉúЧ¡£ Ö»¶Áģʽ£¨½ûÃüÁîÖ´ÐУ©=Ψ×xģʽ£¨½ûÃüÁîˆÌÐУ© ÃüÁî°×Ãûµ¥=ÃüÁî°×Ãû†Î MCPÃüÁîÖ´ÐÐ=MCPÃüÁîˆÌÐÐ ÆôÓó־ÃÖÕ¶Ë£¨È«ÃüÁÎÞ°×Ãûµ¥£©=†¢Óó־ýK¶Ë£¨ÍêÕûÃüÁŸo°×Ãû†Î£© -³Ö¾ÃÖÕ¶Ë¡¢Ô¶³Ì¿ØÖÆÓë¹ÜÀí²Ù×÷½öÔÚÖ»¶Áģʽ¹Ø±ÕʱÉúЧ¡£=³Ö¾Ã½K¶Ë¡¢ßh¶Ë¿ØÖÆÅc¹ÜÀí²Ù×÷ƒHÔÚΨ×xģʽêPé]•rÉúЧ¡£ +³Ö¾ÃÖÕ¶Ë¡¢Ô¶³Ì¿ØÖÆ¡¢¹ÜÀí²Ù×÷ÓëÎļþдÈë½öÔÚÖ»¶Áģʽ¹Ø±ÕʱÉúЧ¡£=³Ö¾Ã½K¶Ë¡¢ßh¶Ë¿ØÖÆ¡¢¹ÜÀí²Ù×÷Åc™n°¸Œ‘ÈëƒHÔÚΨ×xģʽêPé]•rÉúЧ¡£ MCP³Ö¾ÃÖÕ¶Ë=MCP³Ö¾Ã½K¶Ë MCPÔ¶³Ì¿ØÖÆ=MCPßh¶Ë¿ØÖÆ MCPÎļþ´«Êä=MCP™n°¸‚÷Ý” @@ -2160,3 +2160,11 @@ WSS Ñ¡ÖеÄÖ÷»úÀïÓпͻ§¶Ë°æ±¾²»Ö§³ÖЭÒéÇл»£¨ÐèҪаæ¿Í»§¶Ë£©=ßxÈ¡µÄÖ÷™CÖÐÓÐÓÑô¶Ë°æ±¾²»Ö§Ô®…f¶¨ÇГQ£¨ÐèҪаæÓÑô¶Ë£© È·¶¨°ÑÑ¡ÖÐÖ÷»úÇлØÖ±Á¬ TCP Âð£¿\n£¨¿Í»§¶ËÁ¢¼´¶ÏÏßÖØÁ¬£»ÈôÖ±Á¬¶Ë¿Ú²»¿É´ï£¬5 ·ÖÖÓºó×Ô¶¯»ØÍ˵½µ±Ç°Èë¿Ú£©=´_¶¨Œ¢ßxÈ¡Ö÷™CÇлØÖ±ßB TCP †á£¿\n£¨ÓÑô¶ËÁ¢¼´”à¾€ÖØßB£»ÈôÖ±ßBßB½Ó²º²»¿Éß_£¬5 ·ÖçŠáá×Ô„Ó»ØÍ˵½Ä¿Ç°Èë¿Ú£© È·¶¨Çл»Ñ¡ÖÐÖ÷»úµÄ´«ÊäЭÒéÂð£¿\n£¨¿Í»§¶ËÁ¢¼´¶ÏÏßÖØÁ¬£¬ÕýÔÚ½øÐеÄÔ¶³Ì»á»°»áÖжϣ»ÐÂÈë¿Ú 5 ·ÖÖÓÄÚÁ¬²»ÉϽ«×Ô¶¯»ØÍË£©=´_¶¨ÇГQßxÈ¡Ö÷™CµÄ‚÷Ý”…f¶¨†á£¿\n£¨ÓÑô¶ËÁ¢¼´”à¾€ÖØßB£¬ÕýÔÚßMÐеÄßh¶Ë¹¤×÷ëA¶Î•þÖДࣻÐÂÈë¿Ú 5 ·Ö犃ÈßB²»ÉÏŒ¢×Ô„Ó»ØÍË£© +; ===== Status Bar TLS/MCP ===== +TLS: ÓÐ=TLS: ÓÐ +TLS: ÎÞ=TLS: Ÿo +MCP: ¿ª=MCP: é_ +MCP: ¹Ø=MCP: êP +; ===== MCP Settings (file write / HTTPS) ===== +ÆôÓÃÎļþдÈ루ɾ³ý/¸ÄÃû/½¨Ä¿Â¼£¬²»¿É»Ö¸´£©=†¢ÓÙn°¸Œ‘È루„h³ý/¸ÄÃû/½¨Á¢Ä¿ä›£¬Ÿo·¨�ÍÔ­£© +ÎļþдÈë°üº¬É¾³ý£¨²»¿É»Ö¸´£©¡¢¸ÄÃûÓ뽨Ŀ¼£»É¾³ý»á¾Ü¾øÅÌ·û¸ùÓëϵͳĿ¼¡£=™n°¸Œ‘Èë°üº¬„h³ý£¨Ÿo·¨�ÍÔ­£©¡¢¸ÄÃûÅc½¨Á¢Ä¿ä›£»„h³ý•þ¾Ü½^´Åµú™C¸ùÄ¿ä›Åcϵ½yĿ䛡£ diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index 19d4517..36329b3 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -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