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
feat(contacts): use macro authorization contacts (#4879)
Will Hutchinsonbd4dbd6ff14d
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.jsonindex fa9e6370bb..c103d06fc4 100644--- a/.github/workspace-dep-closures.json+++ b/.github/workspace-dep-closures.json@@ -487,17 +487,14 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -510,14 +507,11 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -530,7 +524,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"cache-core": [@@ -586,18 +579,15 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -610,14 +600,11 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -630,7 +617,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"call_recording_preview_handler": [@@ -776,17 +762,14 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -799,14 +782,11 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -819,7 +799,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"chat": [@@ -881,17 +860,14 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -904,14 +880,11 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -924,7 +897,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"complete_graph": [@@ -961,18 +933,15 @@"crates/graphql_properties","crates/graphql_soup","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -985,16 +954,13 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_grouping",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -1009,7 +975,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"connection": [@@ -1108,43 +1073,18 @@"crates/workspace-hack"],"contacts": [- "crates/agent",- "crates/ai_toolset",- "crates/ai_usage",- "crates/attachment","crates/contacts","crates/cowlike",- "crates/decode_jwt",- "crates/document_sub_type",- "crates/entity_access_db_utils",- "crates/ip_extractor","crates/macro_auth",- "crates/macro_db_client",+ "crates/macro_authorization","crates/macro_env","crates/macro_env_var",- "crates/macro_middleware","crates/macro_user_id",- "crates/macro_uuid",- "crates/model",- "crates/model-entity","crates/model-error-response",- "crates/model_file_type","crates/model_user",- "crates/models_bulk_upload",- "crates/models_dcs",- "crates/models_entity_access_management",- "crates/models_opensearch",- "crates/models_pagination",- "crates/models_permissions",- "crates/models_properties",- "crates/models_team",- "crates/non_empty",- "crates/prompt","crates/rate_limit","crates/remote_env_var","crates/sqs_worker",- "crates/system_properties",- "crates/user_quota","crates/workspace-hack"],"contacts_service": [@@ -1160,6 +1100,7 @@"crates/entity_access_db_utils","crates/ip_extractor","crates/macro_auth",+ "crates/macro_authorization","crates/macro_aws_config","crates/macro_config","crates/macro_config_derive",@@ -2852,18 +2793,15 @@"crates/graphql_common","crates/graphql_soup","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -2876,16 +2814,13 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_grouping",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -2900,7 +2835,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"image_optimizer": [@@ -3027,19 +2961,16 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -3052,7 +2983,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -3062,7 +2992,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -3077,7 +3006,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"lexical_mention_extractor": [@@ -3107,7 +3035,6 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -3115,12 +3042,10 @@"crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -3133,7 +3058,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -3143,7 +3067,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -3158,7 +3081,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"load-test": [@@ -3844,18 +3766,15 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -3868,7 +3787,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -3878,7 +3796,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -3893,7 +3810,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"models_search_cursor": [@@ -3931,18 +3847,15 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -3955,15 +3868,12 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -3976,7 +3886,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"models_team": [@@ -4736,18 +4645,15 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -4760,7 +4666,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -4770,7 +4675,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -4786,7 +4690,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"search_upload_handler": [@@ -4886,7 +4789,6 @@"crates/frecency","crates/fusionauth","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth",@@ -4898,7 +4800,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -4996,18 +4897,15 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -5020,16 +4918,13 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_grouping",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions","crates/models_properties","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/prompt",@@ -5044,7 +4939,6 @@"crates/sqs_worker","crates/system_properties","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"sqs_client": [diff --git a/Cargo.lock b/Cargo.lockindex caaffcfada..54f63b8bdf 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -3089,13 +3089,10 @@ dependencies = ["axum","axum-extra","http-body-util",- "macro_auth",+ "macro_authorization","macro_db_migrator",- "macro_middleware","macro_user_id",- "model_user","rate_limit",- "redis","reqwest 0.13.4","rootcause","serde",@@ -3122,6 +3119,7 @@ dependencies = ["doppler-config","http-body-util","macro_auth",+ "macro_authorization","macro_aws_config","macro_config","macro_cors",diff --git a/crates/contacts/Cargo.toml b/crates/contacts/Cargo.tomlindex 2cda60f183..231e360040 100644--- a/crates/contacts/Cargo.toml+++ b/crates/contacts/Cargo.toml@@ -8,11 +8,8 @@ version = "0.1.0"axum = ["dep:axum","dep:axum-extra",- "dep:macro_auth",- "dep:macro_middleware",- "dep:model_user",+ "dep:macro_authorization","dep:rate_limit",- "dep:redis","dep:utoipa",]default = ["axum", "inbound", "outbound", "ports"]@@ -25,15 +22,12 @@ aws-sdk-sqs = { workspace = true, optional = true }axum = { workspace = true, optional = true }axum-extra = { workspace = true, optional = true }reqwest = { workspace = true, optional = true }-macro_auth = { path = "../macro_auth", optional = true }-macro_middleware = { path = "../macro_middleware", default-features = false, features = [- "auth",+macro_authorization = { path = "../macro_authorization", default-features = false, features = [+ "axum",], optional = true }macro_user_id = { path = "../macro_user_id" }rootcause = { workspace = true }-model_user = { path = "../model_user", features = ["axum"], optional = true }rate_limit = { path = "../rate_limit", features = ["axum"], optional = true }-redis = { workspace = true, optional = true }serde = { workspace = true }serde_json = { workspace = true }sqlx = { workspace = true, optional = true }@@ -46,6 +40,5 @@ workspace-hack = { version = "0.1", path = "../workspace-hack" }[dev-dependencies]macro_db_migrator = { path = "../macro_db_migrator" }http-body-util = { workspace = true }-macro_auth = { path = "../macro_auth", features = ["testing"] }rate_limit = { path = "../rate_limit", features = ["axum", "testing"] }tower = { workspace = true }diff --git a/crates/contacts/src/inbound/http.rs b/crates/contacts/src/inbound/http.rsindex 78ed230123..430139cf12 100644--- a/crates/contacts/src/inbound/http.rs+++ b/crates/contacts/src/inbound/http.rs@@ -1,15 +1,19 @@use crate::domain::models::messages::ContactsNodes;use crate::domain::ports::ContactsService;-use axum::extract::{FromRequestParts, Json, State};+use axum::extract::{FromRef, FromRequestParts, Json, State};use axum::http::StatusCode;use axum::response::IntoResponse;use axum::routing::get;use axum::{RequestPartsExt, Router};use axum_extra::extract::Cached;+use macro_authorization::{+ MacroAuthorizationExtractor, MacroAuthorizationService, MacroAuthorizationState,+};use macro_user_id::user_id::MacroUserIdStr;-use model_user::axum_extractor::MacroUserExtractor;+use rate_limit::domain::models::RateLimitOk;use rate_limit::inbound::{RateLimitExtractable, rate_limit_middleware};-use rate_limit::{RateLimitConfig, RateLimitKey, RateLimitService};+use rate_limit::{RateLimitConfig, RateLimitKey, RateLimitResult, RateLimitService};+use rootcause::Report;use serde::{Deserialize, Serialize};use std::collections::HashSet;use std::sync::Arc;@@ -44,12 +48,12 @@ pub struct AddContactRequest {(status = 404, body=String),(status = 500, body=String)))]-#[instrument(skip(macro_user_id, contacts), fields(user_id = macro_user_id.as_ref()))]-pub async fn handler<S: ContactsService>(+#[instrument(skip(authorization, contacts), fields(user_id = authorization.macro_user_id.as_ref()))]+pub async fn handler<S: ContactsService, Auth: MacroAuthorizationService>(State(contacts): State<Arc<S>>,- MacroUserExtractor { macro_user_id, .. }: MacroUserExtractor,+ authorization: MacroAuthorizationExtractor<Auth>,) -> impl IntoResponse {- match contacts.query_contacts(macro_user_id).await {+ match contacts.query_contacts(authorization.macro_user_id).await {Ok(contacts) if !contacts.is_empty() => {(StatusCode::OK, Json(Some(GetContactsResponse { contacts })))}@@ -69,15 +73,15 @@ pub async fn handler<S: ContactsService>((status = 401, body=String),(status = 500, body=String)))]-#[instrument(skip(service, macro_user_id), err)]-pub async fn add_contact_handler<S: ContactsService>(+#[instrument(skip(service, authorization), fields(user_id = authorization.macro_user_id.as_ref()), err)]+pub async fn add_contact_handler<S: ContactsService, Auth: MacroAuthorizationService>(State(service): State<Arc<S>>,- MacroUserExtractor { macro_user_id, .. }: MacroUserExtractor,+ Cached(authorization): Cached<MacroAuthorizationExtractor<Auth>>,Json(body): Json<AddContactRequest>,) -> Result<StatusCode, StatusCode> {service.add_contact_nodes(ContactsNodes {- users: HashSet::from([macro_user_id, body.user_id]),+ users: HashSet::from([authorization.macro_user_id, body.user_id]),}).await.map_err(|e| {@@ -88,11 +92,13 @@ pub async fn add_contact_handler<S: ContactsService>(}/// Rate limit for adding contacts: 50 requests per user per hour.-pub struct PerUserAddContactRateLimit(MacroUserExtractor);+pub struct PerUserAddContactRateLimit<Auth>(MacroAuthorizationExtractor<Auth>);-impl<S> RateLimitExtractable<S> for PerUserAddContactRateLimit+impl<S, Auth> RateLimitExtractable<S> for PerUserAddContactRateLimit<Auth>where- S: Send + Sync,+ S: Send + Sync + 'static,+ Auth: MacroAuthorizationService,+ MacroAuthorizationState<Auth>: FromRef<S>,{fn config() -> RateLimitConfig {RateLimitConfig {@@ -108,58 +114,124 @@ where}}-impl<S> FromRequestParts<S> for PerUserAddContactRateLimit+impl<S, Auth> FromRequestParts<S> for PerUserAddContactRateLimit<Auth>where- S: Send + Sync,+ S: Send + Sync + 'static,+ Auth: MacroAuthorizationService,+ MacroAuthorizationState<Auth>: FromRef<S>,{- type Rejection = <MacroUserExtractor as FromRequestParts<S>>::Rejection;+ type Rejection = macro_authorization::MacroAuthorizationRejection;async fn from_request_parts(parts: &mut axum::http::request::Parts,state: &S,) -> Result<Self, Self::Rejection> {- let Cached(user): Cached<MacroUserExtractor> = parts.extract_with_state(state).await?;- Ok(Self(user))+ let Cached(authorization): Cached<MacroAuthorizationExtractor<Auth>> =+ parts.extract_with_state(state).await?;+ Ok(Self(authorization))}}-/// Builds the contacts API router with rate limiting applied to POST.-pub fn contacts_router<R: RateLimitService + Clone, S: ContactsService>(- rate_limiter: R,-) -> Router<Arc<S>> {+/// State required by the contacts HTTP router.+pub struct ContactsRouterState<S, R, Auth> {+ /// The contacts service implementation.+ pub contacts_service: Arc<S>,+ /// The rate-limit service implementation.+ pub rate_limit_service: R,+ /// State for request authorization.+ pub authorization_state: MacroAuthorizationState<Auth>,+}++impl<S, R: Clone, Auth> Clone for ContactsRouterState<S, R, Auth> {+ fn clone(&self) -> Self {+ Self {+ contacts_service: self.contacts_service.clone(),+ rate_limit_service: self.rate_limit_service.clone(),+ authorization_state: self.authorization_state.clone(),+ }+ }+}++impl<S, R, Auth> FromRef<ContactsRouterState<S, R, Auth>> for Arc<S> {+ fn from_ref(state: &ContactsRouterState<S, R, Auth>) -> Self {+ state.contacts_service.clone()+ }+}++impl<S, R, Auth> FromRef<ContactsRouterState<S, R, Auth>> for MacroAuthorizationState<Auth> {+ fn from_ref(state: &ContactsRouterState<S, R, Auth>) -> Self {+ state.authorization_state.clone()+ }+}++struct AddContactRateLimitState<R, Auth> {+ rate_limit_service: R,+ authorization_state: MacroAuthorizationState<Auth>,+}++impl<R: Clone, Auth> Clone for AddContactRateLimitState<R, Auth> {+ fn clone(&self) -> Self {+ Self {+ rate_limit_service: self.rate_limit_service.clone(),+ authorization_state: self.authorization_state.clone(),+ }+ }+}++impl<R, Auth> FromRef<AddContactRateLimitState<R, Auth>> for MacroAuthorizationState<Auth> {+ fn from_ref(state: &AddContactRateLimitState<R, Auth>) -> Self {+ state.authorization_state.clone()+ }+}++impl<R, Auth> RateLimitService for AddContactRateLimitState<R, Auth>+where+ R: RateLimitService,+ Auth: MacroAuthorizationService,+{+ async fn check_rate_limit(+ &self,+ key: RateLimitKey,+ config: RateLimitConfig,+ ) -> Result<RateLimitResult, Report> {+ self.rate_limit_service.check_rate_limit(key, config).await+ }++ async fn rollback_ticket(&self, ticket: RateLimitOk) -> Result<(), Report> {+ self.rate_limit_service.rollback_ticket(ticket).await+ }+}++/// Builds the contacts API router with authorization and POST rate limiting.+pub fn contacts_router<S, R, Auth, T>(state: ContactsRouterState<S, R, Auth>) -> Router<T>+where+ S: ContactsService,+ R: RateLimitService + Clone,+ Auth: MacroAuthorizationService,+ T: Send + Sync + 'static,+{+ let rate_limit_state = AddContactRateLimitState {+ rate_limit_service: state.rate_limit_service.clone(),+ authorization_state: state.authorization_state.clone(),+ };let post_route = Router::new()- .route("/contacts", axum::routing::post(add_contact_handler))+ .route(+ "/contacts",+ axum::routing::post(add_contact_handler::<S, Auth>),+ ).layer(axum::middleware::from_fn_with_state(- rate_limiter,- rate_limit_middleware::<R, PerUserAddContactRateLimit, R>,+ rate_limit_state,+ rate_limit_middleware::<+ AddContactRateLimitState<R, Auth>,+ PerUserAddContactRateLimit<Auth>,+ AddContactRateLimitState<R, Auth>,+ >,));Router::new()- .route("/contacts", get(handler))+ .route("/contacts", get(handler::<S, Auth>)).merge(post_route)-}--/// Builds the full API router with JWT auth middleware and rate limiting.-pub fn api_router<S: ContactsService>(app_state: AppState<S>) -> Router {- contacts_router(app_state.rate_limit_service.clone())- .layer(axum::middleware::from_fn_with_state(- app_state.jwt_args.clone(),- macro_middleware::auth::decode_jwt::handler,- ))- .with_state(app_state.contacts_service)-}--/// Application state for the contacts HTTP service.-pub struct AppState<S> {- /// The port to listen on.- pub port: usize,- /// JWT validation arguments.- pub jwt_args: macro_auth::middleware::decode_jwt::JwtValidationArgs,- /// The contacts service instance.- pub contacts_service: Arc<S>,- /// The rate limiter service.- pub rate_limit_service:- rate_limit::RateLimitServiceImpl<rate_limit::RedisRateLimitAdapter<redis::Client>>,+ .with_state(state)}/// OpenAPI documentation.diff --git a/crates/contacts/src/inbound/http/test.rs b/crates/contacts/src/inbound/http/test.rsindex 70ea9eb072..c04f500736 100644--- a/crates/contacts/src/inbound/http/test.rs+++ b/crates/contacts/src/inbound/http/test.rs@@ -1,58 +1,87 @@-#[allow(unused_imports)]use super::*;-use axum::{Extension, body::Body, http::Request};+use axum::{+ body::Body,+ http::{Request, header},+};use http_body_util::BodyExt;-use model_user::UserContext;+use macro_authorization::{+ INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER, InternalAuthConfig, JwtValidator,+ MacroAuthorizationError, MacroAuthorizationServiceImpl, ValidatedIdentity,+};use rate_limit::{RateLimitConfig, RateLimitExceeded, RateLimitKey, RateLimitResult, RateLimitServiceImpl,domain::models::RateLimitOk,};use rootcause::Report;use std::collections::HashSet;+use std::sync::{+ Arc,+ atomic::{AtomicUsize, Ordering},+};use tower::ServiceExt;-#[derive(Clone, Debug)]+const FOUND_USER_ID: &str = "macro|[email protected]";+const NOT_FOUND_USER_ID: &str = "macro|[email protected]";+const SENDER_USER_ID: &str = "macro|[email protected]";+const VALID_INTERNAL_KEY: &str = "valid-internal-key";+struct MockService;impl ContactsService for MockService {async fn query_contacts(&self,user_id: MacroUserIdStr<'_>,- ) -> Result<Vec<MacroUserIdStr<'static>>, rootcause::Report> {- if user_id.as_ref() == "macro|[email protected]" {- let contacts = [- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- ]- .into_iter()- .map(|s| MacroUserIdStr::try_from(s.to_string()).unwrap())- .collect();- return Ok(contacts);- } else if user_id.as_ref() == "macro|[email protected]" {- let contacts = [- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- "macro|[email protected]",- ]- .into_iter()- .map(|s| MacroUserIdStr::try_from(s.to_string()).unwrap())- .collect();- return Ok(contacts);+ ) -> Result<Vec<MacroUserIdStr<'static>>, Report> {+ if user_id.as_ref() != FOUND_USER_ID {+ return Ok(Vec::new());}- Ok(vec![])+ Ok([+ "macro|[email protected]",+ "macro|[email protected]",+ "macro|[email protected]",+ ]+ .into_iter()+ .map(|user_id| MacroUserIdStr::try_from(user_id.to_string()).unwrap())+ .collect())}- async fn add_contact_nodes(&self, _nodes: ContactsNodes) -> Result<(), rootcause::Report> {+ async fn add_contact_nodes(&self, _nodes: ContactsNodes) -> Result<(), Report> {Ok(())}}+#[derive(Clone, Default)]+struct FakeJwtValidator {+ validation_count: Arc<AtomicUsize>,+}++impl FakeJwtValidator {+ fn validation_count(&self) -> usize {+ self.validation_count.load(Ordering::SeqCst)+ }+}++impl JwtValidator for FakeJwtValidator {+ fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {+ self.validation_count.fetch_add(1, Ordering::SeqCst);++ let user_id = match jwt {+ "found" => FOUND_USER_ID,+ "not-found" => NOT_FOUND_USER_ID,+ "sender" => SENDER_USER_ID,+ _ => return Err(Report::new(MacroAuthorizationError::InvalidCredentials)),+ };++ Ok(ValidatedIdentity {+ user_id: user_id.to_string(),+ fusion_user_id: "fusion-user-id".to_string(),+ permissions: None,+ organization_id: None,+ })+ }+}+#[derive(Clone)]struct MockRateLimitPort {should_exceed: bool,@@ -65,14 +94,14 @@ impl rate_limit::RateLimitPort for MockRateLimitPort {config: RateLimitConfig,) -> Result<RateLimitResult, Report> {if self.should_exceed {- Ok(Err(RateLimitExceeded {+ return Ok(Err(RateLimitExceeded {current_count: config.max_count.saturating_add(1),max_count: config.max_count,retry_after: config.window,- }))- } else {- Ok(Ok(RateLimitOk::new_testing_value(0, key, config)))+ }));}++ Ok(Ok(RateLimitOk::new_testing_value(0, key, config)))}async fn decrement(&self, _key: &RateLimitKey) -> Result<(), Report> {@@ -80,63 +109,58 @@ impl rate_limit::RateLimitPort for MockRateLimitPort {}}-fn allowing_rate_limiter() -> RateLimitServiceImpl<MockRateLimitPort> {+fn rate_limiter(should_exceed: bool) -> RateLimitServiceImpl<MockRateLimitPort> {RateLimitServiceImpl {- repo: MockRateLimitPort {- should_exceed: false,- },+ repo: MockRateLimitPort { should_exceed },}}-fn exceeding_rate_limiter() -> RateLimitServiceImpl<MockRateLimitPort> {- RateLimitServiceImpl {- repo: MockRateLimitPort {- should_exceed: true,+fn build_test_router(should_exceed: bool) -> (Router, FakeJwtValidator) {+ let validator = FakeJwtValidator::default();+ let authorization_service = MacroAuthorizationServiceImpl::new(+ validator.clone(),+ InternalAuthConfig {+ api_key: VALID_INTERNAL_KEY.to_string(),+ default_user_id: None,},- }-}+ );+ let state = ContactsRouterState {+ contacts_service: Arc::new(MockService),+ rate_limit_service: rate_limiter(should_exceed),+ authorization_state: MacroAuthorizationState::new(Arc::new(authorization_service)),+ };-fn mock_service() -> Arc<MockService> {- Arc::new(MockService)+ (contacts_router::<_, _, _, ()>(state), validator)}-fn test_user_context(user_id: &str) -> UserContext {- UserContext {- user_id: user_id.to_string(),- permissions: None,- organization_id: None,- fusion_user_id: "".to_string(),- }+fn bearer_get_request(token: &str) -> Request<Body> {+ Request::get("/contacts")+ .header(header::AUTHORIZATION, format!("Bearer {token}"))+ .body(Body::empty())+ .unwrap()}-fn build_test_router(- rate_limiter: RateLimitServiceImpl<MockRateLimitPort>,- user_id: &str,-) -> Router {- contacts_router(rate_limiter)- .with_state(mock_service())- .layer(Extension(test_user_context(user_id)))+fn add_contact_request(token: &str) -> Request<Body> {+ Request::post("/contacts")+ .header(header::AUTHORIZATION, format!("Bearer {token}"))+ .header(header::CONTENT_TYPE, "application/json")+ .body(Body::from(+ serde_json::json!({"user_id": "macro|[email protected]"}).to_string(),+ ))+ .unwrap()}#[tokio::test]-async fn test_get_contact() {- let user_id = "macro|[email protected]";- let api = build_test_router(allowing_rate_limiter(), user_id);-- let response = api- .oneshot(- Request::builder()- .uri("/contacts")- .body(Body::empty())- .unwrap(),- )- .await- .unwrap();+async fn bearer_get_returns_contacts() {+ let (api, validator) = build_test_router(false);++ let response = api.oneshot(bearer_get_request("found")).await.unwrap();+assert_eq!(response.status(), StatusCode::OK);+ assert_eq!(validator.validation_count(), 1);let body = response.into_body().collect().await.unwrap().to_bytes();let body: GetContactsResponse = serde_json::from_slice(&body).unwrap();-- let contact_list: HashSet<&str> = [+ let expected_contacts: HashSet<&str> = ["macro|[email protected]","macro|[email protected]","macro|[email protected]",@@ -144,88 +168,96 @@ async fn test_get_contact() {.into_iter().collect();- assert_eq!(body.contacts.len(), 3, "Not enough contacts");+ assert_eq!(body.contacts.len(), expected_contacts.len());for contact in &body.contacts {- assert!(- contact_list.contains(contact.as_ref()),- "Could not find contact: {}",- contact.as_ref()- );+ assert!(expected_contacts.contains(contact.as_ref()));}}#[tokio::test]-async fn test_get_contact_not_found() {- let user_id = "macro|[email protected]";- let api = build_test_router(allowing_rate_limiter(), user_id);-- let response = api- .oneshot(- Request::builder()- .uri("/contacts")- .body(Body::empty())- .unwrap(),- )- .await- .unwrap();+async fn bearer_get_returns_not_found() {+ let (api, _) = build_test_router(false);++ let response = api.oneshot(bearer_get_request("not-found")).await.unwrap();+assert_eq!(response.status(), StatusCode::NOT_FOUND);}#[tokio::test]-async fn test_add_contact() {- let user_id = "macro|[email protected]";- let api = build_test_router(allowing_rate_limiter(), user_id);-- let response = api- .oneshot(- Request::builder()- .method("POST")- .uri("/contacts")- .header("content-type", "application/json")- .body(Body::from(- serde_json::json!({"user_id": "macro|[email protected]"}).to_string(),- ))- .unwrap(),- )- .await- .unwrap();+async fn bearer_post_adds_contact_and_validates_once() {+ let (api, validator) = build_test_router(false);++ let response = api.oneshot(add_contact_request("sender")).await.unwrap();+assert_eq!(response.status(), StatusCode::NO_CONTENT);+ assert_eq!(validator.validation_count(), 1);}#[tokio::test]-async fn test_add_contact_rate_limited() {- let user_id = "macro|[email protected]";- let api = build_test_router(exceeding_rate_limiter(), user_id);-- let response = api- .oneshot(- Request::builder()- .method("POST")- .uri("/contacts")- .header("content-type", "application/json")- .body(Body::from(- serde_json::json!({"user_id": "macro|[email protected]"}).to_string(),- ))- .unwrap(),- )- .await- .unwrap();+async fn post_rate_limit_is_preserved() {+ let (api, validator) = build_test_router(true);++ let response = api.oneshot(add_contact_request("sender")).await.unwrap();+assert_eq!(response.status(), StatusCode::TOO_MANY_REQUESTS);+ assert_eq!(validator.validation_count(), 1);+}++#[tokio::test]+async fn get_is_not_affected_by_post_rate_limit() {+ let (api, _) = build_test_router(true);++ let response = api.oneshot(bearer_get_request("found")).await.unwrap();++ assert_eq!(response.status(), StatusCode::OK);+}++#[tokio::test]+async fn missing_credentials_are_rejected() {+ let (api, validator) = build_test_router(false);+ let request = Request::get("/contacts").body(Body::empty()).unwrap();++ let response = api.oneshot(request).await.unwrap();++ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);+ assert_eq!(validator.validation_count(), 0);}#[tokio::test]-async fn test_get_not_affected_by_rate_limit() {- let user_id = "macro|[email protected]";- let api = build_test_router(exceeding_rate_limiter(), user_id);-- let response = api- .oneshot(- Request::builder()- .uri("/contacts")- .body(Body::empty())- .unwrap(),- )- .await+async fn invalid_credentials_are_rejected() {+ let (api, validator) = build_test_router(false);++ let response = api.oneshot(bearer_get_request("invalid")).await.unwrap();++ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);+ assert_eq!(validator.validation_count(), 1);+}++#[tokio::test]+async fn internal_acting_user_is_authenticated() {+ let (api, validator) = build_test_router(false);+ let request = Request::get("/contacts")+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)+ .header(INTERNAL_MACRO_USER_ID_HEADER, FOUND_USER_ID)+ .body(Body::empty()).unwrap();++ let response = api.oneshot(request).await.unwrap();+assert_eq!(response.status(), StatusCode::OK);+ assert_eq!(validator.validation_count(), 0);+}++#[tokio::test]+async fn internal_request_without_an_identity_is_rejected() {+ let (api, validator) = build_test_router(false);+ let request = Request::get("/contacts")+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)+ .body(Body::empty())+ .unwrap();++ let response = api.oneshot(request).await.unwrap();++ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);+ assert_eq!(validator.validation_count(), 0);}diff --git a/services/contacts_service/Cargo.toml b/services/contacts_service/Cargo.tomlindex f4e7c2d0aa..7793cf922a 100644--- a/services/contacts_service/Cargo.toml+++ b/services/contacts_service/Cargo.toml@@ -24,6 +24,7 @@ aws-sdk-sqs = { workspace = true }axum = { workspace = true }contacts = { path = "../../crates/contacts", features = ["axum"] }macro_auth = { path = "../../crates/macro_auth" }+macro_authorization = { path = "../../crates/macro_authorization" }macro_aws_config = { path = "../../crates/macro_aws_config" }macro_cors = { path = "../../crates/macro_cors" }macro_entrypoint = { path = "../../crates/macro_entrypoint" }diff --git a/services/contacts_service/src/main.rs b/services/contacts_service/src/main.rsindex 13c8196072..e6b3429071 100644--- a/services/contacts_service/src/main.rs+++ b/services/contacts_service/src/main.rs@@ -6,10 +6,14 @@ use std::sync::Arc;use anyhow::Context;use config::{Config, Environment};use contacts::domain::service::{ContactsDomainService, ContactsOutboxServiceImpl};-use contacts::inbound::http::{ApiDoc, AppState};+use contacts::inbound::http::{ApiDoc, ContactsRouterState, contacts_router};use contacts::inbound::worker::{ContactsWorker, OutboxWorker};use contacts::outbound::gateway::ConnectionGatewayNotifier;use contacts::outbound::repository::DbContactsRepository;+use macro_authorization::{+ InternalAuthConfig, MacroAuthJwtValidator, MacroAuthorizationServiceImpl,+ MacroAuthorizationState,+};use macro_entrypoint::MacroEntrypoint;use macro_service_urls::ConnectionGatewayUrl;use rate_limit::{RateLimitServiceImpl, RedisRateLimitAdapter};@@ -105,6 +109,14 @@ async fn main() -> anyhow::Result<()> {&secretsmanager_client,).await?;+ let authorization_service = MacroAuthorizationServiceImpl::new(+ MacroAuthJwtValidator::new(jwt_args),+ InternalAuthConfig {+ api_key: config.internal_api_key.to_string(),+ default_user_id: None,+ },+ );+ let authorization_state = MacroAuthorizationState::new(Arc::new(authorization_service));let redis_client = redis::Client::open(config.redis_uri.to_string().as_str()).context("failed to create redis client")?;@@ -118,11 +130,10 @@ async fn main() -> anyhow::Result<()> {let cors = macro_cors::cors_layer();let port = config.port;- let app = contacts::inbound::http::api_router(AppState {- port,- jwt_args,+ let app = contacts_router(ContactsRouterState {contacts_service: service,rate_limit_service,+ authorization_state,}).layer(cors.clone()).merge(health::router().layer(cors))