sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-09-03 13:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve URL-related OAuth code

Browse Source
This commit is contained in:
aecsocket
2026-04-14 12:35:13 +01:00
parent 64f87551ff
commit fe3aba52ab
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/labrinth/src/database/models/flow_item.rs
+3 -2
View File
@@ -10,6 +10,7 @@ use rand::distributions::Alphanumeric;
use rand_chacha::ChaCha20Rng; use rand_chacha::ChaCha20Rng;
use rand_chacha::rand_core::SeedableRng; use rand_chacha::rand_core::SeedableRng;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use url::Url;
const FLOWS_NAMESPACE: &str = "flows"; const FLOWS_NAMESPACE: &str = "flows";
@@ -18,12 +19,12 @@ const FLOWS_NAMESPACE: &str = "flows";
pub enum DBFlow { pub enum DBFlow {
OAuth { OAuth {
user_id: Option<DBUserId>, user_id: Option<DBUserId>,
url: String, url: Url,
provider: AuthProvider, provider: AuthProvider,
existing_user_id: Option<DBUserId>, existing_user_id: Option<DBUserId>,
}, },
OAuthPending { OAuthPending {
url: String, url: Url,
provider: AuthProvider, provider: AuthProvider,
user: TempUser, user: TempUser,
}, },
apps/labrinth/src/routes/internal/flows.rs
+19 -32
View File
@@ -1025,7 +1025,7 @@ impl AuthProvider {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct AuthorizationInit { pub struct AuthorizationInit {
pub url: String, pub url: Url,
#[serde(default)] #[serde(default)]
pub provider: AuthProvider, pub provider: AuthProvider,
pub token: Option<String>, pub token: Option<String>,
@@ -1041,7 +1041,7 @@ pub struct Authorization {
// Init link takes us to GitHub API and calls back to callback endpoint with a code and state // Init link takes us to GitHub API and calls back to callback endpoint with a code and state
// http://localhost:8000/auth/init?url=https://modrinth.com // http://localhost:8000/auth/init?url=https://modrinth.com
#[get("init")] #[get("/init")]
pub async fn init( pub async fn init(
req: HttpRequest, req: HttpRequest,
Query(info): Query<AuthorizationInit>, // callback url Query(info): Query<AuthorizationInit>, // callback url
@@ -1077,9 +1077,7 @@ pub async fn init(
"Starting authentication flow" "Starting authentication flow"
); );
let url = let url = info.url;
url::Url::parse(&info.url).map_err(|_| AuthenticationError::Url)?;
let domain = url.host_str().ok_or(AuthenticationError::Url)?; let domain = url.host_str().ok_or(AuthenticationError::Url)?;
if !ENV if !ENV
.ALLOWED_CALLBACK_URLS .ALLOWED_CALLBACK_URLS
@@ -1109,7 +1107,7 @@ pub async fn init(
let state = DBFlow::OAuth { let state = DBFlow::OAuth {
user_id, user_id,
url: info.url, url,
provider: info.provider, provider: info.provider,
existing_user_id, existing_user_id,
} }
@@ -1262,7 +1260,7 @@ pub async fn auth_callback(
.wrap_err("failed to clear user caches")?; .wrap_err("failed to clear user caches")?;
return Ok(HttpResponse::TemporaryRedirect() return Ok(HttpResponse::TemporaryRedirect()
.append_header(("Location", &*url)) .append_header(("Location", url.as_str()))
.json(serde_json::json!({ "url": url }))); .json(serde_json::json!({ "url": url })));
} }
@@ -1297,7 +1295,7 @@ pub async fn auth_callback(
.await?; .await?;
Ok(HttpResponse::TemporaryRedirect() Ok(HttpResponse::TemporaryRedirect()
.append_header(("Location", &*url)) .append_header(("Location", url.as_str()))
.json(serde_json::json!({ "url": url }))) .json(serde_json::json!({ "url": url })))
} else if let Some(user_id) = user_id_opt { } else if let Some(user_id) = user_id_opt {
let user = crate::database::models::DBUser::get_id( let user = crate::database::models::DBUser::get_id(
@@ -1311,15 +1309,14 @@ pub async fn auth_callback(
.insert(Duration::minutes(30), &redis) .insert(Duration::minutes(30), &redis)
.await?; .await?;
let redirect_url = format!( let mut redirect_url = url.clone();
"{}{}error=2fa_required&flow={}", redirect_url
url, .query_pairs_mut()
if url.contains('?') { "&" } else { "?" }, .append_pair("error", "2fa_required")
flow .append_pair("flow", &flow);
);
Ok(HttpResponse::TemporaryRedirect() Ok(HttpResponse::TemporaryRedirect()
.append_header((LOCATION, &*redirect_url)) .append_header((LOCATION, redirect_url.as_str()))
.json(serde_json::json!({ "url": redirect_url }))) .json(serde_json::json!({ "url": redirect_url })))
} else { } else {
let session = let session =
@@ -1327,20 +1324,13 @@ pub async fn auth_callback(
.await?; .await?;
transaction.commit().await?; transaction.commit().await?;
let redirect_url = format!( let mut redirect_url = url.clone();
"{}{}code={}{}", redirect_url
url, .query_pairs_mut()
if url.contains('?') { '&' } else { '?' }, .append_pair("code", &session.session);
session.session,
if user_id_opt.is_none() {
"&new_account=true"
} else {
""
}
);
Ok(HttpResponse::TemporaryRedirect() Ok(HttpResponse::TemporaryRedirect()
.append_header((LOCATION, &*redirect_url)) .append_header((LOCATION, redirect_url.as_str()))
.json(serde_json::json!({ "url": redirect_url }))) .json(serde_json::json!({ "url": redirect_url })))
} }
} else { } else {
@@ -1443,13 +1433,10 @@ async fn create_oauth_account(
let session = issue_session(req, user_id, &mut txn, &redis, None).await?; let session = issue_session(req, user_id, &mut txn, &redis, None).await?;
txn.commit().await?; txn.commit().await?;
let mut redirect_url = url let mut redirect_url = url.clone();
.parse::<Url>()
.wrap_internal_err("invalid redirect URL")?;
redirect_url redirect_url
.query_pairs_mut() .query_pairs_mut()
.append_pair("code", &session.session) .append_pair("code", &session.session);
.append_pair("new_account", "true");
let redirect_url = redirect_url.to_string(); let redirect_url = redirect_url.to_string();
Ok(Redirect::to(redirect_url)) Ok(Redirect::to(redirect_url))