Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(auth): add in original url validation to oauth2 callback (#5707)
Will Hutchinson206792583be7
diff --git a/services/authentication_service/src/api/oauth2/mod.rs b/services/authentication_service/src/api/oauth2/mod.rsindex 686e419aae..8eaf8ed2e4 100644--- a/services/authentication_service/src/api/oauth2/mod.rs+++ b/services/authentication_service/src/api/oauth2/mod.rs@@ -1,6 +1,10 @@-use crate::config::BASE_URL;+use crate::{+ api::login::sso::{is_allowed_original_url, redact_original_url_for_logging},+ config::BASE_URL,+};use axum::{Router, extract::State, routing::get};use tower_cookies::CookieManagerLayer;+use url::Url;mod account_link;mod github;@@ -8,6 +12,9 @@ mod google;mod login;mod microsoft;+#[cfg(test)]+mod test;+pub fn router() -> Router<ApiContext> {Router::new().route("/{provider}/callback",@@ -64,6 +71,30 @@ pub(in crate::api) struct PathParams {provider: String,}+#[derive(Debug)]+enum OriginalUrlValidationError {+ Invalid,+ Disallowed(Url),+}++fn validate_original_url(original_url: Option<&str>) -> Result<(), OriginalUrlValidationError> {+ let Some(original_url) = original_url else {+ return Ok(());+ };++ // OAuth state is client-visible and may be forged. Decode it exactly as the+ // redirect handlers do before validating the resulting destination.+ let decoded_url =+ urlencoding::decode(original_url).map_err(|_| OriginalUrlValidationError::Invalid)?;+ let url = Url::parse(&decoded_url).map_err(|_| OriginalUrlValidationError::Invalid)?;++ if !is_allowed_original_url(&url) {+ return Err(OriginalUrlValidationError::Disallowed(url));+ }++ Ok(())+}+/// Custom OAuth2 callback#[utoipa::path(get,@@ -101,6 +132,42 @@ pub(in crate::api) async fn handler(.into_response()})?;+ // Clean up failed Microsoft account-link callbacks before validating the+ // redirect so an invalid original_url cannot leave the pending link behind.+ if params.code.is_none()+ && provider == "microsoft"+ && let Some(link_id) = state.link_id.as_ref()+ {+ account_link::cleanup_pending_link(&ctx, link_id).await;+ }++ validate_original_url(state.original_url.as_deref()).map_err(|error| {+ match error {+ OriginalUrlValidationError::Invalid => {+ tracing::error!(+ auth_handoff_failure = "original_url_invalid",+ "original_url in oauth2 state is invalid"+ );+ }+ OriginalUrlValidationError::Disallowed(url) => {+ let redacted_url = redact_original_url_for_logging(&url);+ tracing::error!(+ auth_handoff_failure = "original_url_rejected",+ original_url = %redacted_url,+ "original_url in oauth2 state is not allowed"+ );+ }+ }++ (+ StatusCode::BAD_REQUEST,+ Json(ErrorResponse {+ message: "provided original_url is not allowed".into(),+ }),+ )+ .into_response()+ })?;+let code = match params.code {Some(c) => c,None => {@@ -110,11 +177,6 @@ pub(in crate::api) async fn handler(error_description = ?params.error_description,"oauth2 callback received without code",);- if provider == "microsoft"- && let Some(link_id) = state.link_id.as_ref()- {- account_link::cleanup_pending_link(&ctx, link_id).await;- }return Err((StatusCode::BAD_REQUEST,Json(ErrorResponse {diff --git a/services/authentication_service/src/api/oauth2/test.rs b/services/authentication_service/src/api/oauth2/test.rsnew file mode 100644index 0000000000..9a89273eee--- /dev/null+++ b/services/authentication_service/src/api/oauth2/test.rs@@ -0,0 +1,54 @@+use super::*;++#[test]+fn callback_original_url_allows_trusted_destinations() {+ for original_url in [+ "macro://login",+ "tauri://localhost/app/login",+ "http://localhost/app/login",+ "https://dev.macro.com/app/login",+ "https://macro.com/app/login",+ ] {+ assert!(+ validate_original_url(Some(original_url)).is_ok(),+ "{original_url} should be allowed"+ );+ }+}++#[test]+fn callback_original_url_rejects_untrusted_destinations() {+ for original_url in [+ "https://evil.example.com/phish",+ "https://macro.com.example.com/phish",+ "http://macro.com/phish",+ "javascript:alert('redirected')",+ ] {+ assert!(+ matches!(+ validate_original_url(Some(original_url)),+ Err(OriginalUrlValidationError::Disallowed(_))+ ),+ "{original_url} should be rejected"+ );+ }+}++#[test]+fn callback_original_url_validates_decoded_destination() {+ let encoded_url = urlencoding::encode("https://evil.example.com/phish");++ assert!(matches!(+ validate_original_url(Some(&encoded_url)),+ Err(OriginalUrlValidationError::Disallowed(_))+ ));+}++#[test]+fn callback_original_url_rejects_invalid_urls() {+ assert!(matches!(+ validate_original_url(Some("%ZZ")),+ Err(OriginalUrlValidationError::Invalid)+ ));+ assert!(validate_original_url(None).is_ok());+}