From 895ff4e42c6facec8c9a809e5f688fb3a8056f4d Mon Sep 17 00:00:00 2001 From: digital-bombyx <225719517+digital-bombyx@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:30:22 +0700 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=94=E7=94=A8=E5=8C=85=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSIX 包安装的服务(如 Claude 的 CoworkVMService)的安全描述符只允许 NT SERVICE\AppXSvc 修改配置,管理员与 SYSTEM 修改启动类型均被 SCM 拒绝。SCM 拒绝且目标为包服务时,界面先确认,再将 Start(自动启动时含 DelayedAutostart)写入该服务的注册表项。注册表值与 SCM 当前值不同时,服务列表显示待生效的启动类型。 --- crates/argus-core/src/services.rs | 160 ++++++++++++++++-- crates/argus-service/src/protocol.rs | 38 ++++- docs/architecture/core.md | 2 +- docs/architecture/privileged-service.md | 4 +- docs/guide/README.md | 2 +- locales/de-DE/services.json | 11 +- locales/en-US/services.json | 11 +- locales/es-ES/services.json | 11 +- locales/fr-FR/services.json | 11 +- locales/ja-JP/services.json | 11 +- locales/ru-RU/services.json | 11 +- locales/zh-CN/services.json | 11 +- locales/zh-TW/services.json | 11 +- src-gpui/src/commands.rs | 25 +++ src-gpui/src/dispatch.rs | 7 + src-gpui/src/frontend/dialogs.rs | 12 ++ .../src/frontend/dialogs/service_actions.rs | 45 +++++ src-gpui/src/frontend/menus.rs | 14 +- src-gpui/src/frontend/tables.rs | 12 ++ src-gpui/src/frontend/tables/cells.rs | 7 +- 20 files changed, 382 insertions(+), 34 deletions(-) create mode 100644 src-gpui/src/frontend/dialogs/service_actions.rs diff --git a/crates/argus-core/src/services.rs b/crates/argus-core/src/services.rs index e0f6bf99..b240c20b 100644 --- a/crates/argus-core/src/services.rs +++ b/crates/argus-core/src/services.rs @@ -3,6 +3,15 @@ //! Status for every service is one `EnumServicesStatusExW` call. Static //! configuration (start type, binary path, description) costs three RPCs per //! service, so it is cached and refreshed only occasionally. +//! +//! Services installed by an MSIX package (`SERVICE_PKG_SERVICE`) get a +//! security descriptor that grants configuration changes only to +//! `NT SERVICE\AppXSvc`: neither administrators nor SYSTEM may change their +//! start type through the SCM. Their registry key keeps the usual ACL, so +//! [`ServiceCatalog::set_start_type_in_registry`] writes `Start` there instead. +//! In testing the SCM picked the new value up at once, but nothing documents +//! that; while the two differ, the registry value is shown as a pending start +//! type, which the SCM reads at the next boot at the latest. use std::collections::HashMap; use std::sync::{Arc, Mutex}; @@ -13,7 +22,8 @@ use windows::Win32::Foundation::{ ERROR_SERVICE_DOES_NOT_EXIST, ERROR_SERVICE_MARKED_FOR_DELETE, ERROR_SUCCESS, }; use windows::Win32::System::Registry::{ - HKEY, HKEY_LOCAL_MACHINE, KEY_READ, RegCloseKey, RegLoadMUIStringW, RegOpenKeyExW, + HKEY, HKEY_LOCAL_MACHINE, KEY_QUERY_VALUE, KEY_READ, KEY_SET_VALUE, REG_DWORD, REG_SAM_FLAGS, + RegCloseKey, RegLoadMUIStringW, RegOpenKeyExW, RegQueryValueExW, RegSetValueExW, }; use windows::Win32::System::Services::{ ChangeServiceConfig2W, ChangeServiceConfigW, CloseServiceHandle, ControlService, DeleteService, @@ -37,6 +47,8 @@ const CONFIG_TTL: Duration = Duration::from_secs(60); const SERVICE_ACCEPT_STOP: u32 = 0x1; const SERVICE_WIN32_SHARE_PROCESS: u32 = 0x20; const SERVICE_STOPPED: u32 = 1; +/// `SERVICE_PKG_SERVICE`: the service belongs to an MSIX package. +const SERVICE_PKG_SERVICE: u32 = 0x200; #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] @@ -49,6 +61,12 @@ pub struct ServiceInfo { pub state: &'static str, /// `boot` | `system` | `auto` | `autoDelayed` | `manual` | `disabled` pub start_type: Option<&'static str>, + /// Start type written to the registry that the SCM picks up at the next + /// boot; None when it matches `start_type`. + pub pending_start_type: Option<&'static str>, + /// Installed by an MSIX package, so only its registry value can change + /// the start type. + pub packaged: bool, /// Hosting process; 0 when not running. pub pid: u32, /// Command line of the service binary. @@ -81,6 +99,8 @@ struct Config { /// Display name in the user's UI language (the SCM resolves it in the system one). display_name: Option, start_type: Option<&'static str>, + pending_start_type: Option<&'static str>, + packaged: bool, path: Option>, account: Option>, description: Option>, @@ -200,6 +220,8 @@ impl ServiceCatalog { description: config.description.clone(), state: state_name(st.dwCurrentState.0), start_type: config.start_type, + pending_start_type: config.pending_start_type, + packaged: config.packaged, pid: st.dwProcessId, path: config.path.clone(), account: config.account.clone(), @@ -314,6 +336,33 @@ impl ServiceCatalog { self.invalidate(name); Ok(()) } + + /// Writes the start type of a packaged service straight to its registry + /// key, for when the SCM refuses the change (see the module docs). The SCM + /// usually applies it at once, at the next boot at the latest; an update of + /// the package may restore its own value. Refuses services that are not packaged: those go through the SCM. + pub fn set_start_type_in_registry( + &self, + name: &str, + start: StartType, + ) -> Result<(), ActionError> { + let scm = open_scm()?; + let packaged = query_config(&scm, name) + .ok_or(ActionError::NotFound)? + .packaged; + if !packaged { + return Err(ActionError::Refused); + } + let key = + open_registry_key(name, KEY_QUERY_VALUE | KEY_SET_VALUE).map_err(ActionError::from)?; + let (code, delayed) = start_values(start); + set_dword(&key, "Start", code)?; + if let Some(delayed) = delayed { + set_dword(&key, "DelayedAutostart", delayed.into())?; + } + self.invalidate(name); + Ok(()) + } } /// The standard right to delete an object, which `DeleteService` needs. @@ -336,6 +385,62 @@ pub fn remains(name: &str) -> bool { } } +/// `Start` and, for automatic starts, `DelayedAutostart` registry values. +fn start_values(start: StartType) -> (u32, Option) { + match start { + StartType::Auto => (2, Some(false)), + StartType::AutoDelayed => (2, Some(true)), + StartType::Manual => (3, None), + StartType::Disabled => (4, None), + } +} + +/// The start type the registry values describe, named like `start_type`. +fn registry_start_name(start: u32, delayed: bool) -> Option<&'static str> { + match (start, delayed) { + (0, _) => Some("boot"), + (1, _) => Some("system"), + (2, true) => Some("autoDelayed"), + (2, false) => Some("auto"), + (3, _) => Some("manual"), + (4, _) => Some("disabled"), + _ => None, + } +} + +fn set_dword(key: &RegKey, value: &str, data: u32) -> Result<(), ActionError> { + let v = wide(value); + unsafe { + RegSetValueExW( + key.0, + PCWSTR(v.as_ptr()), + None, + REG_DWORD, + Some(&data.to_le_bytes()), + ) + } + .ok()?; + Ok(()) +} + +fn read_dword(key: &RegKey, value: &str) -> Option { + let v = wide(value); + let mut data = [0u8; 4]; + let mut len = data.len() as u32; + let mut kind = REG_DWORD; + let r = unsafe { + RegQueryValueExW( + key.0, + PCWSTR(v.as_ptr()), + None, + Some(&mut kind), + Some(data.as_mut_ptr()), + Some(&mut len), + ) + }; + (r == ERROR_SUCCESS && kind == REG_DWORD && len == 4).then(|| u32::from_le_bytes(data)) +} + fn start(scm: &Handle, name: &str) -> Result<(), ActionError> { let svc = open_service(scm, name, SERVICE_START)?; unsafe { StartServiceW(svc.0, None) }?; @@ -387,6 +492,7 @@ fn query_config(scm: &Handle, name: &str) -> Option { 4 => Some("disabled"), _ => None, }; + config.packaged = c.dwServiceType.0 & SERVICE_PKG_SERVICE != 0; config.path = unsafe { pwstr(c.lpBinaryPathName) }.map(Into::into); config.account = unsafe { pwstr(c.lpServiceStartName) }.map(Into::into); } @@ -396,9 +502,10 @@ fn query_config(scm: &Handle, name: &str) -> Option { let d = unsafe { &*(buf.as_ptr() as *const SERVICE_DESCRIPTIONW) }; config.description = unsafe { pwstr(d.lpDescription) }.map(Into::into); } - if let Some(key) = registry_key(name) { - config.display_name = mui_string(&key, "DisplayName"); - if let Some(d) = mui_string(&key, "Description") { + let key = open_registry_key(name, KEY_READ).ok(); + if let Some(key) = &key { + config.display_name = mui_string(key, "DisplayName"); + if let Some(d) = mui_string(key, "Description") { config.description = Some(d.into()); } } @@ -410,6 +517,15 @@ fn query_config(scm: &Handle, name: &str) -> Option { config.start_type = Some("autoDelayed"); } } + // A registry value the SCM has not taken up (written by Argus or by hand) + // shows as pending; the SCM reads it at the next boot at the latest. + if let Some(key) = &key + && let Some(start) = read_dword(key, "Start") + { + let delayed = read_dword(key, "DelayedAutostart").is_some_and(|d| d != 0); + config.pending_start_type = registry_start_name(start, delayed) + .filter(|registry| config.start_type.is_some_and(|scm| scm != *registry)); + } Some(config) } @@ -424,19 +540,20 @@ impl Drop for RegKey { } } -fn registry_key(name: &str) -> Option { +fn open_registry_key(name: &str, access: REG_SAM_FLAGS) -> windows::core::Result { let path = wide(&format!(r"SYSTEM\CurrentControlSet\Services\{name}")); let mut key = HKEY::default(); - let r = unsafe { + unsafe { RegOpenKeyExW( HKEY_LOCAL_MACHINE, PCWSTR(path.as_ptr()), None, - KEY_READ, + access, &mut key, ) - }; - (r == ERROR_SUCCESS).then_some(RegKey(key)) + } + .ok()?; + Ok(RegKey(key)) } /// Reads a registry string, resolving `@file.dll,-id` references in the @@ -490,7 +607,7 @@ fn state_name(state: u32) -> &'static str { #[cfg(test)] mod tests { - use super::{Handle, ServiceCatalog, remains}; + use super::{Handle, ServiceCatalog, StartType, registry_start_name, remains, start_values}; use crate::actions::ActionError; use crate::util::wide; use windows::Win32::System::Services::{ @@ -579,4 +696,27 @@ mod tests { assert!(!remains(&name)); assert!(matches!(catalog.delete(&name), Err(ActionError::NotFound))); } + + #[test] + fn registry_values_read_back_as_the_chosen_start_type() { + for (start, name) in [ + (StartType::Auto, "auto"), + (StartType::AutoDelayed, "autoDelayed"), + (StartType::Manual, "manual"), + (StartType::Disabled, "disabled"), + ] { + let (code, delayed) = start_values(start); + assert_eq!( + registry_start_name(code, delayed.unwrap_or(false)), + Some(name) + ); + } + } + + #[test] + fn delayed_flag_only_matters_for_automatic_starts() { + assert_eq!(registry_start_name(3, true), Some("manual")); + assert_eq!(registry_start_name(4, true), Some("disabled")); + assert_eq!(registry_start_name(7, false), None); + } } diff --git a/crates/argus-service/src/protocol.rs b/crates/argus-service/src/protocol.rs index a776e5bf..cd4bab69 100644 --- a/crates/argus-service/src/protocol.rs +++ b/crates/argus-service/src/protocol.rs @@ -110,6 +110,12 @@ pub enum Operation { DeleteService { name: String, }, + /// Writes `Start` in the registry key of a packaged service whose SCM + /// security descriptor refuses the change. + ServiceStartTypeRegistry { + name: String, + start_type: StartType, + }, CloseConnection { local_address: String, local_port: u16, @@ -193,7 +199,8 @@ impl Operation { } Self::ControlService { name, .. } | Self::ServiceStartType { name, .. } - | Self::DeleteService { name } => { + | Self::DeleteService { name } + | Self::ServiceStartTypeRegistry { name, .. } => { if name.is_empty() || name.len() > 256 || name.contains(['\0', '/', '\\']) @@ -318,6 +325,9 @@ pub fn execute(operation: Operation, context: &Context, client_pid: u32) -> Repl context.services.set_start_type(&name, start_type) } Operation::DeleteService { name } => context.services.delete(&name), + Operation::ServiceStartTypeRegistry { name, start_type } => context + .services + .set_start_type_in_registry(&name, start_type), Operation::CloseConnection { local_address, local_port, @@ -332,6 +342,32 @@ pub fn execute(operation: Operation, context: &Context, client_pid: u32) -> Repl mod tests { use super::*; + #[test] + fn registry_start_type_guards_the_name_like_the_scm_operation() { + let op = |name: &str| Operation::ServiceStartTypeRegistry { + name: name.into(), + start_type: StartType::Manual, + }; + for name in [ + "", + "ArgusPrivileged", + "argusprivilegeddev", + r"Foo\..\Bar", + "a/b", + "x\0", + ] { + assert!( + matches!(op(name).validate(), Err(ActionError::Refused)), + "{name}" + ); + } + assert!(op("CoworkVMService").validate().is_ok()); + let json = + r#"{"op":"serviceStartTypeRegistry","name":"CoworkVMService","start_type":"manual"}"#; + assert!(serde_json::from_str::(json).is_ok()); + assert!(serde_json::from_str::(&json.replace("manual", "boot")).is_err()); + } + #[test] fn disk_details_accept_only_a_bounded_disk_number() { for input in [ diff --git a/docs/architecture/core.md b/docs/architecture/core.md index 2a1bcd3e..e9539026 100644 --- a/docs/architecture/core.md +++ b/docs/architecture/core.md @@ -31,7 +31,7 @@ | `system.rs` | 总 CPU 与每个逻辑处理器的 CPU(均含内核时间)、内存、提交、缓存。以标准权限查询 `SystemMemoryListInformation`,取得已修改页、各优先级的备用页、空闲与已清零页;内存组成按互不重叠的页列表显示,已缓存为备用与已修改之和。查询不可用时显示总量,组成明细留空。已压缩内存以标准权限查询 `SystemStoreInformation` 的 `MemCompressionInfoRequest`(版本 3,Windows 10 起):驻留量取进程列表中内存压缩进程的工作集(应答里的工作集字段为 32 位,超过 4 GiB 会回绕),存储的数据量按存储区的压缩比估算 | | `cpu.rs` | 按处理器组读取独立空闲计数与周期计数,校验处理器时钟与原生计数的单位、连续性和分母;异常时重新建立基线或回退时间计数 | | `details.rs` | 按需查询单个进程:命令行、用户、完整性级别、架构、优先级、版本 | -| `services.rs` | 通过服务控制管理器(SCM):一次 `EnumServicesStatusExW` 取得全部服务状态;启动类型、路径、描述每个服务要三次 RPC,所以缓存起来偶尔刷新;名称与描述按界面语言从 MUI 读取;启停服务、修改启动类型、删除服务(运行中的服务由 Windows 在停止后移除) | +| `services.rs` | 通过服务控制管理器(SCM):一次 `EnumServicesStatusExW` 取得全部服务状态;启动类型、路径、描述每个服务要三次 RPC,所以缓存起来偶尔刷新;名称与描述按界面语言从 MUI 读取;启停服务、修改启动类型、删除服务(运行中的服务由 Windows 在停止后移除)。MSIX 包安装的服务(`SERVICE_PKG_SERVICE`)的安全描述符只允许 `NT SERVICE\AppXSvc` 修改配置,管理员和 SYSTEM 都会被 SCM 拒绝;这类服务可改为直接写入注册表项中的 `Start`(自动启动时还有 `DelayedAutostart`),实测 SCM 通常随即采用新值,但不作保证;注册表值与 SCM 当前值不同时,作为待生效的启动类型返回,最迟在下次开机时生效 | | `startup.rs`、`startup/packaged.rs` | 注册表 Run 键、启动文件夹(解析 .lnk)与当前账户的应用包启动任务;传统项目使用 `StartupApproved`,应用包结合 AppModel 注册状态、首次激活与用户授权标记判断是否启用,并记录禁用时间。显示程序名称和应用包本地化名称,保留原始项目标识;包清单与名称按包版本、位置和清单修改时间缓存,状态每次重新读取。删除传统项目时删去 Run 值或把启动文件夹中的文件移到回收站(不显示任何确认或错误界面),并清除其 `StartupApproved` 记录;应用包启动任务不删除 | | `connections.rs` | TCP / UDP(IPv4 / IPv6)端点与所属进程(`netstat -ano` 显示的内容);断开 IPv4 TCP 连接 | | `filelock.rs` | 以当前账户权限通过 Restart Manager 查找打开文件或加载 DLL 的进程。整批查询被拒时二分重试,隔离无法检查的文件 | diff --git a/docs/architecture/privileged-service.md b/docs/architecture/privileged-service.md index 3398aaa0..8f3510b7 100644 --- a/docs/architecture/privileged-service.md +++ b/docs/architecture/privileged-service.md @@ -32,7 +32,7 @@ 复制的来源是正在提权运行的 `argus.exe` 本身,目标目录的写权限保护在复制后生效。安装版位于 Program Files,只有管理员能写入,来源可信;免安装版若放在标准用户可写的文件夹,本机的恶意程序可以在授权前替换它,被替换的程序会以管理员身份运行并被注册为 SYSTEM 服务。这是已知且接受的风险(免安装版不校验来源),用户文档提示使用安装版或把免安装版放在仅管理员可写的位置。 -`owner.sid` 记录安装时界面进程的 Windows 账户,即使 UAC 输入了另一个管理员的凭据也不改变授权对象。服务通过账户与令牌验证调用者:同一账户的其他中等及以上完整性级别的本机程序也可持续调用固定的管理操作。这些操作本身作用于整台电脑:结束、暂停或恢复任意非关键进程,更改任意进程的优先级、I/O 优先级与内存优先级、启停、删除任意服务并修改启动类型(只保护 Argus 自己的服务)、断开任意 IPv4 TCP 连接、以 SYSTEM 身份查询文件占用,因此授权等同于让该账户获得部分管理员能力,界面的安装确认框会逐项列出。不能借此执行任意程序、写入任意文件、更改服务可执行路径或加载驱动。其他账户、低完整性进程,以及受限令牌和 AppContainer 令牌(同一账户的沙盒进程)都被拒绝;授权对象只能是用户账户的 SID(`S-1-5-21-…` 或 Microsoft Entra 的 `S-1-12-1-…`),不接受组与内置 SID。 +`owner.sid` 记录安装时界面进程的 Windows 账户,即使 UAC 输入了另一个管理员的凭据也不改变授权对象。服务通过账户与令牌验证调用者:同一账户的其他中等及以上完整性级别的本机程序也可持续调用固定的管理操作。这些操作本身作用于整台电脑:结束、暂停或恢复任意非关键进程,更改任意进程的优先级、I/O 优先级与内存优先级、启停、删除任意服务并修改启动类型(只保护 Argus 自己的服务)、断开任意 IPv4 TCP 连接、以 SYSTEM 身份查询文件占用,因此授权等同于让该账户获得部分管理员能力,界面的安装确认框会逐项列出。不能借此执行任意程序、写入任意文件、更改服务可执行路径或加载驱动;写入注册表仅限 MSIX 包服务自身注册表项中的 `Start` 与 `DelayedAutostart`,服务先通过 SCM 确认目标是包服务。其他账户、低完整性进程,以及受限令牌和 AppContainer 令牌(同一账户的沙盒进程)都被拒绝;授权对象只能是用户账户的 SID(`S-1-5-21-…` 或 Microsoft Entra 的 `S-1-12-1-…`),不接受组与内置 SID。 更新先生成新副本,再停止服务并切换 SCM 路径;配置或启动失败时恢复旧路径和原来的运行状态,旧副本已不存在时保留新路径。停止时既等待 SCM 的停止状态,也等待服务进程退出,避免删除仍被映射的可执行文件。 @@ -54,7 +54,7 @@ SCM 的改动立即进入注册表,注册表延迟写入磁盘:断电或蓝 - ACL 只允许 SYSTEM、提升后的 Administrators 和授权账户访问。授权账户只获得读写数据、读属性与同步权限,不获得 `FILE_CREATE_PIPE_INSTANCE`。原因见 Microsoft 的[命名管道访问权限说明](https://learn.microsoft.com/en-us/windows/win32/ipc/named-pipe-security-and-access-rights)。 - 客户端用 SCM 的服务 PID 核对管道服务端 PID,并持有进程同步句柄,避免 PID 复用。服务只给授权账户开放自身进程的查询和同步权限。客户端限制为身份识别级别,不能被管道服务端借去执行操作。 - 服务通过管道模拟调用者,按实际令牌验证账户 SID 与完整性级别,然后恢复自身身份。恢复失败时终止服务。 -- 协议为第 12 版,包含 I/O 与内存优先级操作及删除服务。保留管道名称和第 1 版 Ping 信封,以便发现旧服务并提示更新。其他请求拒绝不匹配的版本、未知操作和未知字段。请求上限仍为 16 KiB,回复上限为 1 MiB,以容纳网络累计计数和句柄结果;最多同时处理 8 个请求。读取超时 5 秒,手动操作请求超时 30 秒,后台规则、网络、磁盘及传感器请求超时 2 秒,句柄请求超时 20 秒(连接等待另限 1 秒)。I/O 取消后等待完成,再释放缓冲区。 +- 协议为第 12 版,包含 I/O 与内存优先级操作、删除服务及写入应用包服务的注册表启动类型。保留管道名称和第 1 版 Ping 信封,以便发现旧服务并提示更新。其他请求拒绝不匹配的版本、未知操作和未知字段。请求上限仍为 16 KiB,回复上限为 1 MiB,以容纳网络累计计数和句柄结果;最多同时处理 8 个请求。读取超时 5 秒,手动操作请求超时 30 秒,后台规则、网络、磁盘及传感器请求超时 2 秒,句柄请求超时 20 秒(连接等待另限 1 秒)。I/O 取消后等待完成,再释放缓冲区。 - 网络、磁盘和传感器的原生读取各自在一个工作线程执行。有效缓存立即返回,过期或缺少缓存时,每类数据仅允许一个请求等待新样本,最多 1.5 秒;其他请求立即得到等待状态或空快照。并发请求合并为一次刷新,网络与磁盘最短间隔 250 ms,传感器最短间隔 500 ms。网络、磁盘缓存有效期为 2 秒,传感器为 3 秒;读取缓存不会延长其有效期。15 秒无请求后释放数据源与缓存,期间仅按请求刷新,后台低频采样保持原有节拍。网络累计计数与磁盘计数保留实际采集时间,重复读取同一帧沿用原有速率。 - 进程操作必须同时提供 PID 与正的启动时间,沿用 `actions::open_instance` 的校验。结束进程不接受绕过系统关键进程检查的 `force` 参数;不允许客户端结束自身或服务。暂停与恢复(`Suspend`)同样拒绝 PID 0 与 4、服务自身和发起请求的客户端,暂停时另拒绝系统关键进程、`dwm.exe` 与特权服务的进程,Windows 冻结的进程两个方向都拒绝;恢复只撤销一次暂停,其他工具多次叠加的暂停需要多次恢复。I/O 优先级(`IoPriority`)只接受非常低、低与正常,高与关键由 Windows 保留;内存优先级(`MemoryPriority`)接受 1 到 5 五档。服务控制也不能停止、更改 Argus 特权服务自身。 - 结束操作在已核对身份的同一进程句柄上调用 `IsProcessCritical`,仅需 `PROCESS_QUERY_LIMITED_INFORMATION`。检查失败返回 `criticalityUnknown`,不执行结束;组操作、进程树及安装清理路径同样跳过无法确认安全性的目标。旧协议服务在操作前拒绝请求,宿主按已有兼容流程改为本地权限,避免旧检查逻辑绕过新保护。 diff --git a/docs/guide/README.md b/docs/guide/README.md index d02ae0a6..5f1f83b1 100644 --- a/docs/guide/README.md +++ b/docs/guide/README.md @@ -34,7 +34,7 @@ Argus 的窗口顶部是标题栏,下方是导航栏、当前页面和状态 |---|---|---| | 进程 | Ctrl+1 | 三种视图:按应用(同一程序的多个进程合并为一行)、进程树(按父子关系)、列表(全部平铺)。CPU、内存、I/O、GPU 等列可排序,支持搜索;按名称排序时,按应用与列表视图分为“应用”“后台进程”“Windows 进程”三组,标题显示数量和该组的资源合计,单击标题可折叠或展开该组;结束进程或整个进程树、设置优先级与效率模式、暂停与恢复进程、详细信息面板、右键菜单 | | 性能 | Ctrl+2 | CPU(整体或多核视图,多核视图为每个逻辑处理器一张小图,优先排成没有空位的整齐行列,逻辑处理器的数量在当前窗口大小下排不满时才留出空位;小图保持接近原生任务管理器的比例,空间不足时上方的文字先省去频率、再整行隐藏,省去的内容在悬停提示中显示;窗口较小时小图优先,实时数字与规格移至下方,详见[硬件数据](hardware-data.md);混合架构处理器的性能核、能效核与低功耗能效核各用一种颜色并标注 P、E、LP;两种视图都在利用率曲线下叠加内核时间。在 CPU 图表上单击右键可切换“整体视图”与“多核视图”;混合架构处理器在多核视图下另可选择“全部核心”或仅显示某一类核心(如“仅性能核”);同一菜单可取消或重新勾选“显示内核时间”。所选视图、核心类型与内核时间在重启后保留;频率、温度、功耗)、内存、各个磁盘、网络适配器、GPU(引擎利用率默认“智能显示”,仅列出曲线时间范围内有占用的引擎,引擎空闲满一个时间范围后才收起;也可改为固定数量,并选择每张小图显示的引擎,按显卡型号保存。小图可排成网格、焦点(第一个引擎放大,其余排在旁边或围成 L 形)或列表(每个引擎一行),始终铺满、不留空位;除放大的第一个引擎外,其余小图大小一致;网格在引擎数不能排成整齐的行列时,由第一个引擎多占一格;拖动引擎图与显存图之间的分隔条可调整两者的高度比例,双击恢复默认。显卡按驱动支持情况显示温度、频率、电压与功耗瓦数)、NPU(Windows 识别的硬件 NPU,显示利用率与曲线)、电池。曲线随窗口大小伸缩,填满实时数字以外的空间,窗口较矮时压扁曲线以显示实时数字。实时数字与规格在较宽的窗口中左右并排;窗口较窄时(含默认尺寸)规格排在实时数字下方并分为两列,实时数字按能占最少行数的列数排列。CPU 标题旁的“概览 / 详情”切换两页:概览显示曲线、实时数据与规格,详情以卡片列出处理器信息(含指令集)、温度与功耗曲线、内部传感器、每核读数、主板传感器、封装限制与空闲状态,标题行显示摘要,所选页面在重启后保留。磁盘标题旁同样可切换概览与详情,详情页显示健康状况、设备信息与 SMART 属性,见[磁盘详情](#磁盘详情)。磁盘与网络曲线按峰值选择预设量程档位,最低分别为 100 KB/s 和 100 Kbps(字节单位为 100 KB/s),各级档位见[速率量程](../design/charts.md#速率量程);功耗等其他动态量程保持整数或整十数取整。上限变化时曲线平滑过渡、上限标签淡入,随“曲线动画”设置,关闭时直接切换。网络适配器的 IPv4、IPv6 地址超过 3 个时,单击“展开全部”查看其余地址。拖动设备列表右侧的分隔条可调整列表宽度,双击恢复默认。在设备列表的某一项上单击右键可隐藏该项(例如不常用的可移动磁盘或虚拟网络适配器),其余各项随之上移;“显示的设备”子菜单可逐项勾选,“恢复默认显示”恢复全部。隐藏的设备按型号、容量、连接名称等信息记录,重新插拔或重启后仍保持隐藏;列表至少保留一项,隐藏当前选中的项时改为选中其后一项。从概况带或详细信息面板打开已隐藏的设备时,该项回到列表。上下拖动设备列表中的某一项可调整顺序:该项浮起并跟随指针,其余各项实时让位,松开后滑入新位置。右键菜单的“磁盘排序”可选“按磁盘编号”(即 Windows 磁盘管理中的磁盘编号,默认)、“按盘符”(有多个盘符的磁盘按首个盘符,没有盘符的磁盘排在后面)或“自定义(拖动调整)”;拖动打乱了所选的磁盘顺序时自动改为“自定义”,只调整其他设备的位置时保持原选择。“恢复默认顺序”恢复全部设备的初始顺序。顺序按设备的记录信息保存,暂时拔出的设备重新接入后回到原位置,新接入的设备排在原顺序中与其相邻的设备之后。记录信息完全相同的设备(如同型号、同容量的两块磁盘)按采集顺序区分,其中一台拔出或磁盘编号改变后,隐藏状态与顺序可能转到另一台 | -| 服务 | Ctrl+3 | 启动、停止服务,修改启动类型,确认后删除服务;进程页里的 svchost 会显示它承载的服务;可[添加备注与置顶](#备注与置顶) | +| 服务 | Ctrl+3 | 启动、停止服务,修改启动类型(应用包安装的服务经确认后写入注册表;未立即生效时标为待生效,重启后生效),确认后删除服务;进程页里的 svchost 会显示它承载的服务;可[添加备注与置顶](#备注与置顶) | | 启动 | Ctrl+4 | 启用、禁用登录时启动的程序,确认后删除启动项,标出已失效的项目;与系统任务管理器使用同一个开关;可[添加备注与置顶](#备注与置顶) | | 连接 | Ctrl+5 | TCP / UDP 端点及所属进程,可按端口精确搜索,可断开 IPv4 TCP 连接;可[添加备注与置顶](#备注与置顶) | | 历史 | Ctrl+6 | 记录的处理器、内存、磁盘、网络、显卡与电池读数,可分轨道显示、叠加第二个读数,以及任一时刻或区间的进程,见[历史](#历史) | diff --git a/locales/de-DE/services.json b/locales/de-DE/services.json index 6da7d498..6041cf1f 100644 --- a/locales/de-DE/services.json +++ b/locales/de-DE/services.json @@ -14,7 +14,8 @@ "manual": "Manuell", "disabled": "Deaktiviert", "boot": "Start", - "system": "System" + "system": "System", + "pending": "{type} nach Neustart" }, "filter": { "all": "Alle", @@ -59,5 +60,11 @@ "noMatch": "Keine passenden Dienste", "clearFilter": "Filter zurücksetzen", "summary": "{running} von {total} Diensten werden ausgeführt", - "manageHint": "Die meisten Dienste können nur verwaltet werden, wenn der privilegierte Dienst aktiviert ist oder wenn Argus als Administrator ausgeführt wird." + "manageHint": "Die meisten Dienste können nur verwaltet werden, wenn der privilegierte Dienst aktiviert ist oder wenn Argus als Administrator ausgeführt wird.", + "packaged": { + "title": "Starttyp in der Registrierung ändern?", + "body": "Windows erlaubt niemandem, den Starttyp von „{name}“ zu ändern, auch Administratoren nicht: Der Dienst gehört zu einem App-Paket. Argus kann stattdessen „{type}“ in den Registrierungsschlüssel des Dienstes schreiben.\n\nWindows übernimmt ihn meist sofort; andernfalls zeigt die Tabelle ihn bis zum nächsten Neustart als ausstehend an. Ein App-Update kann den ursprünglichen Wert wiederherstellen.", + "confirm": "In Registrierung schreiben", + "done": "Starttyp in die Registrierung geschrieben." + } } diff --git a/locales/en-US/services.json b/locales/en-US/services.json index 2ec79dc9..110b386d 100644 --- a/locales/en-US/services.json +++ b/locales/en-US/services.json @@ -14,7 +14,8 @@ "manual": "Manual", "disabled": "Disabled", "boot": "Boot", - "system": "System" + "system": "System", + "pending": "{type} after restart" }, "filter": { "all": "All", @@ -59,5 +60,11 @@ "noMatch": "No matching services", "clearFilter": "Clear filters", "summary": "{running} of {total} running", - "manageHint": "Most services can only be managed with the privileged service enabled or with Argus running as administrator." + "manageHint": "Most services can only be managed with the privileged service enabled or with Argus running as administrator.", + "packaged": { + "title": "Change startup type in the registry?", + "body": "Windows doesn't let anyone change the startup type of “{name}”, not even administrators: the service belongs to an app package. Argus can write “{type}” to the service's registry key instead.\n\nWindows usually applies it right away; if it doesn't, the table marks it as pending until the next restart. An app update may restore the original value.", + "confirm": "Write to registry", + "done": "Startup type written to the registry." + } } diff --git a/locales/es-ES/services.json b/locales/es-ES/services.json index 7815acc5..7e5ef7d3 100644 --- a/locales/es-ES/services.json +++ b/locales/es-ES/services.json @@ -14,7 +14,8 @@ "manual": "Manual", "disabled": "Deshabilitado", "boot": "Arranque", - "system": "Sistema" + "system": "Sistema", + "pending": "{type} tras reiniciar" }, "filter": { "all": "Todos", @@ -59,5 +60,11 @@ "noMatch": "No hay servicios coincidentes", "clearFilter": "Borrar filtros", "summary": "{running} de {total} ejecutándose", - "manageHint": "La mayoría de los servicios solo se pueden administrar con el servicio privilegiado habilitado o con Argus ejecutándose como administrador." + "manageHint": "La mayoría de los servicios solo se pueden administrar con el servicio privilegiado habilitado o con Argus ejecutándose como administrador.", + "packaged": { + "title": "¿Cambiar el tipo de inicio en el registro?", + "body": "Windows no permite a nadie cambiar el tipo de inicio de «{name}», ni siquiera a los administradores: el servicio pertenece a un paquete de aplicación. Argus puede escribir «{type}» en la clave de registro del servicio.\n\nWindows suele aplicarlo al momento; si no, la tabla lo marca como pendiente hasta el próximo reinicio. Una actualización de la aplicación puede restaurar el valor original.", + "confirm": "Escribir en el registro", + "done": "Tipo de inicio escrito en el registro." + } } diff --git a/locales/fr-FR/services.json b/locales/fr-FR/services.json index ce819a49..7d44eef0 100644 --- a/locales/fr-FR/services.json +++ b/locales/fr-FR/services.json @@ -14,7 +14,8 @@ "manual": "Manuel", "disabled": "Désactivé", "boot": "Amorçage", - "system": "Système" + "system": "Système", + "pending": "{type} après redémarrage" }, "filter": { "all": "Tous", @@ -59,5 +60,11 @@ "noMatch": "Aucun service correspondant", "clearFilter": "Effacer les filtres", "summary": "{running} de {total} en cours d’exécution", - "manageHint": "La plupart des services ne peuvent être gérés qu’avec le service privilégié activé ou avec Argus exécuté en tant qu’administrateur." + "manageHint": "La plupart des services ne peuvent être gérés qu’avec le service privilégié activé ou avec Argus exécuté en tant qu’administrateur.", + "packaged": { + "title": "Modifier le type de démarrage dans le registre ?", + "body": "Windows ne permet à personne de modifier le type de démarrage de « {name} », pas même aux administrateurs : le service appartient à un package d’application. Argus peut écrire « {type} » dans la clé de registre du service.\n\nWindows l’applique généralement tout de suite ; sinon, le tableau l’indique comme en attente jusqu’au prochain redémarrage. Une mise à jour de l’application peut rétablir la valeur d’origine.", + "confirm": "Écrire dans le registre", + "done": "Type de démarrage écrit dans le registre." + } } diff --git a/locales/ja-JP/services.json b/locales/ja-JP/services.json index d220728c..50f9b330 100644 --- a/locales/ja-JP/services.json +++ b/locales/ja-JP/services.json @@ -14,7 +14,8 @@ "manual": "手動", "disabled": "無効", "boot": "ブート", - "system": "システム" + "system": "システム", + "pending": "{type}(再起動後)" }, "filter": { "all": "すべて", @@ -59,5 +60,11 @@ "noMatch": "一致するサービスがありません", "clearFilter": "フィルターを解除", "summary": "{total} 件中 {running} 件が実行中", - "manageHint": "ほとんどのサービスは、特権サービスが有効になっている場合、または Argus が管理者として実行されている場合にのみ管理できます。" + "manageHint": "ほとんどのサービスは、特権サービスが有効になっている場合、または Argus が管理者として実行されている場合にのみ管理できます。", + "packaged": { + "title": "レジストリでスタートアップの種類を変更しますか?", + "body": "「{name}」はアプリ パッケージに属するサービスのため、管理者を含め誰もスタートアップの種類を変更できません。Argus は代わりにサービスのレジストリ キーへ「{type}」を書き込めます。\n\n通常は Windows がすぐに適用します。適用されない場合は、次回の再起動まで表に保留中として表示されます。アプリの更新で元の値に戻ることがあります。", + "confirm": "レジストリに書き込む", + "done": "スタートアップの種類をレジストリに書き込みました。" + } } diff --git a/locales/ru-RU/services.json b/locales/ru-RU/services.json index bbdc4f05..3d59b554 100644 --- a/locales/ru-RU/services.json +++ b/locales/ru-RU/services.json @@ -14,7 +14,8 @@ "manual": "Вручную", "disabled": "Отключено", "boot": "Загрузка", - "system": "Система" + "system": "Система", + "pending": "{type} после перезагрузки" }, "filter": { "all": "Все", @@ -59,5 +60,11 @@ "noMatch": "Нет подходящих служб", "clearFilter": "Сбросить фильтры", "summary": "Работает служб: {running} из {total}", - "manageHint": "Большинством служб можно управлять, только если включена привилегированная служба или Argus запущен от имени администратора." + "manageHint": "Большинством служб можно управлять, только если включена привилегированная служба или Argus запущен от имени администратора.", + "packaged": { + "title": "Изменить тип запуска через реестр?", + "body": "Windows не даёт менять тип запуска службы «{name}» никому, даже администраторам: она принадлежит пакету приложения. Argus может записать «{type}» прямо в раздел службы в реестре.\n\nОбычно Windows применяет его сразу; если нет, в таблице он будет отмечен как ожидающий до следующей перезагрузки. Обновление приложения может вернуть исходное значение.", + "confirm": "Записать в реестр", + "done": "Тип запуска записан в реестр." + } } diff --git a/locales/zh-CN/services.json b/locales/zh-CN/services.json index bcd16a20..5474eca4 100644 --- a/locales/zh-CN/services.json +++ b/locales/zh-CN/services.json @@ -14,7 +14,8 @@ "manual": "手动", "disabled": "禁用", "boot": "引导", - "system": "系统" + "system": "系统", + "pending": "{type}(重启后)" }, "filter": { "all": "全部", @@ -59,5 +60,11 @@ "noMatch": "没有匹配的服务", "clearFilter": "清除筛选", "summary": "正在运行 {running} / 共 {total} 个服务", - "manageHint": "多数服务需要启用特权服务或以管理员身份运行 Argus 才能管理。" + "manageHint": "多数服务需要启用特权服务或以管理员身份运行 Argus 才能管理。", + "packaged": { + "title": "通过注册表更改启动类型?", + "body": "“{name}”属于应用包,Windows 不允许任何人(包括管理员)更改其启动类型。Argus 可以改为将“{type}”写入该服务的注册表项。\n\nWindows 通常会立即应用;若未应用,表格会将其标为待生效,直到下次重启。应用更新可能会恢复原来的值。", + "confirm": "写入注册表", + "done": "启动类型已写入注册表。" + } } diff --git a/locales/zh-TW/services.json b/locales/zh-TW/services.json index 9081f39a..478ecc22 100644 --- a/locales/zh-TW/services.json +++ b/locales/zh-TW/services.json @@ -14,7 +14,8 @@ "manual": "手動", "disabled": "已停用", "boot": "開機", - "system": "系統" + "system": "系統", + "pending": "{type}(重新啟動後)" }, "filter": { "all": "全部", @@ -59,5 +60,11 @@ "noMatch": "沒有相符的服務", "clearFilter": "清除篩選", "summary": "執行中 {running} / 共 {total} 個服務", - "manageHint": "多數服務需要啟用特殊權限服務或以系統管理員身分執行 Argus 才能管理。" + "manageHint": "多數服務需要啟用特殊權限服務或以系統管理員身分執行 Argus 才能管理。", + "packaged": { + "title": "透過登錄更改啟動類型?", + "body": "「{name}」屬於應用程式套件,Windows 不允許任何人(包括系統管理員)更改其啟動類型。Argus 可以改為將「{type}」寫入該服務的登錄機碼。\n\nWindows 通常會立即套用;若未套用,表格會將其標示為待生效,直到下次重新啟動。應用程式更新可能會還原原本的值。", + "confirm": "寫入登錄", + "done": "啟動類型已寫入登錄。" + } } diff --git a/src-gpui/src/commands.rs b/src-gpui/src/commands.rs index 04c9581a..05992a66 100644 --- a/src-gpui/src/commands.rs +++ b/src-gpui/src/commands.rs @@ -189,6 +189,9 @@ fn privileged( Operation::ControlService { .. } => ("control Windows service", operation), Operation::ServiceStartType { .. } => ("set service start type", operation), Operation::DeleteService { .. } => ("delete Windows service", operation), + Operation::ServiceStartTypeRegistry { .. } => { + ("set packaged service start type in registry", operation) + } Operation::CloseConnection { .. } => ("close TCP connection", operation), _ => ("privileged operation", operation), }; @@ -1338,6 +1341,28 @@ pub fn delete_service( }) } +/// Writes the start type of a packaged service to the registry, after the SCM +/// refused it and the user agreed. +pub fn set_service_start_type_registry( + state: State<'_, AppState>, + name: String, + start_type: StartType, +) -> Result<(), ActionError> { + privileged( + &state, + Operation::ServiceStartTypeRegistry { + name: name.clone(), + start_type, + }, + |reply| { + done(reply)?; + state.services.invalidate(&name); + Some(()) + }, + || state.services.set_start_type_in_registry(&name, start_type), + ) +} + /// Opens the Windows Services console, for what Argus does not cover. pub fn open_services_console() -> Result<(), String> { std::process::Command::new("mmc.exe") diff --git a/src-gpui/src/dispatch.rs b/src-gpui/src/dispatch.rs index 7e701c48..de89cc95 100644 --- a/src-gpui/src/dispatch.rs +++ b/src-gpui/src/dispatch.rs @@ -460,6 +460,13 @@ pub fn invoke(host: &Host, name: &str, args: Value) -> Result { .map(|value| serde_json::to_value(value).expect("serializable command response")) .map_err(|error| serde_json::to_value(error).unwrap_or(serde_json::Value::Null)) } + "set_service_start_type_registry" => crate::commands::set_service_start_type_registry( + host.state(), + argument::(&args, "name")?, + argument::(&args, "startType")?, + ) + .map(|value| serde_json::to_value(value).expect("serializable command response")) + .map_err(|error| serde_json::to_value(error).unwrap_or(serde_json::Value::Null)), "open_services_console" => crate::commands::open_services_console() .map(|value| serde_json::to_value(value).expect("serializable command response")) .map_err(|error| serde_json::to_value(error).unwrap_or(serde_json::Value::Null)), diff --git a/src-gpui/src/frontend/dialogs.rs b/src-gpui/src/frontend/dialogs.rs index 80fdedb0..47b0ba84 100644 --- a/src-gpui/src/frontend/dialogs.rs +++ b/src-gpui/src/frontend/dialogs.rs @@ -1,6 +1,7 @@ use super::*; mod file_lock; mod process_actions; +mod service_actions; use gpui_kit::base::ElementExt; use gpui_kit::component::WindowExt; use gpui_kit::component::dialog::{Dialog, DialogEntrance}; @@ -1822,6 +1823,10 @@ impl Desktop { | "set_service_start_type" | "set_startup_enabled" | "close_connection" => self.poll_page(window, cx), + "set_service_start_type_registry" => { + self.notify_toast(ToastKind::Success, label("services.packaged.done")); + self.poll_page(window, cx); + } _ => self.settings_completed(command, value, window, cx), } } @@ -1881,6 +1886,13 @@ impl Desktop { self.ui.errors.remove("lockerEnd"); self.notify_toast(ToastKind::Error, message); } + // A packaged service's security descriptor keeps the SCM from + // changing it even for administrators: offer its registry value. + "set_service_start_type" + if boolean(args, "packaged") && text(error, "kind") == "accessDenied" => + { + self.offer_registry_start_type(args, window, cx); + } _ => { if !self.settings_failed(command, args, error, &message, window, cx) { self.notify_toast(ToastKind::Error, message); diff --git a/src-gpui/src/frontend/dialogs/service_actions.rs b/src-gpui/src/frontend/dialogs/service_actions.rs new file mode 100644 index 00000000..40721ec9 --- /dev/null +++ b/src-gpui/src/frontend/dialogs/service_actions.rs @@ -0,0 +1,45 @@ +//! Service actions that need a dialog: writing the start type of a packaged +//! service to the registry once the Service Control Manager refused it. +use super::*; + +impl Desktop { + /// Asks before writing the start type in `args` (the refused + /// `set_service_start_type` request) to the service's registry key. + pub(super) fn offer_registry_start_type( + &mut self, + args: &Value, + window: &mut Window, + cx: &mut Context, + ) { + let name = text(args, "name").to_owned(); + let start_type = text(args, "startType").to_owned(); + let display = match text(args, "display") { + "" => name.clone(), + display => display.to_owned(), + }; + let chosen = label(&format!("services.startType.{start_type}")); + self.ask( + label("services.packaged.title"), + argus_core::i18n::format( + "services.packaged.body", + &[ + ("name", &display as &dyn std::fmt::Display), + ("type", &chosen as &dyn std::fmt::Display), + ], + ), + label("services.packaged.confirm"), + false, + move |this, window, cx| { + this.request( + "set_service_start_type_registry", + json!({"name":name,"startType":start_type}), + None, + window, + cx, + ); + }, + window, + cx, + ); + } +} diff --git a/src-gpui/src/frontend/menus.rs b/src-gpui/src/frontend/menus.rs index cfe79ce4..fc455b5b 100644 --- a/src-gpui/src/frontend/menus.rs +++ b/src-gpui/src/frontend/menus.rs @@ -1407,7 +1407,12 @@ impl Desktop { .and_then(|rest| rest.split('"').next()) .or_else(|| command.split_whitespace().next()) .filter(|binary| !binary.is_empty()); - let current = text(raw, "startType"); + // A start type written for the next boot is the one the user chose. + let current = match text(raw, "pendingStartType") { + "" => text(raw, "startType"), + pending => pending, + }; + let packaged = boolean(raw, "packaged"); let mut items = vec![ MenuItem::new(label("common.start"), control("start")) .icon("PlayIcon") @@ -1434,7 +1439,12 @@ impl Desktop { ), Action::Invoke( "set_service_start_type".into(), - json!({"name":name,"startType":start_type}), + json!({ + "name":name, + "startType":start_type, + "packaged":packaged, + "display":text(raw, "displayName"), + }), ), ) .checked(current == start_type), diff --git a/src-gpui/src/frontend/tables.rs b/src-gpui/src/frontend/tables.rs index e0727dbe..22f21ca6 100644 --- a/src-gpui/src/frontend/tables.rs +++ b/src-gpui/src/frontend/tables.rs @@ -405,6 +405,18 @@ fn entry_cell(raw: &Value, field: &Field) -> String { CellKind::StartType => { if raw["startType"].is_null() { missing() + } else if !raw["pendingStartType"].is_null() { + // Written to the registry; the SCM still runs the old value. + argus_core::i18n::format( + "services.startType.pending", + &[( + "type", + &label(&format!( + "services.startType.{}", + text(raw, "pendingStartType") + )) as &dyn std::fmt::Display, + )], + ) } else { label(&format!("services.startType.{}", text(raw, "startType"))) } diff --git a/src-gpui/src/frontend/tables/cells.rs b/src-gpui/src/frontend/tables/cells.rs index 3577e6b2..d789fed8 100644 --- a/src-gpui/src/frontend/tables/cells.rs +++ b/src-gpui/src/frontend/tables/cells.rs @@ -163,7 +163,12 @@ impl CellSpec { spec.hint_area = HintArea::Text; } CellKind::StartType => { - spec.color = match text(&row.raw, "startType") { + // A start type pending a restart shows as what it will be. + let start = match text(&row.raw, "pendingStartType") { + "" => text(&row.raw, "startType"), + pending => pending, + }; + spec.color = match start { "manual" => Some(p.faint), "disabled" => Some(p.io), _ => None, From 80ba45a645c3df05390dda15099603875558fc36 Mon Sep 17 00:00:00 2001 From: digital-bombyx <225719517+digital-bombyx@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:41:12 +0700 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9C=8D=E5=8A=A1=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 启停服务与修改启动类型失败时,此前沿用结束进程的错误文案(“无法结束…”)。现改用服务专属文案并显示服务的显示名称,访问被拒时提示安全软件可能保护自身服务。 --- locales/de-DE/services.json | 6 ++++++ locales/en-US/services.json | 6 ++++++ locales/es-ES/services.json | 6 ++++++ locales/fr-FR/services.json | 6 ++++++ locales/ja-JP/services.json | 6 ++++++ locales/ru-RU/services.json | 6 ++++++ locales/zh-CN/services.json | 6 ++++++ locales/zh-TW/services.json | 6 ++++++ src-gpui/src/frontend/backend.rs | 12 ++++++++++++ src-gpui/src/frontend/dialogs/service_actions.rs | 3 ++- src-gpui/src/frontend/layout.rs | 5 ++++- src-gpui/src/frontend/menus.rs | 2 +- 12 files changed, 67 insertions(+), 3 deletions(-) diff --git a/locales/de-DE/services.json b/locales/de-DE/services.json index 6041cf1f..38782014 100644 --- a/locales/de-DE/services.json +++ b/locales/de-DE/services.json @@ -66,5 +66,11 @@ "body": "Windows erlaubt niemandem, den Starttyp von „{name}“ zu ändern, auch Administratoren nicht: Der Dienst gehört zu einem App-Paket. Argus kann stattdessen „{type}“ in den Registrierungsschlüssel des Dienstes schreiben.\n\nWindows übernimmt ihn meist sofort; andernfalls zeigt die Tabelle ihn bis zum nächsten Neustart als ausstehend an. Ein App-Update kann den ursprünglichen Wert wiederherstellen.", "confirm": "In Registrierung schreiben", "done": "Starttyp in die Registrierung geschrieben." + }, + "error": { + "accessDenied": "Dienst {name} konnte nicht geändert werden: Zugriff verweigert. Aktivieren Sie den privilegierten Dienst in den Einstellungen oder führen Sie Argus als Administrator aus. Sicherheitssoftware kann ihre eigenen Dienste schützen.", + "notFound": "Dienst {name} wurde nicht gefunden.", + "refused": "Argus kann den Dienst {name} nicht ändern.", + "serviceOutdated": "Dienst {name} konnte nicht geändert werden: Zugriff verweigert. Die Version des privilegierten Dienstes ist nicht kompatibel; aktualisieren Sie den Dienst und versuchen Sie es erneut." } } diff --git a/locales/en-US/services.json b/locales/en-US/services.json index 110b386d..2b2a1e9e 100644 --- a/locales/en-US/services.json +++ b/locales/en-US/services.json @@ -66,5 +66,11 @@ "body": "Windows doesn't let anyone change the startup type of “{name}”, not even administrators: the service belongs to an app package. Argus can write “{type}” to the service's registry key instead.\n\nWindows usually applies it right away; if it doesn't, the table marks it as pending until the next restart. An app update may restore the original value.", "confirm": "Write to registry", "done": "Startup type written to the registry." + }, + "error": { + "accessDenied": "Couldn't change service {name}: access denied. Turn on the privileged service in Settings, or run Argus as administrator. Security software may protect its own services.", + "notFound": "Service {name} wasn't found.", + "refused": "Argus can't change service {name}.", + "serviceOutdated": "Couldn't change service {name}: access denied. The privileged service version is incompatible; update the service and try again." } } diff --git a/locales/es-ES/services.json b/locales/es-ES/services.json index 7e5ef7d3..b294a2cb 100644 --- a/locales/es-ES/services.json +++ b/locales/es-ES/services.json @@ -66,5 +66,11 @@ "body": "Windows no permite a nadie cambiar el tipo de inicio de «{name}», ni siquiera a los administradores: el servicio pertenece a un paquete de aplicación. Argus puede escribir «{type}» en la clave de registro del servicio.\n\nWindows suele aplicarlo al momento; si no, la tabla lo marca como pendiente hasta el próximo reinicio. Una actualización de la aplicación puede restaurar el valor original.", "confirm": "Escribir en el registro", "done": "Tipo de inicio escrito en el registro." + }, + "error": { + "accessDenied": "No se pudo cambiar el servicio {name}: acceso denegado. Activa el servicio privilegiado en Configuración o ejecuta Argus como administrador. El software de seguridad puede proteger sus propios servicios.", + "notFound": "No se encontró el servicio {name}.", + "refused": "Argus no puede cambiar el servicio {name}.", + "serviceOutdated": "No se pudo cambiar el servicio {name}: acceso denegado. La versión del servicio privilegiado no es compatible; actualiza el servicio e inténtalo de nuevo." } } diff --git a/locales/fr-FR/services.json b/locales/fr-FR/services.json index 7d44eef0..e69eb88c 100644 --- a/locales/fr-FR/services.json +++ b/locales/fr-FR/services.json @@ -66,5 +66,11 @@ "body": "Windows ne permet à personne de modifier le type de démarrage de « {name} », pas même aux administrateurs : le service appartient à un package d’application. Argus peut écrire « {type} » dans la clé de registre du service.\n\nWindows l’applique généralement tout de suite ; sinon, le tableau l’indique comme en attente jusqu’au prochain redémarrage. Une mise à jour de l’application peut rétablir la valeur d’origine.", "confirm": "Écrire dans le registre", "done": "Type de démarrage écrit dans le registre." + }, + "error": { + "accessDenied": "Impossible de modifier le service {name} : accès refusé. Activez le service privilégié dans les Paramètres ou exécutez Argus en tant qu’administrateur. Les logiciels de sécurité peuvent protéger leurs propres services.", + "notFound": "Le service {name} est introuvable.", + "refused": "Argus ne peut pas modifier le service {name}.", + "serviceOutdated": "Impossible de modifier le service {name} : accès refusé. La version du service privilégié n’est pas compatible ; mettez le service à jour et réessayez." } } diff --git a/locales/ja-JP/services.json b/locales/ja-JP/services.json index 50f9b330..f566aaba 100644 --- a/locales/ja-JP/services.json +++ b/locales/ja-JP/services.json @@ -66,5 +66,11 @@ "body": "「{name}」はアプリ パッケージに属するサービスのため、管理者を含め誰もスタートアップの種類を変更できません。Argus は代わりにサービスのレジストリ キーへ「{type}」を書き込めます。\n\n通常は Windows がすぐに適用します。適用されない場合は、次回の再起動まで表に保留中として表示されます。アプリの更新で元の値に戻ることがあります。", "confirm": "レジストリに書き込む", "done": "スタートアップの種類をレジストリに書き込みました。" + }, + "error": { + "accessDenied": "サービス {name} を変更できませんでした: アクセスが拒否されました。設定で特権サービスを有効にするか、Argus を管理者として実行してください。セキュリティ ソフトは自身のサービスを保護している場合があります。", + "notFound": "サービス {name} が見つかりません。", + "refused": "Argus はサービス {name} を変更できません。", + "serviceOutdated": "サービス {name} を変更できませんでした: アクセスが拒否されました。特権サービスのバージョンに互換性がありません。サービスを更新してからもう一度お試しください。" } } diff --git a/locales/ru-RU/services.json b/locales/ru-RU/services.json index 3d59b554..e12acd56 100644 --- a/locales/ru-RU/services.json +++ b/locales/ru-RU/services.json @@ -66,5 +66,11 @@ "body": "Windows не даёт менять тип запуска службы «{name}» никому, даже администраторам: она принадлежит пакету приложения. Argus может записать «{type}» прямо в раздел службы в реестре.\n\nОбычно Windows применяет его сразу; если нет, в таблице он будет отмечен как ожидающий до следующей перезагрузки. Обновление приложения может вернуть исходное значение.", "confirm": "Записать в реестр", "done": "Тип запуска записан в реестр." + }, + "error": { + "accessDenied": "Не удалось изменить службу {name}: доступ запрещён. Включите привилегированную службу в настройках или запустите Argus от имени администратора. Защитные программы могут оберегать свои службы.", + "notFound": "Служба {name} не найдена.", + "refused": "Argus не может изменить службу {name}.", + "serviceOutdated": "Не удалось изменить службу {name}: доступ запрещён. Версия привилегированной службы несовместима; обновите службу и повторите попытку." } } diff --git a/locales/zh-CN/services.json b/locales/zh-CN/services.json index 5474eca4..2aa40fbb 100644 --- a/locales/zh-CN/services.json +++ b/locales/zh-CN/services.json @@ -66,5 +66,11 @@ "body": "“{name}”属于应用包,Windows 不允许任何人(包括管理员)更改其启动类型。Argus 可以改为将“{type}”写入该服务的注册表项。\n\nWindows 通常会立即应用;若未应用,表格会将其标为待生效,直到下次重启。应用更新可能会恢复原来的值。", "confirm": "写入注册表", "done": "启动类型已写入注册表。" + }, + "error": { + "accessDenied": "无法更改服务 {name}:访问被拒绝。请在设置中启用特权服务,或以管理员身份运行 Argus。安全软件可能会保护自己的服务。", + "notFound": "未找到服务 {name}。", + "refused": "Argus 无法更改服务 {name}。", + "serviceOutdated": "无法更改服务 {name}:访问被拒绝。特权服务版本不兼容,请更新服务后重试。" } } diff --git a/locales/zh-TW/services.json b/locales/zh-TW/services.json index 478ecc22..9a056f53 100644 --- a/locales/zh-TW/services.json +++ b/locales/zh-TW/services.json @@ -66,5 +66,11 @@ "body": "「{name}」屬於應用程式套件,Windows 不允許任何人(包括系統管理員)更改其啟動類型。Argus 可以改為將「{type}」寫入該服務的登錄機碼。\n\nWindows 通常會立即套用;若未套用,表格會將其標示為待生效,直到下次重新啟動。應用程式更新可能會還原原本的值。", "confirm": "寫入登錄", "done": "啟動類型已寫入登錄。" + }, + "error": { + "accessDenied": "無法變更服務 {name}:存取遭拒。請在設定中啟用特權服務,或以系統管理員身分執行 Argus。安全性軟體可能會保護自己的服務。", + "notFound": "找不到服務 {name}。", + "refused": "Argus 無法變更服務 {name}。", + "serviceOutdated": "無法變更服務 {name}:存取遭拒。特權服務版本不相容,請更新服務後再試一次。" } } diff --git a/src-gpui/src/frontend/backend.rs b/src-gpui/src/frontend/backend.rs index 824aa97f..8a851f24 100644 --- a/src-gpui/src/frontend/backend.rs +++ b/src-gpui/src/frontend/backend.rs @@ -732,10 +732,22 @@ impl Desktop { return result; } } + // Services are changed, not ended: they name the display name the + // menu passed along, else the key name. + let service = matches!( + command, + "control_service" | "set_service_start_type" | "set_service_start_type_registry" + ); + let name = match text(args, "display") { + display if service && !display.is_empty() => display.to_owned(), + _ => name, + }; let key = format!( "{}.{kind}", if command == "run_task" { "tasks.error" + } else if service { + "services.error" } else { "actions.error" } diff --git a/src-gpui/src/frontend/dialogs/service_actions.rs b/src-gpui/src/frontend/dialogs/service_actions.rs index 40721ec9..c6fb9316 100644 --- a/src-gpui/src/frontend/dialogs/service_actions.rs +++ b/src-gpui/src/frontend/dialogs/service_actions.rs @@ -17,6 +17,7 @@ impl Desktop { "" => name.clone(), display => display.to_owned(), }; + let display_arg = display.clone(); let chosen = label(&format!("services.startType.{start_type}")); self.ask( label("services.packaged.title"), @@ -32,7 +33,7 @@ impl Desktop { move |this, window, cx| { this.request( "set_service_start_type_registry", - json!({"name":name,"startType":start_type}), + json!({"name":name,"startType":start_type,"display":display_arg}), None, window, cx, diff --git a/src-gpui/src/frontend/layout.rs b/src-gpui/src/frontend/layout.rs index 8fee92ea..ac43e476 100644 --- a/src-gpui/src/frontend/layout.rs +++ b/src-gpui/src/frontend/layout.rs @@ -1171,6 +1171,9 @@ impl Desktop { let name = selected .map(|s| text(s, "name").to_owned()) .unwrap_or_default(); + let display = selected + .map(|s| text(s, "displayName").to_owned()) + .unwrap_or_default(); let tip = label(title); row = row.child( self.tool_button( @@ -1179,7 +1182,7 @@ impl Desktop { Some(glyph), Action::Invoke( "control_service".into(), - json!({"name": name, "action": action}), + json!({"name": name, "action": action, "display": display}), ), false, cx, diff --git a/src-gpui/src/frontend/menus.rs b/src-gpui/src/frontend/menus.rs index fc455b5b..62f051a2 100644 --- a/src-gpui/src/frontend/menus.rs +++ b/src-gpui/src/frontend/menus.rs @@ -1397,7 +1397,7 @@ impl Desktop { let control = |action: &str| { Action::Invoke( "control_service".into(), - json!({"name":name,"action":action}), + json!({"name":name,"action":action,"display":text(raw, "displayName")}), ) }; // The binary is the first token of the image path, quoted or not. From 352408b77eab105a333b34f5c841607aa33420ff Mon Sep 17 00:00:00 2001 From: digital-bombyx <225719517+digital-bombyx@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:47:54 +0700 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=B7=B2=E6=9C=89=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90=E6=97=B6=E4=B8=8D=E5=86=8D=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E4=BB=A5=E7=AE=A1=E7=90=86=E5=91=98=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 以管理员身份运行或特权服务可用时,服务操作仍被拒绝,多半是服务自身的保护(如杀毒软件的自我保护)。此时提示改为说明这一点,不再建议启用特权服务或以管理员身份运行。 --- locales/de-DE/services.json | 3 ++- locales/en-US/services.json | 3 ++- locales/es-ES/services.json | 3 ++- locales/fr-FR/services.json | 3 ++- locales/ja-JP/services.json | 3 ++- locales/ru-RU/services.json | 3 ++- locales/zh-CN/services.json | 3 ++- locales/zh-TW/services.json | 3 ++- src-gpui/src/frontend/backend.rs | 16 ++++++++++++++++ src-gpui/src/frontend/layout.rs | 4 +--- 10 files changed, 33 insertions(+), 11 deletions(-) diff --git a/locales/de-DE/services.json b/locales/de-DE/services.json index 38782014..4802c01c 100644 --- a/locales/de-DE/services.json +++ b/locales/de-DE/services.json @@ -71,6 +71,7 @@ "accessDenied": "Dienst {name} konnte nicht geändert werden: Zugriff verweigert. Aktivieren Sie den privilegierten Dienst in den Einstellungen oder führen Sie Argus als Administrator aus. Sicherheitssoftware kann ihre eigenen Dienste schützen.", "notFound": "Dienst {name} wurde nicht gefunden.", "refused": "Argus kann den Dienst {name} nicht ändern.", - "serviceOutdated": "Dienst {name} konnte nicht geändert werden: Zugriff verweigert. Die Version des privilegierten Dienstes ist nicht kompatibel; aktualisieren Sie den Dienst und versuchen Sie es erneut." + "serviceOutdated": "Dienst {name} konnte nicht geändert werden: Zugriff verweigert. Die Version des privilegierten Dienstes ist nicht kompatibel; aktualisieren Sie den Dienst und versuchen Sie es erneut.", + "accessDeniedPrivileged": "Dienst {name} konnte nicht geändert werden: Zugriff trotz Administratorrechten verweigert. Der Dienst wird wahrscheinlich von seiner eigenen Software geschützt, etwa vom Selbstschutz eines Virenscanners." } } diff --git a/locales/en-US/services.json b/locales/en-US/services.json index 2b2a1e9e..288d3883 100644 --- a/locales/en-US/services.json +++ b/locales/en-US/services.json @@ -71,6 +71,7 @@ "accessDenied": "Couldn't change service {name}: access denied. Turn on the privileged service in Settings, or run Argus as administrator. Security software may protect its own services.", "notFound": "Service {name} wasn't found.", "refused": "Argus can't change service {name}.", - "serviceOutdated": "Couldn't change service {name}: access denied. The privileged service version is incompatible; update the service and try again." + "serviceOutdated": "Couldn't change service {name}: access denied. The privileged service version is incompatible; update the service and try again.", + "accessDeniedPrivileged": "Couldn't change service {name}: access denied even with administrator rights. The service is probably protected by its own software, such as an antivirus's self-protection." } } diff --git a/locales/es-ES/services.json b/locales/es-ES/services.json index b294a2cb..c48a2abc 100644 --- a/locales/es-ES/services.json +++ b/locales/es-ES/services.json @@ -71,6 +71,7 @@ "accessDenied": "No se pudo cambiar el servicio {name}: acceso denegado. Activa el servicio privilegiado en Configuración o ejecuta Argus como administrador. El software de seguridad puede proteger sus propios servicios.", "notFound": "No se encontró el servicio {name}.", "refused": "Argus no puede cambiar el servicio {name}.", - "serviceOutdated": "No se pudo cambiar el servicio {name}: acceso denegado. La versión del servicio privilegiado no es compatible; actualiza el servicio e inténtalo de nuevo." + "serviceOutdated": "No se pudo cambiar el servicio {name}: acceso denegado. La versión del servicio privilegiado no es compatible; actualiza el servicio e inténtalo de nuevo.", + "accessDeniedPrivileged": "No se pudo cambiar el servicio {name}: acceso denegado incluso con permisos de administrador. Probablemente el servicio esté protegido por su propio software, como la autoprotección de un antivirus." } } diff --git a/locales/fr-FR/services.json b/locales/fr-FR/services.json index e69eb88c..d849aef5 100644 --- a/locales/fr-FR/services.json +++ b/locales/fr-FR/services.json @@ -71,6 +71,7 @@ "accessDenied": "Impossible de modifier le service {name} : accès refusé. Activez le service privilégié dans les Paramètres ou exécutez Argus en tant qu’administrateur. Les logiciels de sécurité peuvent protéger leurs propres services.", "notFound": "Le service {name} est introuvable.", "refused": "Argus ne peut pas modifier le service {name}.", - "serviceOutdated": "Impossible de modifier le service {name} : accès refusé. La version du service privilégié n’est pas compatible ; mettez le service à jour et réessayez." + "serviceOutdated": "Impossible de modifier le service {name} : accès refusé. La version du service privilégié n’est pas compatible ; mettez le service à jour et réessayez.", + "accessDeniedPrivileged": "Impossible de modifier le service {name} : accès refusé même avec les droits d’administrateur. Le service est probablement protégé par son propre logiciel, par exemple l’autoprotection d’un antivirus." } } diff --git a/locales/ja-JP/services.json b/locales/ja-JP/services.json index f566aaba..9c700e4e 100644 --- a/locales/ja-JP/services.json +++ b/locales/ja-JP/services.json @@ -71,6 +71,7 @@ "accessDenied": "サービス {name} を変更できませんでした: アクセスが拒否されました。設定で特権サービスを有効にするか、Argus を管理者として実行してください。セキュリティ ソフトは自身のサービスを保護している場合があります。", "notFound": "サービス {name} が見つかりません。", "refused": "Argus はサービス {name} を変更できません。", - "serviceOutdated": "サービス {name} を変更できませんでした: アクセスが拒否されました。特権サービスのバージョンに互換性がありません。サービスを更新してからもう一度お試しください。" + "serviceOutdated": "サービス {name} を変更できませんでした: アクセスが拒否されました。特権サービスのバージョンに互換性がありません。サービスを更新してからもう一度お試しください。", + "accessDeniedPrivileged": "サービス {name} を変更できませんでした: 管理者権限でもアクセスが拒否されました。ウイルス対策ソフトの自己防衛機能など、サービス自身のソフトウェアによって保護されている可能性があります。" } } diff --git a/locales/ru-RU/services.json b/locales/ru-RU/services.json index e12acd56..1fddd1e6 100644 --- a/locales/ru-RU/services.json +++ b/locales/ru-RU/services.json @@ -71,6 +71,7 @@ "accessDenied": "Не удалось изменить службу {name}: доступ запрещён. Включите привилегированную службу в настройках или запустите Argus от имени администратора. Защитные программы могут оберегать свои службы.", "notFound": "Служба {name} не найдена.", "refused": "Argus не может изменить службу {name}.", - "serviceOutdated": "Не удалось изменить службу {name}: доступ запрещён. Версия привилегированной службы несовместима; обновите службу и повторите попытку." + "serviceOutdated": "Не удалось изменить службу {name}: доступ запрещён. Версия привилегированной службы несовместима; обновите службу и повторите попытку.", + "accessDeniedPrivileged": "Не удалось изменить службу {name}: доступ запрещён даже с правами администратора. Скорее всего, службу защищает её собственная программа, например самозащита антивируса." } } diff --git a/locales/zh-CN/services.json b/locales/zh-CN/services.json index 2aa40fbb..cc86e65a 100644 --- a/locales/zh-CN/services.json +++ b/locales/zh-CN/services.json @@ -71,6 +71,7 @@ "accessDenied": "无法更改服务 {name}:访问被拒绝。请在设置中启用特权服务,或以管理员身份运行 Argus。安全软件可能会保护自己的服务。", "notFound": "未找到服务 {name}。", "refused": "Argus 无法更改服务 {name}。", - "serviceOutdated": "无法更改服务 {name}:访问被拒绝。特权服务版本不兼容,请更新服务后重试。" + "serviceOutdated": "无法更改服务 {name}:访问被拒绝。特权服务版本不兼容,请更新服务后重试。", + "accessDeniedPrivileged": "无法更改服务 {name}:即使拥有管理员权限,访问仍被拒绝。该服务可能受其自身软件保护,例如杀毒软件的自我保护功能。" } } diff --git a/locales/zh-TW/services.json b/locales/zh-TW/services.json index 9a056f53..ae9f9e81 100644 --- a/locales/zh-TW/services.json +++ b/locales/zh-TW/services.json @@ -71,6 +71,7 @@ "accessDenied": "無法變更服務 {name}:存取遭拒。請在設定中啟用特權服務,或以系統管理員身分執行 Argus。安全性軟體可能會保護自己的服務。", "notFound": "找不到服務 {name}。", "refused": "Argus 無法變更服務 {name}。", - "serviceOutdated": "無法變更服務 {name}:存取遭拒。特權服務版本不相容,請更新服務後再試一次。" + "serviceOutdated": "無法變更服務 {name}:存取遭拒。特權服務版本不相容,請更新服務後再試一次。", + "accessDeniedPrivileged": "無法變更服務 {name}:即使具備系統管理員權限,存取仍遭拒。該服務可能受其自身軟體保護,例如防毒軟體的自我保護功能。" } } diff --git a/src-gpui/src/frontend/backend.rs b/src-gpui/src/frontend/backend.rs index 8a851f24..8f7e7593 100644 --- a/src-gpui/src/frontend/backend.rs +++ b/src-gpui/src/frontend/backend.rs @@ -1,5 +1,14 @@ use super::*; impl Desktop { + /// Argus acts with administrator rights: elevated itself, or through a + /// running privileged service authorized for this account. + pub(in crate::frontend) fn privileged(&self) -> bool { + boolean(&self.data["info"], "elevated") + || self.data.get("privilege").is_some_and(|s| { + text(s, "state") == "running" && boolean(s, "authorized") && s["error"].is_null() + }) + } + pub(in crate::frontend) fn request( &mut self, command: &str, @@ -742,6 +751,13 @@ impl Desktop { display if service && !display.is_empty() => display.to_owned(), _ => name, }; + // With administrator rights already in hand, advising them is no help: + // the service guards itself (an antivirus's self-protection). + let kind = if service && kind == "accessDenied" && self.privileged() { + "accessDeniedPrivileged" + } else { + kind + }; let key = format!( "{}.{kind}", if command == "run_task" { diff --git a/src-gpui/src/frontend/layout.rs b/src-gpui/src/frontend/layout.rs index ac43e476..748b89f2 100644 --- a/src-gpui/src/frontend/layout.rs +++ b/src-gpui/src/frontend/layout.rs @@ -1242,9 +1242,7 @@ impl Desktop { } let privilege = if boolean(&self.data["info"], "elevated") { "admin" - } else if self.data.get("privilege").is_some_and(|s| { - text(s, "state") == "running" && boolean(s, "authorized") && s["error"].is_null() - }) { + } else if self.privileged() { "service" } else { "standard" From d9c20b95e51643308a45900c836b467c6c9da942 Mon Sep 17 00:00:00 2001 From: digital-bombyx <225719517+digital-bombyx@users.noreply.github.com> Date: Sat, 14 Nov 2026 19:13:04 +0700 Subject: [PATCH 4/4] =?UTF-8?q?fix(ui):=20=E5=BA=94=E7=94=A8=E5=8C=85?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=B3=A8=E5=86=8C=E8=A1=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E5=9E=8B=E4=BB=85=E5=9C=A8=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8F=90=E4=BE=9B=EF=BC=8C=E5=B9=B6=E6=8C=89?= =?UTF-8?q?=E5=BE=85=E7=94=9F=E6=95=88=E5=80=BC=E6=98=BE=E7=A4=BA=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E4=B8=8E=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 仅当 Argus 以管理员身份运行或特权服务可用时,SCM 拒绝修改应用包服务才询问是否写入注册表;写入同样需要管理员权限,其他情况直接显示原有的权限提示,不再在确认后出现第二次错误。 “启动类型”列的固定宽度一并计入“(重启后生效)”的待生效文案,较长的语言不再被截断;按启动类型排序时,有待生效值的服务按显示的类型排列。 --- crates/argus-core/src/actions.rs | 10 ++++++++ src-gpui/src/commands.rs | 44 +++++++++++++++++++++++++++----- src-gpui/src/frontend/backend.rs | 7 ----- src-gpui/src/frontend/dialogs.rs | 7 +++-- src-gpui/src/frontend/lists.rs | 29 +++++++++++++++++++++ src-gpui/src/frontend/tables.rs | 31 ++++++++++++++-------- 6 files changed, 102 insertions(+), 26 deletions(-) diff --git a/crates/argus-core/src/actions.rs b/crates/argus-core/src/actions.rs index 89641ea3..6efa1508 100644 --- a/crates/argus-core/src/actions.rs +++ b/crates/argus-core/src/actions.rs @@ -40,6 +40,11 @@ pub enum ActionError { /// service speaks another protocol and refused it: updating the service /// lets it act again. Only the host reports it; the service never sends it. ServiceOutdated, + /// Denied although Argus acted with administrator rights (elevated, or + /// through the privileged service): the target guards itself, so advising + /// those rights is no help. Only the host reports it, for service + /// changes; the service never sends it. + AccessDeniedPrivileged, /// Resuming could not be confirmed: every thread is still suspended /// (another tool suspended the process more than once, so it needs /// another resume), or the thread states could not be read. @@ -68,6 +73,7 @@ impl ActionError { Self::CriticalityUnknown => "process criticality could not be checked".into(), Self::Refused => "operation refused by policy".into(), Self::ServiceOutdated => "privileged service protocol incompatible".into(), + Self::AccessDeniedPrivileged => "access denied with administrator rights".into(), Self::StillSuspended => "threads remain suspended or unreadable after resume".into(), Self::Os(message) => crate::diagnostics::failure(message), } @@ -962,6 +968,10 @@ mod tests { json(ActionError::ServiceOutdated), r#"{"kind":"serviceOutdated"}"# ); + assert_eq!( + json(ActionError::AccessDeniedPrivileged), + r#"{"kind":"accessDeniedPrivileged"}"# + ); assert_eq!( json(ActionError::StillSuspended), r#"{"kind":"stillSuspended"}"# diff --git a/src-gpui/src/commands.rs b/src-gpui/src/commands.rs index 05992a66..74c367a0 100644 --- a/src-gpui/src/commands.rs +++ b/src-gpui/src/commands.rs @@ -195,17 +195,34 @@ fn privileged( Operation::CloseConnection { .. } => ("close TCP connection", operation), _ => ("privileged operation", operation), }; + // A service change tells a denial with administrator rights in hand from + // one without: the route taken says which, not the UI's last status read. + let service = matches!( + operation.1, + Operation::ControlService { .. } + | Operation::ServiceStartType { .. } + | Operation::ServiceStartTypeRegistry { .. } + ); if state.elevated { - return action_result(operation.0, "local elevated", local()); + return action_result(operation.0, "local elevated", guarded(service, local())); } let routed = argus_service::route(operation.1).map_err(ActionError::Os); let routed = action_result(operation.0, "service routing", routed)?; - let source = match &routed { - Routed::Absent => "local fallback (no service)", - Routed::Outdated => "local fallback (incompatible service)", - Routed::Replied(_) => "privileged service", + let (source, with_rights) = match &routed { + Routed::Absent => ("local fallback (no service)", false), + Routed::Outdated => ("local fallback (incompatible service)", false), + Routed::Replied(_) => ("privileged service", true), }; - action_result(operation.0, source, settle(routed, replied, local)) + let result = settle(routed, replied, local); + action_result(operation.0, source, guarded(service && with_rights, result)) +} + +/// A denial with administrator rights in hand: the target guards itself. +fn guarded(with_rights: bool, result: Result) -> Result { + result.map_err(|e| match e { + ActionError::AccessDenied if with_rights => ActionError::AccessDeniedPrivileged, + e => e, + }) } fn action_result( @@ -1754,6 +1771,21 @@ mod tests { assert!(matches!(settle(Routed::Outdated, done, || Ok(())), Ok(()))); } + #[test] + fn only_a_denial_with_administrator_rights_says_so() { + assert!(matches!( + guarded(true, denied()), + Err(ActionError::AccessDeniedPrivileged) + )); + // Acting with its own rights, Argus may still lack them. + assert!(matches!(guarded(false, denied()), Err(ActionError::AccessDenied))); + assert!(matches!( + guarded(true, Err::<(), _>(ActionError::NotFound)), + Err(ActionError::NotFound) + )); + assert!(matches!(guarded(true, Ok(())), Ok(()))); + } + #[test] fn other_denials_stay_plain() { // Without a service, updating one would not help. diff --git a/src-gpui/src/frontend/backend.rs b/src-gpui/src/frontend/backend.rs index 8f7e7593..05fc5902 100644 --- a/src-gpui/src/frontend/backend.rs +++ b/src-gpui/src/frontend/backend.rs @@ -751,13 +751,6 @@ impl Desktop { display if service && !display.is_empty() => display.to_owned(), _ => name, }; - // With administrator rights already in hand, advising them is no help: - // the service guards itself (an antivirus's self-protection). - let kind = if service && kind == "accessDenied" && self.privileged() { - "accessDeniedPrivileged" - } else { - kind - }; let key = format!( "{}.{kind}", if command == "run_task" { diff --git a/src-gpui/src/frontend/dialogs.rs b/src-gpui/src/frontend/dialogs.rs index 47b0ba84..fc1da16b 100644 --- a/src-gpui/src/frontend/dialogs.rs +++ b/src-gpui/src/frontend/dialogs.rs @@ -1887,9 +1887,12 @@ impl Desktop { self.notify_toast(ToastKind::Error, message); } // A packaged service's security descriptor keeps the SCM from - // changing it even for administrators: offer its registry value. + // changing it even for administrators: offer its registry value, + // which takes the same rights. The host says whether it acted with + // them (`accessDeniedPrivileged`); without them the usual guidance shows. "set_service_start_type" - if boolean(args, "packaged") && text(error, "kind") == "accessDenied" => + if boolean(args, "packaged") + && text(error, "kind") == "accessDeniedPrivileged" => { self.offer_registry_start_type(args, window, cx); } diff --git a/src-gpui/src/frontend/lists.rs b/src-gpui/src/frontend/lists.rs index 12c00b9c..30ddbb32 100644 --- a/src-gpui/src/frontend/lists.rs +++ b/src-gpui/src/frontend/lists.rs @@ -253,6 +253,9 @@ pub(super) fn list_rows(spec: &ListSpec, source: &[Value], owners: &Owners) -> V )) } else if key == spec.first { Order::Key(collation::key(&row.title)) + } else if key == "startType" && !row.raw["pendingStartType"].is_null() { + // A start type pending a restart sorts as what the row shows. + Order::Key(collation::key(text(&row.raw, "pendingStartType"))) } else if key == "protocol" { Order::Protocol( collation::key(text(&row.raw, key)), @@ -587,6 +590,32 @@ mod tests { .collect() } + #[test] + fn a_start_type_pending_a_restart_sorts_as_shown() { + let source = [ + ("a", "auto", None), + ("b", "manual", None), + ("c", "auto", Some("manual")), + ("d", "disabled", None), + ] + .map(|(name, start, pending)| { + json!({"name":name,"displayName":name,"startType":start,"pendingStartType":pending}) + }); + let spec = ListSpec { + page: "services".into(), + first: "displayName", + ..spec("startType", false, "", json!({})) + }; + let names = list_rows(&spec, &source, &Default::default()) + .iter() + .map(|row| row.key.clone()) + .collect::>(); + // "c" is still automatic in the SCM but shows as manual after restart. + let position = |name: &str| names.iter().position(|n| n == name).unwrap(); + assert!(position("c").abs_diff(position("b")) == 1); + assert!(position("a") < position("d")); + } + #[test] fn owners_cover_only_processes_with_connections() { let owners = owners(&processes(), &connections()); diff --git a/src-gpui/src/frontend/tables.rs b/src-gpui/src/frontend/tables.rs index 22f21ca6..3a26a498 100644 --- a/src-gpui/src/frontend/tables.rs +++ b/src-gpui/src/frontend/tables.rs @@ -407,16 +407,7 @@ fn entry_cell(raw: &Value, field: &Field) -> String { missing() } else if !raw["pendingStartType"].is_null() { // Written to the registry; the SCM still runs the old value. - argus_core::i18n::format( - "services.startType.pending", - &[( - "type", - &label(&format!( - "services.startType.{}", - text(raw, "pendingStartType") - )) as &dyn std::fmt::Display, - )], - ) + pending_start_type(text(raw, "pendingStartType")) } else { label(&format!("services.startType.{}", text(raw, "startType"))) } @@ -690,6 +681,17 @@ impl Render for TableFrame { }) } } +/// A start type written to the registry that takes effect after a restart. +fn pending_start_type(start_type: &str) -> String { + argus_core::i18n::format( + "services.startType.pending", + &[( + "type", + &label(&format!("services.startType.{start_type}")) as &dyn std::fmt::Display, + )], + ) +} + /// The labels a fixed column's cells can show, as locale keys under `prefix`, /// and the width of what sits beside the label (the status dot and its gap). fn cell_labels(kind: CellKind) -> (&'static str, &'static [&'static str], f32) { @@ -783,9 +785,16 @@ impl NativeTable { } else { (labels.collect(), beside) }; + // A start type can also show as pending a restart, which is longer. + let pending = (field.kind == CellKind::StartType) + .then(|| keys.iter().map(|key| pending_start_type(key))) + .into_iter() + .flatten(); labels .iter() - .map(|key| width(&label(key), 13.) + beside + CELL_PADDING * 2.) + .map(|key| label(key)) + .chain(pending) + .map(|text| width(&text, 13.) + beside + CELL_PADDING * 2.) .fold(header, f32::max) .ceil() });