feat(app-iced): M114 账户页三轨登录(微软正版 / 第三方皮肤站 / 本地档案)

- 账户页:当前账户卡 + 全部账户列表 + 空态三入口 + 皮肤区;五项动作(添加/切换/删除/重新登录/校验)
- 三轨添加流程:设备码(用户码+链接+倒计时+过期重试+取消)、授权码(浏览器+可复制链接+取消)、
  本地档案(名字校验)、第三方站(服务地址 + 服务发现校验 + 密码登录,密码掩码且用完即弃)
- 导航:账户为一等页,入口是轨底头像位(未登录=描边剪影 / 已登录=首字母块+名字;窄高收成图标条)
- 凭据红线:DTO 侧形状脱敏 + 状态层二次脱敏 + 密码掩码;Inject-JWT 测试断言视图模型干净(已做变异取证)
- presenter:authlib 登录/服务发现/皮肤抓取(复用下载引擎的 HTTP 客户端,无新增依赖)、
  皮肤原图经 DTO 到 UI 裁剪成头像(既有 image 依赖,未改 Cargo.toml)
- i18n:新增 account 域 51 条中英文案(离线档案口径全量写入),金表同步
This commit is contained in:
AskaEth committed 2026-11-05 05:08:35 +08:00
1 parent e7b04c4afe
commit 1ff00bbe50
43 files changed
+4343 -117

No files matched your search

+144
View File
@@ -0,0 +1,144 @@
//! 凭据红线的**形状脱敏**:把 JWT / 不透明 token / `token=...` 这类串从任何要上屏的文案里抹掉。
//!
//! ## 为什么还要第二道脱敏器
//!
//! `core::launch::redact` 是**按已知明文值**替换的(拿着会话里的 token 原串去抹)。这里要挡的是
//! **没登记过的**字符串:服务端在错误响应里回显一个 token、HTTP 库把 header 拼进错误文案、
//! 某段调试串被画到面板上。两者互补,缺一不可:
//!
//! | 场景 | `core::launch::redact` | 本模块 |
//! |---|---|---|
//! | 已知会话 token 出现在日志里 | ✅ | ❌(不知道明文) |
//! | 服务端回包里的陌生 JWT 被画到错误面板 | ❌ | ✅ |
//!
//! 走形状识别(三段 base64url / 超长不透明串 / 敏感键名)就够拦住「一眼能看出是凭据」的串,
//! 而普通文案(URL、用户码 `ABCD-EFGH`、服务器名)**一个字都不动**——脱敏器本身不能变成噪音源。
/// 脱敏占位符(**故意刺眼**:宁可难看,也不许静默把凭据画到屏幕上)。
pub const REDACTED: &str = "⟪redacted⟫";
/// 把一段要上屏的文案里的凭据形状串抹掉(空白与其余字符**原样保留**)。
#[must_use]
pub fn redact(text: &str) -> String {
let mut out = String::with_capacity(text.len());
for piece in text.split_inclusive(char::is_whitespace) {
let split = piece.find(char::is_whitespace).unwrap_or(piece.len());
let (chunk, space) = piece.split_at(split);
out.push_str(&redact_chunk(chunk));
out.push_str(space);
}
out
}
/// 单个「词」的脱敏:① 敏感键名的值 ② 整个词本身就是凭据形状。
fn redact_chunk(chunk: &str) -> String {
if let Some((key, _value)) = chunk.split_once('=') {
if is_sensitive_key(key) || looks_opaque(chunk) {
return format!("{key}={REDACTED}");
}
}
if looks_opaque(chunk) {
return REDACTED.to_string();
}
chunk.to_string()
}
/// 键名是否属于「它的值一定是凭据」(`accessToken` / `refresh_token` / `password` …)。
fn is_sensitive_key(key: &str) -> bool {
let key = key
.trim_matches(|c: char| !c.is_alphanumeric() && c != '_' && c != '-')
.to_lowercase();
[
"token",
"secret",
"password",
"passwd",
"authorization",
"bearer",
"session",
]
.iter()
.any(|needle| key.contains(needle))
}
/// 词的形状是否像凭据:① 三段 base64url(JWT)② 长度 ≥40 的不透明串。
fn looks_opaque(chunk: &str) -> bool {
let trimmed = chunk.trim_matches(|c: char| {
!c.is_ascii_alphanumeric() && c != '_' && c != '-' && c != '.' && c != '+'
});
looks_like_jwt(trimmed) || (trimmed.len() >= 40 && trimmed.chars().all(is_base64url))
}
/// 是否是 JWT 形状:`header.payload.signature`,三段都非空且够长、全是 base64url 字符。
///
/// 公开是为了单测能直接钉这条判据(UI 侧「注入 JWT 必须被抹掉」的测试也用它)。
#[must_use]
pub fn looks_like_jwt(token: &str) -> bool {
let parts: Vec<&str> = token.split('.').collect();
parts.len() == 3
&& parts
.iter()
.all(|part| part.len() >= 8 && part.chars().all(is_base64url))
}
/// base64url 字母表(含 `=` 填充与 `+`/`/` 的宽容分支)。
fn is_base64url(c: char) -> bool {
c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '+' | '/' | '=' | '.')
}
#[cfg(test)]
mod tests {
use super::*;
/// 标准 JWT 形状(2 段 header/payload + 1 段签名)。
const JWT: &str =
"eyJhbGciOiJSUzI1NiIsIng1dCI6IkFCQyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.c2lnbmF0dXJlLXZhbHVl";
#[test]
fn the_jwt_shape_judgement_is_not_a_length_heuristic() {
assert!(looks_like_jwt(JWT));
assert!(!looks_like_jwt("not.a.jwt"), "短段不算 JWT");
assert!(!looks_like_jwt("a.b.c.d"), "四段不算 JWT");
assert!(!looks_like_jwt("ABCD-EFGH"), "设备码不是 JWT");
}
#[test]
fn bare_jwts_and_sensitive_pairs_are_redacted() {
assert_eq!(redact(JWT), REDACTED);
assert_eq!(
redact(&format!("Bearer {JWT}")),
format!("Bearer {REDACTED}")
);
assert_eq!(
redact(&format!("accessToken={JWT}")),
format!("accessToken={REDACTED}")
);
// 敏感键名 + 短值(真实 refresh token 常常很短,靠键名兜)
assert_eq!(redact("password=hunter2"), format!("password={REDACTED}"));
assert_eq!(
redact("refresh_token=abc"),
format!("refresh_token={REDACTED}")
);
}
#[test]
fn ordinary_copy_is_left_byte_for_byte() {
for text in [
"在浏览器打开 https://www.microsoft.com/link 并输入 ABCD-EFGH",
"服务器不可达:dns error",
"HTTP 403 Forbidden — 该服务器要求白名单",
"",
] {
assert_eq!(redact(text), text, "普通文案被改了:{text}");
}
}
#[test]
fn whitespace_and_line_breaks_survive() {
let text = format!("第一行 token={JWT}\n\n第二行 缩进");
let out = redact(&text);
assert!(out.contains("\n\n"), "{out}");
assert!(out.contains(" 缩进"), "{out}");
assert!(!out.contains(JWT), "{out}");
}
}
+157
View File
@@ -0,0 +1,157 @@
//! 账户 DTO 的契约测试(凭据红线的主要断言都在这里)。
use super::*;
#[test]
fn kind_round_trips_through_stable_ids() {
for kind in [
AccountKind::Offline,
AccountKind::Microsoft,
AccountKind::Authlib,
] {
assert_eq!(AccountKind::parse(kind.as_str()), kind);
assert!(!kind.label().is_empty());
}
}
#[test]
fn device_login_view_never_carries_tokens() {
let view = DeviceLoginView::waiting("ABCD-EFGH", "https://www.microsoft.com/link", 900, "");
assert_eq!(view.phase, DeviceLoginPhase::Waiting);
assert!(view.phase.busy());
assert!(view.qr_link.contains("ABCD-EFGH"));
let json = serde_json::to_string(&view).expect("序列化");
for forbidden in ["token", "secret", "password", "refresh"] {
assert!(
!json.to_lowercase().contains(forbidden),
"视图里不该出现 {forbidden}"
);
}
}
#[test]
fn browser_waiting_shows_a_copyable_link_instead_of_a_user_code() {
let view = DeviceLoginView::browser_waiting(
"https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize?client_id=x",
300,
Some("拉起浏览器失败"),
);
assert_eq!(view.phase, DeviceLoginPhase::Waiting);
assert!(view.phase.busy());
assert!(view.user_code.is_empty(), "授权码流没有用户码");
assert_eq!(view.qr_link, view.verification_uri);
assert!(view.message.contains("浏览器"));
assert!(view.message.contains("拉起浏览器失败"), "{}", view.message);
let json = serde_json::to_string(&view).expect("序列化");
for forbidden in ["refresh", "mc-access"] {
assert!(!json.contains(forbidden), "视图里不该出现 {forbidden}");
}
}
#[test]
fn succeeded_and_failed_clear_the_code() {
let ok = DeviceLoginView::succeeded("Steve");
assert_eq!(ok.phase, DeviceLoginPhase::Succeeded);
assert!(ok.user_code.is_empty());
let bad = DeviceLoginView::failed("网络超时");
assert_eq!(bad.phase, DeviceLoginPhase::Failed);
assert_eq!(bad.message, "网络超时");
}
/// 凭据红线(审核项):JWT 形状串从**任何**入口进来都必须被抹掉。
///
/// 抓得住:`redact` 被摘掉、判据被放宽成「长度 ≥40 就行」、或者某个构造器绕过它。
/// 抓不住:真实凭据的明文值(那是 `core::launch::redact` 的活儿,按已知值替换)。
#[test]
fn jwt_shaped_text_is_redacted_at_every_entry_point() {
let jwt =
"eyJhbGciOiJSUzI1NiIsIng1dCI6IkFCQyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.c2lnbmF0dXJlLXZhbHVl";
let device = DeviceLoginView::failed(format!("登录失败:accessToken={jwt}"));
assert!(!device.message.contains(jwt), "{}", device.message);
assert!(device.message.contains(REDACTED), "{}", device.message);
let authlib = AuthlibLoginView::failed(format!("服务器回包异常 {jwt}"));
assert!(!authlib.message.contains(jwt), "{}", authlib.message);
assert!(authlib.message.contains(REDACTED), "{}", authlib.message);
let ready = AuthlibLoginView::reachable("https://littleskin.cn/", "LittleSkin");
assert!(!ready.message.contains(jwt));
}
#[test]
fn authlib_request_never_prints_the_password() {
let request = AuthlibRequest::new(
"https://littleskin.cn/api/yggdrasil/",
"me@example.com",
"hunter2",
);
let shown = request.redacted();
assert!(!shown.contains("hunter2"), "{shown}");
assert!(shown.contains("littleskin"), "{shown}");
assert!(shown.contains(REDACTED), "{shown}");
}
#[test]
fn authlib_view_carries_the_server_name_and_no_tokens() {
let view = AuthlibLoginView::reachable("https://littleskin.cn/api/yggdrasil/", "LittleSkin");
assert_eq!(view.phase, DeviceLoginPhase::Waiting);
assert_eq!(view.server_name, "LittleSkin");
assert!(view.message.contains("LittleSkin"));
let ok = AuthlibLoginView::succeeded("LittleSkin", "Steve");
assert_eq!(ok.phase, DeviceLoginPhase::Succeeded);
assert_eq!(ok.account_name, "Steve");
let json = serde_json::to_string(&ok).expect("序列化");
for forbidden in ["accessToken", "clientToken", "refresh", "password"] {
assert!(!json.contains(forbidden), "视图里不该出现 {forbidden}");
}
}
#[test]
fn account_view_serializes_without_credentials() {
let view = AccountView {
id: "account:a".to_string(),
name: "Steve".to_string(),
kind: AccountKind::Authlib,
profile_id: "0f8f".to_string(),
login_name: "me@example.com".to_string(),
created: "2026-10-31 20:12".to_string(),
active: true,
server_url: "https://littleskin.cn/api/yggdrasil/".to_string(),
skin: Some(SkinImage {
png: vec![1, 2, 3],
source: "textures".to_string(),
}),
};
let json = serde_json::to_string(&view).expect("序列化");
for forbidden in ["token", "secret", "password", "refresh"] {
assert!(
!json.to_lowercase().contains(forbidden),
"账户视图里不该出现 {forbidden}"
);
}
assert!(json.contains("\"png\""));
}
#[test]
fn monogram_is_stable_and_never_empty() {
let mut view = AccountView {
id: "account:a".to_string(),
name: " steve".to_string(),
kind: AccountKind::Microsoft,
profile_id: "0f8f".to_string(),
login_name: String::new(),
created: String::new(),
active: false,
server_url: String::new(),
skin: None,
};
assert_eq!(view.monogram(), "S");
let tone = view.monogram_tone();
assert!(tone < 6);
view.profile_id = "0f8f".to_string();
assert_eq!(view.monogram_tone(), tone, "同一个人每次同一个色块");
view.name = String::new();
assert_eq!(view.monogram(), "?", "空名字也要有字,不能画白块");
}