Skip to content

feat(auth): record whether a user credential is a Macro API JWT #8535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
404Wolf merged 1 commit into from
Oct 27, 2026
Merged

feat(auth): record whether a user credential is a Macro API JWT #8535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions crates/agent_harness/src/inbound/repositories/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ impl MacroAuthorizationService for TestAuthorizationService {
})
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}

async fn authorize_internal(
&self,
_provided_key: &str,
Expand Down
21 changes: 14 additions & 7 deletions crates/agent_harness/src/inbound/runtime_gateway/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@ const HARNESS_TOKEN: &str = "mhns_self_test";
struct FakeJwtValidator;

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
Ok(ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
},
})
}
}
Expand Down Expand Up @@ -57,6 +63,7 @@ impl HarnessAuthorizer for SelfHarnessAuthorizer {
user_id: user_id.clone(),
},
acting_user: MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Harness,
agent_id: None,
macro_user_id,
user_context: model_user::UserContext {
Expand Down
22 changes: 15 additions & 7 deletions crates/agent_session/src/inbound/axum_router/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,19 @@ const TEAM_ID: Uuid = Uuid::from_u128(0x7EA3);
struct FakeJwtValidator;

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
Ok(ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
},
})
}
}
Expand All @@ -128,6 +134,7 @@ impl BotAuthorizer for SelfBotAuthorizer {
let macro_user_id = MacroUserIdStr::try_from(user_id.clone())
.map_err(|_| Report::new(MacroAuthorizationError::ActingUserNotAuthorized))?;
Some(MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Bot,
agent_id: None,
macro_user_id,
user_context: model_user::UserContext {
Expand Down Expand Up @@ -175,6 +182,7 @@ impl HarnessAuthorizer for SelfHarnessAuthorizer {
user_id: user_id.clone(),
},
acting_user: MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Harness,
agent_id: None,
macro_user_id,
user_context: model_user::UserContext {
Expand Down
20 changes: 13 additions & 7 deletions crates/agent_session/src/inbound/coding_agents/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ const KEY: &str = "coding-test-internal-key";
struct UserCredentials;

impl JwtValidator for UserCredentials {
fn validate(&self, _: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
Ok(ValidatedIdentity {
agent_id: None,
user_id: USER.into(),
fusion_user_id: "fusion-owner".into(),
organization_id: None,
permissions: None,
fn validate_credential(
&self,
_: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: USER.into(),
fusion_user_id: "fusion-owner".into(),
organization_id: None,
permissions: None,
},
})
}
}
Expand Down
21 changes: 14 additions & 7 deletions crates/agent_session/src/inbound/routine_sessions/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,19 @@ const OPERATIONS: [&str; 5] = ["validate", "prepare", "prompt", "status", "cance
struct Credentials;

impl JwtValidator for Credentials {
fn validate(&self, _: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
Ok(ValidatedIdentity {
agent_id: None,
user_id: OWNER.into(),
fusion_user_id: "fusion-owner".into(),
organization_id: None,
permissions: None,
fn validate_credential(
&self,
_: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: OWNER.into(),
fusion_user_id: "fusion-owner".into(),
organization_id: None,
permissions: None,
},
})
}
}
Expand Down Expand Up @@ -66,6 +72,7 @@ impl HarnessAuthorizer for Credentials {
user_id: OWNER.into(),
},
acting_user: MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Harness,
agent_id: None,
macro_user_id: MacroUserIdStr::try_from(OWNER).unwrap(),
user_context: model_user::UserContext {
Expand Down
9 changes: 9 additions & 0 deletions crates/ai_projections/src/inbound/axum_router/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ impl MacroAuthorizationService for FakeAuthorizationService {
Ok(test_user_context())
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}

async fn authorize_internal(
&self,
_provided_key: &str,
Expand Down
9 changes: 9 additions & 0 deletions crates/ai_tools/src/test/booking_links.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ impl MacroAuthorizationService for NoAuth {
async fn authorize(&self, _: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
Err(Report::new(MacroAuthorizationError::InvalidCredentials))
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}
async fn authorize_internal(
&self,
_: &str,
Expand Down
20 changes: 13 additions & 7 deletions crates/bots/src/inbound/axum_router/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,17 +419,23 @@ impl EntityAccessService for TestAccessService {
struct FakeJwtValidator;

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
if jwt == INVALID_BEARER_TOKEN {
return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
}

Ok(ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
},
})
}
}
Expand Down
21 changes: 14 additions & 7 deletions crates/bots/src/inbound/channel_webhook_router/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,13 +733,19 @@ impl BotAuthorizer for TestBotAuthorizer {
struct FakeJwtValidator;

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
Ok(ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: jwt.to_string(),
fusion_user_id: "fusion-user".to_string(),
organization_id: None,
permissions: None,
},
})
}
}
Expand Down Expand Up @@ -823,6 +829,7 @@ fn bot_authentication_with_acting_user(bot_id: BotId) -> BotAuthentication {
bot_scope: BotScope::User,
team_id: None,
acting_user: Some(MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Bot,
agent_id: None,
macro_user_id: MacroUserIdStr::parse_from_str("macro|acting-bot@example.com").unwrap(),
user_context: Default::default(),
Expand Down
9 changes: 9 additions & 0 deletions crates/calendar_scheduling/src/domain/service/test/http_administration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ impl MacroAuthorizationService for Identity {
async fn authorize(&self, _: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
Err(Report::new(MacroAuthorizationError::InvalidCredentials))
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}
async fn authorize_internal(
&self,
key: &str,
Expand Down
9 changes: 9 additions & 0 deletions crates/calendar_scheduling/src/inbound/router/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ impl MacroAuthorizationService for Identity {
..Default::default()
})
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}
async fn authorize_internal(
&self,
_: &str,
Expand Down
20 changes: 13 additions & 7 deletions crates/channels/src/inbound/axum_router/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,10 @@ impl FakeJwtValidator {
}

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.validation_count.fetch_add(1, Ordering::SeqCst);

let organization_id = match jwt {
Expand All @@ -716,12 +719,15 @@ impl JwtValidator for FakeJwtValidator {
_ => return Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
};

Ok(ValidatedIdentity {
agent_id: None,
user_id: TEST_USER_ID.to_string(),
fusion_user_id: "test-fusion-user".to_string(),
organization_id,
permissions: None,
Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: TEST_USER_ID.to_string(),
fusion_user_id: "test-fusion-user".to_string(),
organization_id,
permissions: None,
},
})
}
}
Expand Down
20 changes: 13 additions & 7 deletions crates/channels/src/inbound/list_router/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,20 @@ impl ChannelListService for FakeChannelListService {
struct FakeJwtValidator;

impl JwtValidator for FakeJwtValidator {
fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {
fn validate_credential(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
match jwt {
VALID_BEARER_TOKEN => Ok(ValidatedIdentity {
agent_id: None,
user_id: BEARER_USER_ID.to_string(),
fusion_user_id: "fusion-user-id".to_string(),
organization_id: None,
permissions: None,
VALID_BEARER_TOKEN => Ok(macro_authorization::ValidatedCredential {
origin: macro_authorization::CredentialOrigin::Session,
identity: ValidatedIdentity {
agent_id: None,
user_id: BEARER_USER_ID.to_string(),
fusion_user_id: "fusion-user-id".to_string(),
organization_id: None,
permissions: None,
},
}),
EXPIRED_BEARER_TOKEN => Err(Report::new(MacroAuthorizationError::CredentialsExpired)),
_ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
Expand Down
13 changes: 13 additions & 0 deletions crates/chat/src/inbound/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,18 @@ impl MacroAuthorizationService for FakeAuthorizationService {
})
}

async fn authorize_identity(
&self,
jwt: &str,
) -> std::result::Result<
macro_authorization::ValidatedCredential,
Report<MacroAuthorizationError>,
> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}

async fn authorize_internal(
&self,
_provided_key: &str,
Expand All @@ -543,6 +555,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {
acting_user: acting_user
.and_then(|claims| claims.user_id)
.map(|user_id| MacroUserAuthentication {
origin: macro_authorization::CredentialOrigin::Bot,
agent_id: None,
macro_user_id: MacroUserIdStr::try_from(user_id.clone())
.expect("test user id should be valid"),
Expand Down
9 changes: 9 additions & 0 deletions crates/complete_graph/src/schema/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,15 @@ impl MacroAuthorizationService for FakeAuthorizationService {
}
}

async fn authorize_identity(
&self,
jwt: &str,
) -> Result<macro_authorization::ValidatedCredential, Report<MacroAuthorizationError>> {
self.authorize(jwt)
.await
.map(macro_authorization::ValidatedCredential::session)
}

async fn authorize_internal(
&self,
provided_key: &str,
Expand Down
Loading
Loading