Upload 2 files

src/main.rs

@@ -1020,7 +1020,91 @@ async fn mobile_login(email: &str, password_md5: &str) -> Result<String, String>
     Ok(arl)
 }
 
-async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
+const DEEZER_APP_SECRET: &str = "a83bf7f38ad2f137e444727cfc3775cf";
+
+struct WebLoginResult {
+    arl: String,
+    token: String,
+    uid: String,
+    access_token: String,
+}
+
+async fn oauth_access_token(
+    client: &reqwest::Client,
+    email: &str,
+    password_md5: &str,
+) -> Result<String, String> {
+    let app_id = deezer_app_id();
+    let hash_src = format!("{app_id}{email}{password_md5}{DEEZER_APP_SECRET}");
+    let hash = format!("{:x}", md5::compute(hash_src.as_bytes()));
+
+    let r = client
+        .get("https://connect.deezer.com/oauth/user_auth.php")
+        .query(&[
+            ("app_id", app_id.as_str()),
+            ("login", email),
+            ("password", password_md5),
+            ("hash", hash.as_str()),
+        ])
+        .header(ACCEPT, "*/*")
+        .header("Accept-Language", "en-US,en;q=0.9")
+        .header(
+            "User-Agent",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+        )
+        .send()
+        .await
+        .map_err(|e| format!("network:{e}"))?;
+
+    let status = r.status();
+    let text = r.text().await.map_err(|_| "read".to_string())?;
+    let v: serde_json::Value = serde_json::from_str(&text).map_err(|_| {
+        let snip: String = text.chars().take(200).collect();
+        format!("parse:{}:{}", status.as_u16(), snip)
+    })?;
+
+    if let Some(err) = v.get("error") {
+        return Err(err.as_str().unwrap_or("error").to_string());
+    }
+
+    let token = v
+        .get("access_token")
+        .and_then(|t| t.as_str())
+        .unwrap_or("")
+        .to_string();
+    if token.is_empty() {
+        return Err("no_token".to_string());
+    }
+    Ok(token)
+}
+
+async fn establish_oauth_session(client: &reqwest::Client, jar: &Jar, access_token: &str) {
+    let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
+    let url_api = "https://api.deezer.com".parse::<Url>().unwrap();
+    let ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36";
+
+    let _ = client
+        .get("https://api.deezer.com/platform/generic/track/80085")
+        .header("Authorization", format!("Bearer {access_token}"))
+        .header(ACCEPT, "*/*")
+        .header("Accept-Language", "en-US,en;q=0.9")
+        .header("User-Agent", ua)
+        .send()
+        .await;
+
+    if !jar_has_cookie(jar, &url_deezer, "sid=") && !jar_has_cookie(jar, &url_api, "sid=") {
+        let _ = client
+            .get("https://api.deezer.com/platform/generic/track/3135556")
+            .header("Authorization", format!("Bearer {access_token}"))
+            .header(ACCEPT, "*/*")
+            .header("Accept-Language", "en-US,en;q=0.9")
+            .header("User-Agent", ua)
+            .send()
+            .await;
+    }
+}
+
+async fn web_login(email: &str, password_md5: &str) -> Result<WebLoginResult, String> {
     let jar = Arc::new(Jar::default());
     let url_deezer = "https://www.deezer.com".parse::<Url>().map_err(|_| "web:url".to_string())?;
     jar.add_cookie_str("comeback=1; Domain=.deezer.com; Path=/", &url_deezer);
@@ -1032,6 +1116,13 @@ async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
         .build()
         .map_err(|_| "web:client".to_string())?;
 
+    // OAuth через connect.deezer.com — не блокируется так же, как gw-light checkCredentials
+    let access_token = oauth_access_token(&client, email, password_md5)
+        .await
+        .map_err(|e| format!("oauth:{e}"))?;
+
+    establish_oauth_session(&client, &jar, &access_token).await;
+
     let _ = client
         .get("https://www.deezer.com/")
         .header(ACCEPT, "*/*")
@@ -1060,56 +1151,67 @@ async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
         return Err("web:no_checkForm".to_string());
     }
 
-    let _ = gw_light_call_custom(
-        &client,
-        "user.checkCredentials",
-        &check_form,
-        None,
-        &json!({
-            "login": email,
-            "password": password_md5,
-            "checkFormLogin": check_form
-        }),
-        None,
-        false,
-    )
-    .await
-    .map_err(|e| format!("web:checkCredentials:{e}"))?;
+    let uid = ud
+        .get("USER")
+        .and_then(|u| u.get("USER_ID"))
+        .and_then(|x| x.as_i64())
+        .map(|n| n.to_string())
+        .unwrap_or_default();
 
-    let ud2 = gw_light_call_custom(
-        &client,
-        "deezer.getUserData",
-        "null",
-        None,
-        &json!({}),
-        None,
-        false,
-    )
-    .await
-    .map_err(|e| format!("web:getUserData2:{e}"))?;
-
-    let check_form2 = ud2.get("checkForm").and_then(|x| x.as_str()).unwrap_or("").trim().to_string();
-    if check_form2.is_empty() {
-        return Err("web:no_checkForm2".to_string());
-    }
-
-    let arl_v = gw_light_call_custom(
+    let arl_v = match gw_light_call_custom(
         &client,
         "user.getArl",
-        &check_form2,
+        &check_form,
         None,
         &json!({}),
         None,
         true,
     )
     .await
-    .map_err(|e| format!("web:getArl:{e}"))?;
+    {
+        Ok(v) => v,
+        Err(e1) => {
+            // Последний fallback — checkCredentials (часто режется на HF/VPS)
+            let _ = gw_light_call_custom(
+                &client,
+                "user.checkCredentials",
+                &check_form,
+                None,
+                &json!({
+                    "login": email,
+                    "password": password_md5,
+                    "checkFormLogin": check_form
+                }),
+                None,
+                false,
+            )
+            .await;
+
+            gw_light_call_custom(
+                &client,
+                "user.getArl",
+                &check_form,
+                None,
+                &json!({}),
+                None,
+                true,
+            )
+            .await
+            .map_err(|e2| format!("web:getArl:{e1}; retry:{e2}"))?
+        }
+    };
 
     let arl = arl_v.as_str().unwrap_or("").to_string();
     if arl.len() < 100 {
         return Err(format!("web:arl_too_short:{}", arl.len()));
     }
-    Ok(arl)
+
+    Ok(WebLoginResult {
+        arl,
+        token: check_form,
+        uid,
+        access_token,
+    })
 }
 
 fn worker_base() -> Option<String> {
@@ -1378,15 +1480,15 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     }
 
     match web_login(&email, &pass).await {
-        Ok(arl) => (StatusCode::OK, Json(json!({
-            "arl":          arl,
-            "token":        null,
-            "uid":          "",
-            "access_token": null
+        Ok(res) => (StatusCode::OK, Json(json!({
+            "arl":          res.arl,
+            "token":        res.token,
+            "uid":          res.uid,
+            "access_token": res.access_token
         }))).into_response(),
         Err(e) => json_error(
             StatusCode::UNAUTHORIZED,
-            format!("login_failed; web:{e}"),
+            format!("login_failed; {e}"),
         ),
     }
 }
@@ -1763,10 +1865,15 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
             pair_store_save(&state).await;
             Html(format!("<h3>Ошибка входа</h3><pre>{}</pre>", htmlesc(&e))).into_response()
         }
-        Ok(arl) => {
+        Ok(login) => {
             let mut map = state.pair.write().await;
             if let Some(s) = map.get_mut(&code) {
-                s.arl = Some(arl);
+                s.arl = Some(login.arl);
+                s.token = Some(login.token);
+                s.access_token = Some(login.access_token);
+                if !login.uid.is_empty() {
+                    s.user_id = Some(login.uid);
+                }
                 s.email = Some(email);
                 s.error = None;
             }