research/08 方案 A:GUI 的微软登录改走授权码流(HMCL 主流做法),设备码流保留给 CLI/无浏览器场景。两条流只差「怎么拿到 MS access_token」,拿到之后共用 chain::complete_chain 与 MicrosoftSession,落盘/刷新语义没有第二套。 core(crates/core/src/auth/microsoft/) - endpoints:新增 authorize(…/consumers/oauth2/v2.0/authorize),与 token 同租户。 - authcode:RedirectUri 是 http://localhost:{port}/auth 的唯一来源(授权 URL、 token 请求体、实际监听三处共用,坑 5);AuthCodePolicy(回调超时 300s / 绑定重试 3 次 / 固定端口 / 固定 state);authorization_url(response_type=code + prompt=select_account + scope=XboxLive.signin%20offline_access);exchange_code 复用 flow 的 oauth_error/tokens_from。 - callback:本地 HTTP/1.1 回调服务器。内核分配端口(占用按次数退避重试);非 /auth 路径 (favicon、预连)404 后继续等;state 不匹配 400 后继续等;error=access_denied 归 Canceled; 单条连接读头超时 5s,半开连接拖不垮时间预算。 - MicrosoftAuth::authcode_login(present):绑端口 → present(宿主开浏览器)→ 等回调 → 换 token → 整链;失败与设备码流一样落 M38 失败日志。 app(crates/app) - AppCommand::StartBrowserLogin + host::accounts::start_browser_login;设备码/授权码共用 LoginJob 取消槽位、收尾入库(store_session)与面板 DTO。 - host::opener 用系统默认浏览器打开授权 URL(Windows rundll32 url.dll,FileProtocolHandler)。 - 账户页:主按钮「微软登录」走授权码流,「设备码登录」作备用;DeviceLoginView::browser_waiting 在面板里给出可复制的授权链接(user_code 留空)。 测试 - crates/core/tests/auth/microsoft_authcode.rs:授权 URL 向量(租户/编码/prompt)、 URI 一致性(授权 URL 与 token 表单同字面量)、mock 全链、favicon+陈旧 state 后仍拿到 code、 端口占用重试文案、超时、access_denied→Canceled、login_with_xbox 403 的 M38 诊断 (detail_code=login_with_xbox_403,真机白名单未批时验收止步于此)。 - 单测:authcode 编码/向量、callback query 解码与错误分流、DTO browser_waiting、conv 面板。 未做/未验证:真机完整登录需 Azure 公共客户端 id(ULL_MSA_CLIENT_ID)与 Minecraft API 许可, 本机只能到「授权页 302 到 login.live.com 且 redirect_uri/scope/prompt 原样保留」这一步。 AskaEth <i@yeij.top>
275 lines
10 KiB
Rust
275 lines
10 KiB
Rust
//! 账户:三轨统一列表(只读公开字段)+ 离线新增 + 删除/切换 + 微软登录(两条流)。
|
||
//!
|
||
//! 凭据红线(D9):`Credentials` / `MicrosoftSession` 只在本模块与 `launch.rs` 里出现,
|
||
//! 出口一律是 [`AccountView`] / [`DeviceLoginView`]。
|
||
//!
|
||
//! 两条登录流:授权码([`start_browser_login`],GUI 默认:拉起系统浏览器 + 本地回调,
|
||
//! `research/08` §3 方案 A)与设备码([`start_login`],无浏览器/CLI 场景)。除了「怎么拿到
|
||
//! MS access_token」之外完全共用:同一个取消槽位、同一段账户入库、同一个刷新链。
|
||
//!
|
||
//! 取消语义:轮询/等回调都跑在 `core` 里、没有取消钩子,所以取消只把面板收回;线程收尾时
|
||
//! 若发现「已取消」就不入库(避免用户点了取消却凭空多出一个账户)。
|
||
|
||
use std::sync::atomic::{AtomicBool, Ordering};
|
||
use std::sync::Arc;
|
||
|
||
use unlucky_core::auth::account::Credentials;
|
||
use unlucky_core::auth::microsoft::{now_ms, MicrosoftAuth, MicrosoftSession};
|
||
use unlucky_core::auth::offline::offline_meta;
|
||
use unlucky_core::auth::{AccountStore, AuthResult};
|
||
use unlucky_core::download::blocking::block_on;
|
||
|
||
use crate::dto::{AccountKind, AccountView, DeviceLoginView};
|
||
|
||
use super::env::HostEnv;
|
||
use super::job::{spawn, HostTask, JobSender};
|
||
use super::opener;
|
||
|
||
/// 账户列表(公开字段)。
|
||
pub fn accounts(env: &HostEnv, active: Option<&str>) -> Vec<AccountView> {
|
||
let store = AccountStore::open(env.layout.auth_data());
|
||
store
|
||
.accounts()
|
||
.iter()
|
||
.map(|meta| AccountView {
|
||
id: meta.id.as_str().to_string(),
|
||
name: meta.display_name().to_string(),
|
||
kind: AccountKind::parse(meta.kind.as_str()),
|
||
profile_id: meta.profile_id.clone(),
|
||
login_name: meta.login_name.clone().unwrap_or_default(),
|
||
created: display_ms(meta.created_at_ms),
|
||
active: active.is_some_and(|id| id == meta.id.as_str()),
|
||
})
|
||
.collect()
|
||
}
|
||
|
||
/// 毫秒时间戳 → `2026-10-31 20:12`(UTC;账户列表只用来排序/辨认)。
|
||
pub fn display_ms(ms: u64) -> String {
|
||
if ms == 0 {
|
||
return String::new();
|
||
}
|
||
let total_secs = ms / 1000;
|
||
let days = total_secs / 86_400;
|
||
let rem = total_secs % 86_400;
|
||
let (year, month, day) = civil_from_days(i64::try_from(days).unwrap_or(0));
|
||
format!(
|
||
"{year:04}-{month:02}-{day:02} {:02}:{:02}",
|
||
rem / 3_600,
|
||
(rem % 3_600) / 60
|
||
)
|
||
}
|
||
|
||
/// Howard Hinnant 的 `civil_from_days`(1970-01-01 为 0)。
|
||
fn civil_from_days(days: i64) -> (i64, u32, u32) {
|
||
let z = days + 719_468;
|
||
let era = if z >= 0 { z } else { z - 146_096 } / 146_097;
|
||
let doe = z - era * 146_097;
|
||
let yoe = (doe - doe / 1_460 + doe / 36_524 - doe / 146_096) / 365;
|
||
let y = yoe + era * 400;
|
||
let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
|
||
let mp = (5 * doy + 2) / 153;
|
||
let d = doy - (153 * mp + 2) / 5 + 1;
|
||
let m = if mp < 10 { mp + 3 } else { mp - 9 };
|
||
(if m <= 2 { y + 1 } else { y }, m as u32, d as u32)
|
||
}
|
||
|
||
/// 加一个离线账户。
|
||
///
|
||
/// # Errors
|
||
///
|
||
/// 名字不合法、同名冲突、落盘失败时返回用户可读文案。
|
||
pub fn add_offline(env: &HostEnv, name: &str) -> Result<String, String> {
|
||
let name = name.trim();
|
||
let meta = offline_meta(name, now_ms()).map_err(|error| error.to_string())?;
|
||
let display = meta.display_name().to_string();
|
||
let mut store = AccountStore::open(env.layout.auth_data());
|
||
store
|
||
.insert(meta, Credentials::Offline)
|
||
.map_err(|error| format!("添加账户失败:{error}"))?;
|
||
store
|
||
.save()
|
||
.map_err(|error| format!("保存账户失败:{error}"))?;
|
||
Ok(display)
|
||
}
|
||
|
||
/// 删除账户(按 id 或名字)。
|
||
///
|
||
/// # Errors
|
||
///
|
||
/// 找不到、落盘失败时返回用户可读文案。
|
||
pub fn remove(env: &HostEnv, key: &str) -> Result<String, String> {
|
||
let mut store = AccountStore::open(env.layout.auth_data());
|
||
let meta = store
|
||
.remove(key)
|
||
.map_err(|error| format!("删除账户失败:{error}"))?;
|
||
store
|
||
.save()
|
||
.map_err(|error| format!("保存账户失败:{error}"))?;
|
||
Ok(meta.display_name().to_string())
|
||
}
|
||
|
||
/// 微软登录任务句柄(取消标志 + 账户名回执;两条流共用)。
|
||
#[derive(Debug, Clone, Default)]
|
||
pub struct LoginJob {
|
||
/// 用户点了取消(线程收尾时据此丢弃结果)
|
||
pub cancelled: Arc<AtomicBool>,
|
||
}
|
||
|
||
impl LoginJob {
|
||
/// 新建一个未取消的句柄。
|
||
pub fn new() -> Self {
|
||
Self {
|
||
cancelled: Arc::new(AtomicBool::new(false)),
|
||
}
|
||
}
|
||
|
||
/// 取消。
|
||
pub fn cancel(&self) {
|
||
self.cancelled.store(true, Ordering::SeqCst);
|
||
}
|
||
|
||
/// 是否已取消。
|
||
pub fn is_cancelled(&self) -> bool {
|
||
self.cancelled.load(Ordering::SeqCst)
|
||
}
|
||
}
|
||
|
||
/// 起一次设备码登录(后台线程;`present` 时刻发 Waiting 事件)。
|
||
pub fn start_login(env: HostEnv, tx: JobSender, job: LoginJob) {
|
||
spawn("msa-login", move || {
|
||
let auth = match microsoft_auth(&env) {
|
||
Ok(auth) => auth,
|
||
Err(message) => return fail(&tx, message),
|
||
};
|
||
let tx_prompt = tx.clone();
|
||
let result = block_on(auth.device_code_login(|prompt| {
|
||
let _ = tx_prompt.send(HostTask::Login(Box::new(DeviceLoginView::waiting(
|
||
&prompt.user_code,
|
||
&prompt.verification_uri,
|
||
prompt.expires_in.as_secs(),
|
||
&format!("{}#{}", prompt.verification_uri, prompt.user_code),
|
||
))));
|
||
}));
|
||
finish(&env, &tx, &job, result);
|
||
});
|
||
}
|
||
|
||
/// 起一次授权码登录(后台线程:绑本地端口 → 拉起系统默认浏览器 → 等回调 → 换链)。
|
||
///
|
||
/// 与设备码流共用同一个 [`LoginJob`] 取消槽位、同一段账户入库逻辑,所以两条流的
|
||
/// 凭据/刷新语义完全一致(`core` 侧也共用 [`unlucky_core::auth::MicrosoftSession`])。
|
||
pub fn start_browser_login(env: HostEnv, tx: JobSender, job: LoginJob) {
|
||
spawn("msa-authcode", move || {
|
||
let auth = match microsoft_auth(&env) {
|
||
Ok(auth) => auth,
|
||
Err(message) => return fail(&tx, message),
|
||
};
|
||
let tx_prompt = tx.clone();
|
||
let result = block_on(auth.authcode_login(|prompt| {
|
||
// 浏览器拉不起来不是致命错误:面板里还有可复制的授权链接。
|
||
let opened = opener::open_url(&prompt.authorization_url);
|
||
let _ = tx_prompt.send(HostTask::Login(Box::new(DeviceLoginView::browser_waiting(
|
||
&prompt.authorization_url,
|
||
prompt.timeout.as_secs(),
|
||
opened.err().as_deref(),
|
||
))));
|
||
}));
|
||
finish(&env, &tx, &job, result);
|
||
});
|
||
}
|
||
|
||
/// 生产入口的 `MicrosoftAuth`:client id 取环境/构建期,失败日志落 `<数据根>/logs/`。
|
||
fn microsoft_auth(env: &HostEnv) -> Result<MicrosoftAuth, String> {
|
||
MicrosoftAuth::from_env()
|
||
.map(|auth| {
|
||
auth.with_journal(Some(unlucky_core::auth::AuthJournal::in_logs_dir(
|
||
env.layout.logs(),
|
||
)))
|
||
})
|
||
.map_err(|error| error.to_string())
|
||
}
|
||
|
||
fn fail(tx: &JobSender, message: String) {
|
||
let _ = tx.send(HostTask::Login(Box::new(DeviceLoginView::failed(message))));
|
||
}
|
||
|
||
/// 收尾:取消就吞掉结果;成功入库;失败带 core 的诊断文案(M38 的 403 也走这条)。
|
||
fn finish(env: &HostEnv, tx: &JobSender, job: &LoginJob, result: AuthResult<MicrosoftSession>) {
|
||
if job.is_cancelled() {
|
||
let _ = tx.send(HostTask::Login(Box::default()));
|
||
return;
|
||
}
|
||
match result {
|
||
Ok(session) => match store_session(env, session) {
|
||
Ok(name) => {
|
||
let _ = tx.send(HostTask::Login(Box::new(DeviceLoginView::succeeded(&name))));
|
||
let _ = tx.send(HostTask::Accounts(accounts(env, None)));
|
||
}
|
||
Err(message) => fail(tx, message),
|
||
},
|
||
Err(error) => fail(tx, error.to_string()),
|
||
}
|
||
}
|
||
|
||
/// 微软会话入库(元数据 + 凭据分文件,见 `core::auth::AccountStore`)。
|
||
fn store_session(env: &HostEnv, session: MicrosoftSession) -> Result<String, String> {
|
||
let meta = unlucky_core::auth::account::AccountMeta::new(
|
||
unlucky_core::auth::account::AccountKind::Microsoft,
|
||
session.profile_id.clone(),
|
||
session.profile_name.clone(),
|
||
now_ms(),
|
||
);
|
||
let name = meta.display_name().to_string();
|
||
let mut store = AccountStore::open(env.layout.auth_data());
|
||
store
|
||
.insert(meta, Credentials::Microsoft(session))
|
||
.and_then(|()| store.save())
|
||
.map_err(|error| format!("账户入库失败:{error}"))?;
|
||
Ok(name)
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
#[test]
|
||
fn time_display_matches_known_timestamps() {
|
||
assert_eq!(display_ms(0), "");
|
||
// 1_769_000_000_000 ms = 2026-01-21T12:53:20Z(取整到分钟)
|
||
assert_eq!(display_ms(1_769_000_000_000), "2026-01-21 12:53");
|
||
}
|
||
|
||
#[test]
|
||
fn offline_add_list_remove_round_trips() {
|
||
let dir = std::env::temp_dir().join(format!("ull-host-accounts-{}", std::process::id()));
|
||
let _ = std::fs::remove_dir_all(&dir);
|
||
let env = HostEnv::at_root(&dir);
|
||
std::fs::create_dir_all(env.layout.auth_data()).expect("auth 目录");
|
||
|
||
let name = add_offline(&env, "Steve").expect("加账户");
|
||
assert_eq!(name, "Steve");
|
||
let list = accounts(&env, None);
|
||
assert_eq!(list.len(), 1);
|
||
assert_eq!(list[0].kind, AccountKind::Offline);
|
||
assert!(!list[0].active);
|
||
|
||
let active = accounts(&env, Some(list[0].id.as_str()));
|
||
assert!(active[0].active);
|
||
|
||
let removed = remove(&env, "Steve").expect("删账户");
|
||
assert_eq!(removed, "Steve");
|
||
assert!(accounts(&env, None).is_empty());
|
||
assert!(add_offline(&env, " ").is_err());
|
||
std::fs::remove_dir_all(&dir).ok();
|
||
}
|
||
|
||
#[test]
|
||
fn login_job_cancel_flag_is_shared() {
|
||
let job = LoginJob::new();
|
||
let clone = job.clone();
|
||
assert!(!clone.is_cancelled());
|
||
job.cancel();
|
||
assert!(clone.is_cancelled());
|
||
}
|
||
}
|