feat: Authentication (Waiting for approval for MSA Application)
This commit is contained in:
LynithDev
parent
c54bb6e6cb
commit
9573df0f91
2 changed files with 227 additions and 58 deletions
|
|
@ -1,87 +1,236 @@
|
|||
use core::hash;
|
||||
use std::{error::Error, sync::mpsc};
|
||||
use std::{error::Error, io::{Read, Write}, net::{SocketAddr, TcpListener, TcpStream}};
|
||||
|
||||
use serde_json::json;
|
||||
use tauri::{http::request, AppHandle, Runtime, Url};
|
||||
use tauri_plugin_http::reqwest::{Client, ClientBuilder, Request};
|
||||
use tauri::{AppHandle, Manager, Runtime};
|
||||
use tauri_plugin_http::reqwest::Client;
|
||||
use tauri_plugin_shell::ShellExt;
|
||||
|
||||
use super::{Account, AuthenticationMethod};
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn login_msa<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<Account, String> {
|
||||
match MicrosoftAuthenticationMethod::auth(&app).await {
|
||||
match MicrosoftAuthenticationMethod::auth(&app, |status, stage| {
|
||||
let _ = app.emit("msa:status", Some((status, stage)));
|
||||
}).await {
|
||||
Ok(account) => Ok(account),
|
||||
Err(err) => Err(err.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
// Uses the official Minecraft launcher Azure client id
|
||||
pub const OAUTH_URL: &str = "https://login.live.com/oauth20_authorize.srf?client_id=00000000402b5328&response_type=code&redirect_uri=https://login.live.com/oauth20_desktop.srf&scope=XboxLive.signin%20offline_access";
|
||||
pub struct MicrosoftAuthenticationMethod;
|
||||
const CLIENT_ID: &str = "9419b7ee-1448-4d1b-b52a-550d8f36ab56";
|
||||
|
||||
struct MicrosoftAuthenticationMethod;
|
||||
impl AuthenticationMethod for MicrosoftAuthenticationMethod {
|
||||
async fn auth<R: Runtime>(handle: &AppHandle<R>) -> Result<Account, Box<dyn Error>> {
|
||||
let code: String = controlled_webview(handle).await?;
|
||||
if code.is_empty() {
|
||||
return Err("No code received".into());
|
||||
}
|
||||
async fn auth<R: Runtime, F>(handle: &AppHandle<R>, stage: F) -> Result<Account, Box<dyn Error>>
|
||||
where F: Fn(String, u8) -> () {
|
||||
|
||||
stage("Authenticating with Microsoft".into(), 0);
|
||||
let msa_code: String = msa_code(handle).await?;
|
||||
|
||||
let (xbl_token, hash) = auth_xbl(code).await?;
|
||||
stage("Authenticating with Microsoft".into(), 1);
|
||||
let msa_token: String = msa_code_to_token(msa_code).await?;
|
||||
|
||||
Err("".into())
|
||||
stage("Authenticating with Xbox Live".into(), 2);
|
||||
let (xbl_token, user_hash): (String, String) = auth_xbl(msa_token).await?;
|
||||
|
||||
stage("Retrieving XSTS token".into(), 3);
|
||||
let xsts_token: String = auth_xsts(xbl_token).await?;
|
||||
|
||||
stage("Authenticating with Minecraft".into(), 4);
|
||||
let access_token: String = auth_minecraft(xsts_token, user_hash).await?;
|
||||
|
||||
stage("Retrieving Minecraft profile".into(), 5);
|
||||
let account: Account = Self::get_profile(access_token).await?;
|
||||
|
||||
Ok(account)
|
||||
}
|
||||
}
|
||||
|
||||
async fn auth_minecraft(xsts_token: String, user_hash: String) -> Result<String, Box<dyn Error>> {
|
||||
let response = Client::new()
|
||||
.post("https://api.minecraftservices.com/authentication/login_with_xbox")
|
||||
.json(&json!({
|
||||
"identityToken": format!("XBL3.0 x={};{}", user_hash, xsts_token)
|
||||
}))
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let response = response.json::<serde_json::Value>().await?;
|
||||
let access_token = match response.get("access_token") {
|
||||
Some(token) => token.as_str().unwrap(),
|
||||
None => return Err("Failed to get Minecraft access token".into())
|
||||
};
|
||||
|
||||
Ok(access_token.to_string())
|
||||
}
|
||||
|
||||
async fn auth_xsts(token: String) -> Result<String, Box<dyn Error>> {
|
||||
let response = Client::new()
|
||||
.post("https://xsts.auth.xboxlive.com/xsts/authorize")
|
||||
.json(&json!({
|
||||
"Properties": {
|
||||
"SandboxId": "RETAIL",
|
||||
"UserTokens": [
|
||||
token
|
||||
]
|
||||
},
|
||||
"RelyingParty": "rp://api.minecraftservices.com/",
|
||||
"TokenType": "JWT"
|
||||
}))
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
if response.status().as_u16() == 401 {
|
||||
// 2148916233: The account doesn't have an Xbox account. Once they sign up for one (or login through minecraft.net to create one) then they can proceed with the login. This shouldn't happen with accounts that have purchased Minecraft with a Microsoft account, as they would've already gone through that Xbox signup process.
|
||||
// 2148916235: The account is from a country where Xbox Live is not available/banned
|
||||
// 2148916236: The account needs adult verification on Xbox page. (South Korea)
|
||||
// 2148916237: The account needs adult verification on Xbox page. (South Korea)
|
||||
// 2148916238: The account is a child (under 18) and cannot proceed unless the account is added to a Family by an adult. This only seems to occur when using a custom Microsoft Azure application. When using the Minecraft launchers client id, this doesn't trigger.
|
||||
// TODO: Handle these errors
|
||||
|
||||
let error_code = response.json::<serde_json::Value>().await?["XErr"].as_u64().unwrap();
|
||||
return Err(format!("Failed to authenticate with Xbox Live. Code: {}", error_code).into());
|
||||
}
|
||||
|
||||
let response = response.json::<serde_json::Value>().await?;
|
||||
let xsts_token = match response.get("Token") {
|
||||
Some(token) => token.as_str().unwrap(),
|
||||
None => return Err("Failed to get XSTS token".into())
|
||||
};
|
||||
|
||||
Ok(xsts_token.to_string())
|
||||
}
|
||||
|
||||
async fn auth_xbl(code: String) -> Result<(String, String), Box<dyn Error>> {
|
||||
let response = Client::new()
|
||||
.post("https://user.auth.xboxlive.com/user/authenticate")
|
||||
.json(&json!({
|
||||
"Properties": {
|
||||
"AuthMethod": "RPS",
|
||||
"SiteName": "user.auth.xboxlive.com",
|
||||
"RpsTicket": &format!("d={}", code)
|
||||
},
|
||||
"RelyingParty": "http://auth.xboxlive.com",
|
||||
"TokenType": "JWT"
|
||||
}))
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let json = &json!({
|
||||
"Properties": {
|
||||
"AuthMethod": "RPS",
|
||||
"SiteName": "user.auth.xboxlive.com",
|
||||
"RpsTicket": format!("d={}", code)
|
||||
},
|
||||
"RelyingParty": "http://auth.xboxlive.com",
|
||||
"TokenType": "JWT"
|
||||
});
|
||||
let response = response.json::<serde_json::Value>().await?;
|
||||
let xbl_token = match response.get("Token") {
|
||||
Some(token) => token.as_str().unwrap(),
|
||||
None => return Err("Failed to get XBL token".into())
|
||||
};
|
||||
|
||||
println!("{:?}", json.as_str());
|
||||
let user_hash = match response.get("DisplayClaims").and_then(|claims| claims.get("xui").and_then(|xui| xui.get(0).and_then(|xui| xui.get("uhs")))) {
|
||||
Some(hash) => hash.as_str().unwrap(),
|
||||
None => return Err("Failed to get user hash".into())
|
||||
};
|
||||
|
||||
// figure out why it returns 400: Bad Request
|
||||
let response = Client::new().post("https://user.auth.xboxlive.com/user/authenticate")
|
||||
.header("Accept", "application/json")
|
||||
.header("Content-Type", "application/json")
|
||||
.json(json).send().await?;
|
||||
|
||||
println!("{:#?}", response);
|
||||
|
||||
Ok(("".into(), "".into()))
|
||||
Ok((xbl_token.to_string(), user_hash.to_string()))
|
||||
}
|
||||
|
||||
async fn controlled_webview<R: tauri::Runtime>(handle: &AppHandle<R>) -> Result<String, Box<dyn Error>> {
|
||||
let (sender, receiver) = mpsc::channel();
|
||||
async fn msa_code_to_token(code: String) -> Result<String, Box<dyn Error>> {
|
||||
let token = Client::new()
|
||||
.post("https://login.live.com/oauth20_token.srf")
|
||||
.form(&[
|
||||
("client_id", CLIENT_ID),
|
||||
("redirect_uri", &format!("http://localhost:{}/", PORT)),
|
||||
("code", &code),
|
||||
("grant_type", "authorization_code")
|
||||
])
|
||||
.send()
|
||||
.await?
|
||||
.json::<serde_json::Value>()
|
||||
.await?;
|
||||
|
||||
let window = tauri::WebviewWindowBuilder::new(handle, "microsoft_login", tauri::WebviewUrl::External(Url::parse(OAUTH_URL)?))
|
||||
.center()
|
||||
.enable_clipboard_access()
|
||||
.focused(true)
|
||||
.title("Login to Microsoft")
|
||||
.resizable(false)
|
||||
.inner_size(450.0, 650.0)
|
||||
.on_navigation(move |url: &Url| {
|
||||
if url.to_string().starts_with("https://login.live.com/oauth20_desktop.srf") {
|
||||
let pair = url.query_pairs().find(|search| search.0 == "code");
|
||||
Ok(token["access_token"].as_str().unwrap().to_string())
|
||||
}
|
||||
|
||||
let _ = match pair {
|
||||
Some(pair) => sender.send(pair.1.to_string()),
|
||||
None => sender.send("".to_string())
|
||||
};
|
||||
const PORT: u16 = 13523;
|
||||
async fn msa_code<R: Runtime>(handle: &AppHandle<R>) -> Result<String, Box<dyn Error>> {
|
||||
let url = format!(
|
||||
"https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize?client_id={}&response_type=code&redirect_uri=http://localhost:{}/&response_mode=query&scope=XboxLive.signin%20offline_access&prompt=consent",
|
||||
CLIENT_ID,
|
||||
PORT
|
||||
);
|
||||
|
||||
handle.shell().open(url, None)?;
|
||||
|
||||
let mut token: String = String::new();
|
||||
|
||||
let listener = TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], PORT)))?;
|
||||
println!("Started local server for MSA on port {}", PORT);
|
||||
|
||||
for conn in listener.incoming() {
|
||||
match conn {
|
||||
Err(err) => return Err(err.into()),
|
||||
Ok(stream) => {
|
||||
if let Some(code) = handle_connection(stream) {
|
||||
token = code;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
})
|
||||
.build()?;
|
||||
|
||||
let result = receiver.recv();
|
||||
window.close()?;
|
||||
Ok(result?)
|
||||
Ok(token)
|
||||
}
|
||||
|
||||
fn handle_connection(mut stream: TcpStream) -> Option<String> {
|
||||
let mut buffer = [0; 512];
|
||||
if let Err(err) = stream.read(&mut buffer) {
|
||||
eprintln!("Failed to read from stream: {}", err);
|
||||
return None;
|
||||
}
|
||||
|
||||
let request = String::from_utf8_lossy(&buffer[..]);
|
||||
let url = request.split_whitespace().nth(1)?;
|
||||
let code = url.split('?').nth(1)?.split('&').find(|s| s.starts_with("code="))?.split_once('=').unwrap().1;
|
||||
|
||||
let response = r"
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Microsoft Authentication</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
|
||||
}
|
||||
|
||||
div {
|
||||
position: absolute;
|
||||
top: 45%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
text-align: center;
|
||||
opacity: 0;
|
||||
animation: fade-in 0.5s ease-in-out 0.5s forwards;
|
||||
}
|
||||
|
||||
@keyframes fade-in {
|
||||
0% { opacity: 0; }
|
||||
100% { opacity: 1; }
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<h1>Microsoft Authentication</h1>
|
||||
<p>Authentication successful. You can close this window now.</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
";
|
||||
|
||||
stream.write_all(
|
||||
format!(
|
||||
"HTTP/1.1 200 OK\r\nContent-Length: {}\r\n\r\n{}",
|
||||
response.len(),
|
||||
response
|
||||
)
|
||||
.as_bytes(),
|
||||
).unwrap();
|
||||
|
||||
Some(code.to_string())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ use std::error::Error;
|
|||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tauri::{plugin::TauriPlugin, AppHandle, Runtime};
|
||||
use tauri_plugin_http::reqwest::Client;
|
||||
|
||||
mod microsoft_auth;
|
||||
|
||||
|
|
@ -21,7 +22,26 @@ pub struct AccountSkin {
|
|||
}
|
||||
|
||||
pub trait AuthenticationMethod {
|
||||
async fn auth<R: Runtime>(handle: &AppHandle<R>) -> Result<Account, Box<dyn Error>>;
|
||||
/// Authenticate with a given method. Stage is a function that takes a string and a u8.
|
||||
/// The string is the message to display to the user, and the u8 is the progress of the authentication.
|
||||
async fn auth<R: Runtime, F>(handle: &AppHandle<R>, stage: F) -> Result<Account, Box<dyn Error>>
|
||||
where F: Fn(String, u8) -> ();
|
||||
|
||||
async fn get_profile(access_token: String) -> Result<Account, Box<dyn Error>> {
|
||||
let response = Client::new()
|
||||
.get("https://api.minecraftservices.com/minecraft/profile")
|
||||
.header("Authorization", format!("Bearer {}", access_token))
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let response = response.json::<serde_json::Value>().await?;
|
||||
if let Some(error) = response.get("error") {
|
||||
return Err(error.to_string().into());
|
||||
}
|
||||
|
||||
let account = serde_json::from_value::<Account>(response)?;
|
||||
Ok(account)
|
||||
}
|
||||
}
|
||||
|
||||
// Plugin for MSA
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue