mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
QR login follows the official client: status_query_ticket, 60 s long poll, stop on failure (#68)
From the official Mac client (UURemote 4.42; QRCodeGenLoginResponse decodes only qrcode_jump_url and status_query_ticket, the status/by_qrcode bodies carry that ticket under "token"): - gen/login is sent without a body; the status ticket is status_query_ticket (older token as fallback). - The status long poll re-asks right after each answer with a 60 s request timeout (was 12 s). - Status 3 regenerates at once, status 0 after 0.35 s, 4 logs in (3 no longer calls by_qrcode). - Errors such as HTTP 400 code 1190 and timeouts stop polling until the user clicks the new 刷新二维码 button (Enter in a terminal; one minute when neither exists). This replaces the v0.2.19 backoff and the re-register hint. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
89abae2369
commit
5fdb98b0f5
4 files changed
+110
-51
No files matched your search
@@ -46,7 +46,10 @@ static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
|
||||
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
||||
static GtkWidget *refresh_items[5], *footer_label;
|
||||
// Account card: QR login before sign-in, user info (+ logout) after.
|
||||
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label;
|
||||
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label, *qr_refresh;
|
||||
/* Like the official client, a failed or timed-out QR stays until the user asks for a new one. */
|
||||
static atomic_int qr_refresh_requested;
|
||||
static void on_qr_refresh(GtkButton *b, gpointer d) { (void)b; (void)d; atomic_store(&qr_refresh_requested, 1); gtk_widget_hide(qr_refresh); }
|
||||
static int show_assist = 1, show_account;
|
||||
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
||||
static GtkWidget *tray_menu, *tray_allow;
|
||||
@@ -250,6 +253,11 @@ static GtkWidget *build_account_card(void) {
|
||||
login_status = label("", "status");
|
||||
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
||||
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
||||
qr_refresh = gtk_button_new_with_label("刷新二维码");
|
||||
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
||||
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
||||
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
||||
gtk_box_pack_start(GTK_BOX(qr_text), qr_refresh, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
||||
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
||||
|
||||
@@ -641,6 +649,16 @@ void uu_ui_set_user(const char *name) {
|
||||
if (!ui_started || init_state != 1) return;
|
||||
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
||||
}
|
||||
static gboolean apply_qr_refresh(gpointer data) {
|
||||
if (window && qr_refresh) { if (GPOINTER_TO_INT(data)) gtk_widget_show(qr_refresh); else gtk_widget_hide(qr_refresh); }
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
void uu_login_ui_offer_refresh(int visible) {
|
||||
if (!ui_started || init_state != 1 || atomic_load(&closed)) return;
|
||||
atomic_store(&qr_refresh_requested, 0);
|
||||
g_idle_add(apply_qr_refresh, GINT_TO_POINTER(visible != 0));
|
||||
}
|
||||
int uu_login_ui_take_refresh(void) { return atomic_exchange(&qr_refresh_requested, 0); }
|
||||
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
||||
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
||||
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
||||
+11
@@ -251,6 +251,17 @@ impl UUAuthClient {
|
||||
Ok((status, value))
|
||||
}
|
||||
|
||||
/// Signed POST with an optional JSON body (None = empty body, like Moya `requestPlain`) and an
|
||||
/// explicit timeout. The official clients long-poll the QR status with a 60 s request timeout.
|
||||
pub async fn post_with_timeout(&self, path: &str, body: Option<&serde_json::Value>, timeout: std::time::Duration) -> Result<(u16, serde_json::Value), String> {
|
||||
let body_str = body.map(serde_json::to_string).transpose().map_err(|e| e.to_string())?.unwrap_or_default();
|
||||
let resp = self.http.post(format!("{}{}", BASE_URL, path)).timeout(timeout)
|
||||
.headers(self.build_headers("POST", path, &body_str)).body(body_str)
|
||||
.send().await.map_err(|e| format!("HTTP post {path} failed: {}", transport_error(&e)))?;
|
||||
let status = resp.status().as_u16();
|
||||
Ok((status, resp.json().await.unwrap_or(serde_json::Value::Null)))
|
||||
}
|
||||
|
||||
/// Signed JSON POST to another API host (the signature covers the path only).
|
||||
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
||||
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
||||
|
||||
+65
-50
@@ -268,14 +268,22 @@ pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
||||
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
let (mut cfg, creds) = prepare_device().await?;
|
||||
let client = UUAuthClient::new(creds.clone());
|
||||
let mut instant_expiries = 0u32;
|
||||
|
||||
// Mirrors the official Mac client (LoginViewController / LoginManager, UURemote 4.42): gen/login has
|
||||
// no body; the status long poll sends gen's `status_query_ticket` under `token` with the last
|
||||
// status, re-asks as soon as an answer arrives (60 s request timeout), regenerates on status 3
|
||||
// at once and on status 0 after 0.35 s, logs in on 4, and on any error (e.g. HTTP 400 code 1190)
|
||||
// stops until the user asks for a new QR. Sending gen's older `token` field made the cloud reject
|
||||
// every QR within seconds (#68).
|
||||
let timeout = Duration::from_secs(60);
|
||||
loop {
|
||||
let (status, resp) = client.post_json("/api/v1/qrcode/gen/login", &json!({})).await?;
|
||||
let d = data("qrcode gen", status, &resp)?;
|
||||
let (status, resp) = client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await?;
|
||||
let d = match data("qrcode gen", status, &resp) {
|
||||
Ok(d) => d.clone(),
|
||||
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, "二维码加载失败").await; continue; }
|
||||
};
|
||||
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
||||
let ticket = d.get("token").or_else(|| d.get("status_query_ticket")).and_then(|v| v.as_str())
|
||||
.ok_or("qrcode gen returned no token")?.to_string();
|
||||
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||
ui.offer_refresh(false);
|
||||
if ui.shown() {
|
||||
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
||||
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
||||
@@ -290,48 +298,31 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
||||
}
|
||||
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
||||
// Status is a long poll: send the state already shown (server enum 1..4; observed:
|
||||
// 1 waiting, 2 scanned, 4 after the phone confirmed); the server answers when it changes.
|
||||
let mut login_status = 1i64;
|
||||
let mut expired = false;
|
||||
let generated = std::time::Instant::now();
|
||||
for _ in 0..150 {
|
||||
let failure = loop {
|
||||
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
||||
let asked = std::time::Instant::now();
|
||||
let (status, resp) = match client.post_json("/api/v1/qrcode/login/status", &query).await {
|
||||
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/login/status", Some(&query), timeout).await {
|
||||
Ok(r) => r,
|
||||
// Long-poll timeout: ask again, but never spin on transport errors (#68).
|
||||
Err(_) => { if asked.elapsed() < Duration::from_secs(1) { tokio::time::sleep(Duration::from_secs(2)).await; } continue; }
|
||||
Err(_) => break "网络超时,二维码已停止刷新",
|
||||
};
|
||||
// Code 1190 (HTTP 400, "二维码已失效"): the QR expired; generate a new one.
|
||||
if resp.get("code").and_then(|c| c.as_i64()) == Some(QR_EXPIRED) {
|
||||
ui.status("二维码已过期,正在刷新…", Tone::Info);
|
||||
expired = true; break;
|
||||
}
|
||||
let st = data("qrcode status", status, &resp)?.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
||||
if st == login_status {
|
||||
// The server normally holds this request; an immediate unchanged answer must not
|
||||
// turn into a tight loop of dozens of requests per second (#68).
|
||||
if asked.elapsed() < Duration::from_secs(1) { tokio::time::sleep(Duration::from_secs(2)).await; }
|
||||
continue;
|
||||
}
|
||||
login_status = st;
|
||||
let code = resp.get("code").and_then(|c| c.as_i64());
|
||||
if code == Some(QR_EXPIRED) { break "二维码已失效"; }
|
||||
let Ok(d) = data("qrcode status", status, &resp) else { break "二维码状态查询失败"; };
|
||||
let st = d.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
||||
match st {
|
||||
2 => {
|
||||
1 => {}
|
||||
2 => if login_status != 2 {
|
||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
||||
}
|
||||
3 | 4 => {
|
||||
// A final state: confirmed logs in; cancelled/expired is refused and a new QR follows.
|
||||
},
|
||||
3 => { println!("QR code expired; generating a new one"); break ""; }
|
||||
0 => { tokio::time::sleep(Duration::from_millis(350)).await; break ""; }
|
||||
4 => {
|
||||
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
||||
let (status, resp) = client.post_json("/api/v1/login/by_qrcode", &body).await?;
|
||||
let (status, resp) = client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await?;
|
||||
let d = match data("qrcode login", status, &resp) {
|
||||
Ok(d) => d,
|
||||
Err(e) => {
|
||||
println!("QR status {st}: login not granted ({e})");
|
||||
ui.status("手机端未确认登录,正在刷新二维码…", Tone::Error);
|
||||
expired = true; break;
|
||||
}
|
||||
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
|
||||
};
|
||||
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
||||
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
||||
@@ -348,25 +339,49 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
||||
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
||||
}
|
||||
_ => { println!("QR status: {st}"); ui.status("二维码已失效,正在刷新…", Tone::Error); expired = true; break; }
|
||||
other => { println!("QR status: {other}"); break "二维码已失效"; }
|
||||
}
|
||||
}
|
||||
println!("{}", if expired { "QR code expired; generating a new one" } else { "QR code timed out; generating a new one" });
|
||||
// A QR rejected within seconds of being generated, again and again, was seen when the cloud
|
||||
// flagged this device identity (#68): back off and say how to recover.
|
||||
if expired && generated.elapsed() < Duration::from_secs(10) { instant_expiries += 1; } else { instant_expiries = 0; }
|
||||
if instant_expiries == 3 {
|
||||
eprintln!("The QR code keeps expiring immediately. If this persists, the cloud may reject this device identity: \
|
||||
back up and remove ~/.config/uuremote/config.json, then run `uuremote-server login` again to register a new device.");
|
||||
ui.status("二维码反复立即失效:可备份并删除 ~/.config/uuremote/config.json 后重新登录(会注册新设备)", Tone::Error);
|
||||
}
|
||||
tokio::time::sleep(Duration::from_secs(1u64 << instant_expiries.min(5))).await; // never spin if the server keeps refusing
|
||||
login_status = st;
|
||||
};
|
||||
if !failure.is_empty() { wait_for_refresh(ui, failure).await; }
|
||||
}
|
||||
}
|
||||
|
||||
/// gen/login's status ticket: `status_query_ticket` (current cloud and official clients), else the
|
||||
/// older `token` field for servers that do not send it.
|
||||
fn qr_ticket(gen: &Value) -> Option<&str> {
|
||||
gen.get("status_query_ticket").or_else(|| gen.get("token")).and_then(|v| v.as_str()).filter(|t| !t.is_empty())
|
||||
}
|
||||
|
||||
/// Stop like the official client and wait for the user: the 刷新二维码 button, Enter in a terminal,
|
||||
/// or (no window and no terminal, e.g. a service) one minute.
|
||||
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
|
||||
use std::io::IsTerminal;
|
||||
ui.status(&format!("{reason},请点击「刷新二维码」"), Tone::Error);
|
||||
ui.offer_refresh(true);
|
||||
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
||||
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
||||
else { println!("{reason}; waiting for 刷新二维码{}", if ui.shown() { "" } else { " (a new QR code follows in 60 s)" }); }
|
||||
let mut line = terminal.then(|| tokio::task::spawn_blocking(|| { let mut s = String::new(); let _ = std::io::stdin().read_line(&mut s); }));
|
||||
let started = std::time::Instant::now();
|
||||
loop {
|
||||
if ui.take_refresh() || (ui.shown() && ui.closed()) { break; }
|
||||
if let Some(handle) = line.as_mut() { if handle.is_finished() { break; } }
|
||||
if !ui.shown() && !terminal && started.elapsed() >= Duration::from_secs(60) { break; }
|
||||
tokio::time::sleep(Duration::from_millis(200)).await;
|
||||
}
|
||||
ui.offer_refresh(false);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn status_ticket_prefers_status_query_ticket() {
|
||||
assert_eq!(qr_ticket(&json!({"token": "old", "status_query_ticket": "new"})), Some("new"));
|
||||
assert_eq!(qr_ticket(&json!({"token": "old"})), Some("old"));
|
||||
assert_eq!(qr_ticket(&json!({"status_query_ticket": ""})), None);
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn service_waits_until_a_new_token_is_saved() {
|
||||
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
||||
|
||||
@@ -10,6 +10,8 @@ extern "C" {
|
||||
fn uu_login_ui_set_done(text: *const libc::c_char);
|
||||
fn uu_login_ui_closed() -> libc::c_int;
|
||||
fn uu_login_ui_close();
|
||||
fn uu_login_ui_offer_refresh(visible: libc::c_int);
|
||||
fn uu_login_ui_take_refresh() -> libc::c_int;
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
@@ -56,6 +58,19 @@ impl LoginUi {
|
||||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
/// Show or hide the 刷新二维码 button (a failed QR waits for the user, like the official client).
|
||||
pub fn offer_refresh(&self, visible: bool) {
|
||||
#[cfg(uu_gtk)]
|
||||
if self.shown { unsafe { uu_login_ui_offer_refresh(libc::c_int::from(visible)) } }
|
||||
#[cfg(not(uu_gtk))]
|
||||
let _ = visible;
|
||||
}
|
||||
/// The user clicked 刷新二维码 since the last call.
|
||||
pub fn take_refresh(&self) -> bool {
|
||||
#[cfg(uu_gtk)]
|
||||
if self.shown { return unsafe { uu_login_ui_take_refresh() } != 0; }
|
||||
false
|
||||
}
|
||||
pub fn status(&self, text: &str, tone: Tone) {
|
||||
#[cfg(uu_gtk)]
|
||||
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
||||
|
||||
Reference in new issue
Block a user