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(sps): macro authorization (#4927)
Will Hutchinsoncb942bf01747
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.jsonindex 32e9c7a99f..46759c77e9 100644--- a/.github/workspace-dep-closures.json+++ b/.github/workspace-dep-closures.json@@ -4525,7 +4525,6 @@"crates/remote_env_var","crates/s3_client","crates/s3_key",- "crates/secretsmanager_client","crates/share_permission_db_utils","crates/sqs_client","crates/sqs_worker",diff --git a/Cargo.lock b/Cargo.lockindex 5aa96f843f..a28c7c6157 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -12379,7 +12379,6 @@ dependencies = ["anyhow","aws-sdk-dynamodb","aws-sdk-s3",- "aws-sdk-secretsmanager","aws-sdk-sqs","axum","chrono",@@ -12392,6 +12391,7 @@ dependencies = ["http-body-util","lexical_client","macro_auth",+ "macro_authorization","macro_aws_config","macro_config","macro_cors",@@ -12418,7 +12418,6 @@ dependencies = ["rust-embed","s3_client","s3_key",- "secretsmanager_client","serde","serde_json","sqlx",diff --git a/crates/macro_authorization/src/lib.rs b/crates/macro_authorization/src/lib.rsindex be7dc322be..dd5bcfb678 100644--- a/crates/macro_authorization/src/lib.rs+++ b/crates/macro_authorization/src/lib.rs@@ -57,6 +57,6 @@ pub use inbound::{LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER, MacroAuthorizationExtractor,MacroAuthorizationRejection, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,};-/// JWT validator backed by the shared `macro_auth` implementation.+/// JWT validation adapters for user-authenticated and internal-only services.#[cfg(feature = "outbound")]-pub use outbound::MacroAuthJwtValidator;+pub use outbound::{MacroAuthJwtValidator, NoopMacroAuthJwtValidator};diff --git a/crates/macro_authorization/src/outbound.rs b/crates/macro_authorization/src/outbound.rsindex 025dca1f83..35c7ad56f1 100644--- a/crates/macro_authorization/src/outbound.rs+++ b/crates/macro_authorization/src/outbound.rs@@ -2,6 +2,10 @@/// JWT validation backed by the shared `macro_auth` implementation.pub mod macro_auth;+/// JWT validation adapter for internal-only services.+pub mod noop;/// JWT validator backed by the shared `macro_auth` implementation.pub use macro_auth::MacroAuthJwtValidator;+/// JWT validator for services that only support internal authorization.+pub use noop::NoopMacroAuthJwtValidator;diff --git a/crates/macro_authorization/src/outbound/noop.rs b/crates/macro_authorization/src/outbound/noop.rsnew file mode 100644index 0000000000..0450b5f427--- /dev/null+++ b/crates/macro_authorization/src/outbound/noop.rs@@ -0,0 +1,21 @@+#[cfg(test)]+mod test;++use rootcause::Report;++use crate::domain::{+ models::{MacroAuthorizationError, ValidatedIdentity},+ ports::JwtValidator,+};++/// JWT validator for services that only support internal authorization.+///+/// Calling [`JwtValidator::validate`] is a configuration error and will panic.+#[derive(Clone, Copy, Debug, Default)]+pub struct NoopMacroAuthJwtValidator;++impl JwtValidator for NoopMacroAuthJwtValidator {+ fn validate(&self, _jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {+ unimplemented!("NoopMacroAuthJwtValidator cannot validate JWTs")+ }+}diff --git a/crates/macro_authorization/src/outbound/noop/test.rs b/crates/macro_authorization/src/outbound/noop/test.rsnew file mode 100644index 0000000000..7842d5f49c--- /dev/null+++ b/crates/macro_authorization/src/outbound/noop/test.rs@@ -0,0 +1,7 @@+use super::*;++#[test]+#[should_panic(expected = "NoopMacroAuthJwtValidator cannot validate JWTs")]+fn validate_panics() {+ let _ = NoopMacroAuthJwtValidator.validate("jwt");+}diff --git a/services/convert_service/src/api/context.rs b/services/convert_service/src/api/context.rsindex a12a916a8e..11c6ec317c 100644--- a/services/convert_service/src/api/context.rs+++ b/services/convert_service/src/api/context.rs@@ -1,13 +1,13 @@use axum::extract::FromRef;use macro_authorization::{- MacroAuthJwtValidator, MacroAuthorizationServiceImpl, MacroAuthorizationState,+ MacroAuthorizationServiceImpl, MacroAuthorizationState, NoopMacroAuthJwtValidator,};use s3_client::S3;use std::sync::Arc;use crate::config::Config;-pub(crate) type AuthorizationService = MacroAuthorizationServiceImpl<MacroAuthJwtValidator>;+pub(crate) type AuthorizationService = MacroAuthorizationServiceImpl<NoopMacroAuthJwtValidator>;#[derive(Clone, FromRef)]pub struct ApiContext {diff --git a/services/convert_service/src/main.rs b/services/convert_service/src/main.rsindex 8ac7fc7b29..ad7ced1bf1 100644--- a/services/convert_service/src/main.rs+++ b/services/convert_service/src/main.rs@@ -2,8 +2,7 @@use crate::api::context::{ApiContext, AuthorizationService};use anyhow::Context;use config::{Config, Environment};-use macro_auth::middleware::decode_jwt::JwtValidationArgs;-use macro_authorization::{InternalAuthConfig, MacroAuthJwtValidator, MacroAuthorizationState};+use macro_authorization::{InternalAuthConfig, MacroAuthorizationState, NoopMacroAuthJwtValidator};use macro_entrypoint::MacroEntrypoint;use process::runner::run_worker;use sqlx::postgres::PgPoolOptions;@@ -67,14 +66,9 @@ async fn main() -> anyhow::Result<()> {smoke_test_lok(&config.lok_path)?;let aws_config = macro_aws_config::get_macro_aws_config().await;- let secretsmanager_client = secretsmanager_client::SecretsManager::new(- aws_sdk_secretsmanager::Client::new(&aws_config),- );- let jwt_validation_args =- JwtValidationArgs::new_with_secret_manager(config.environment, &secretsmanager_client)- .await?;+let authorization_state = MacroAuthorizationState::new(Arc::new(AuthorizationService::new(- MacroAuthJwtValidator::new(jwt_validation_args),+ NoopMacroAuthJwtValidator, // we only have internal calls in this service.InternalAuthConfig {api_key: config.internal_api_key.to_string(),default_user_id: None,diff --git a/services/search_processing_service/Cargo.toml b/services/search_processing_service/Cargo.tomlindex 345e667e89..1d93ae757c 100644--- a/services/search_processing_service/Cargo.toml+++ b/services/search_processing_service/Cargo.toml@@ -24,7 +24,6 @@ path = "src/doppler_config.rs"anyhow = { workspace = true }aws-sdk-dynamodb = { workspace = true }aws-sdk-s3 = { workspace = true }-aws-sdk-secretsmanager = { workspace = true }aws-sdk-sqs = { workspace = true }axum = { workspace = true }chrono = { workspace = true }@@ -34,6 +33,7 @@ futures = { workspace = true }http-body-util = { workspace = true }lexical_client = { path = "../../crates/lexical_client" }macro_auth = { path = "../../crates/macro_auth" }+macro_authorization = { path = "../../crates/macro_authorization" }macro_aws_config = { path = "../../crates/macro_aws_config", features = ["s3"] }macro_cors = { path = "../../crates/macro_cors" }macro_config = { path = "../../crates/macro_config" }@@ -42,9 +42,7 @@ macro_entrypoint = { path = "../../crates/macro_entrypoint" }macro_env = { path = "../../crates/macro_env" }macro_env_var = { path = "../../crates/macro_env_var" }macro_queues = { path = "../../crates/macro_queues" }-macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth",-] }+macro_middleware = { path = "../../crates/macro_middleware", default-features = false }macro_user_id = { path = "../../crates/macro_user_id" }macro_uuid = { path = "../../crates/macro_uuid" }mention_utils = { path = "../../crates/mention_utils" }@@ -66,7 +64,6 @@ properties = { path = "../../crates/properties", default-features = false, featu], optional = true }rust-embed = "8.6.0"s3_client = { path = "../../crates/s3_client" }-secretsmanager_client = { path = "../../crates/secretsmanager_client" }serde = { workspace = true }serde_json = { workspace = true }sqlx = { workspace = true }diff --git a/services/search_processing_service/src/api/context.rs b/services/search_processing_service/src/api/context.rsindex d2eed276de..427b1e81ff 100644--- a/services/search_processing_service/src/api/context.rs+++ b/services/search_processing_service/src/api/context.rs@@ -1,17 +1,21 @@use axum::extract::FromRef;-use macro_auth::InternalApiKey;+use macro_authorization::{+ MacroAuthorizationServiceImpl, MacroAuthorizationState, NoopMacroAuthJwtValidator,+};use std::sync::Arc;use crate::BackfillServiceImpl;use crate::config::Config;use crate::domain::jobs::BackfillJobs;+pub(crate) type AuthorizationService = MacroAuthorizationServiceImpl<NoopMacroAuthJwtValidator>;+#[derive(Clone, FromRef)]pub(crate) struct ApiContext {pub db: sqlx::Pool<sqlx::Postgres>,pub sqs_client: Arc<sqs_client::SQS>,pub opensearch_client: Arc<opensearch_client::OpensearchClient>,- pub internal_api_key: InternalApiKey,+ pub authorization_state: MacroAuthorizationState<AuthorizationService>,pub config: Arc<Config>,pub backfill_service: Arc<BackfillServiceImpl>,pub backfill_jobs: BackfillJobs,diff --git a/services/search_processing_service/src/api/internal/backfill.rs b/services/search_processing_service/src/api/internal/backfill.rsindex 7d8bf59787..1df8193937 100644--- a/services/search_processing_service/src/api/internal/backfill.rs+++ b/services/search_processing_service/src/api/internal/backfill.rs@@ -21,10 +21,11 @@ use axum::{response::{IntoResponse, Response},routing::{get, post},};+use macro_authorization::InternalMacroAuthorizationExtractor;use serde::Serialize;use crate::BackfillServiceImpl;-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use crate::domain::jobs::{BackfillJobs, JobId};use crate::domain::models::{CallBackfillRequest, ChannelBackfillRequest, ChatBackfillRequest, DocumentBackfillRequest,@@ -49,10 +50,11 @@ struct AcceptedReceipt {job_id: JobId,}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn calls(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<CallBackfillRequest>,) -> Response {spawn_backfill(@@ -64,10 +66,11 @@ async fn calls(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn chats(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<ChatBackfillRequest>,) -> Response {spawn_backfill(@@ -79,10 +82,11 @@ async fn chats(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn channels(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<ChannelBackfillRequest>,) -> Response {spawn_backfill(@@ -96,10 +100,11 @@ async fn channels(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn documents(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<DocumentBackfillRequest>,) -> Response {spawn_backfill(@@ -113,10 +118,11 @@ async fn documents(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn emails(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<EmailBackfillRequest>,) -> Response {spawn_backfill(@@ -130,10 +136,11 @@ async fn emails(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn properties(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<PropertiesBackfillRequest>,) -> Response {spawn_backfill(@@ -147,10 +154,11 @@ async fn properties(.await}-#[tracing::instrument(skip(service, jobs, req))]+#[tracing::instrument(skip(service, jobs, _internal_authorization, req))]async fn projects(State(service): State<Arc<BackfillServiceImpl>>,State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<ProjectBackfillRequest>,) -> Response {spawn_backfill(@@ -164,8 +172,12 @@ async fn projects(.await}-#[tracing::instrument(skip(jobs))]-async fn status(State(jobs): State<BackfillJobs>, Path(job_id): Path<String>) -> Response {+#[tracing::instrument(skip(jobs, _internal_authorization))]+async fn status(+ State(jobs): State<BackfillJobs>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,+ Path(job_id): Path<String>,+) -> Response {match jobs.snapshot(&JobId::from(job_id)).await {Ok(Some(snap)) => axum::Json(snap).into_response(),Ok(None) => (StatusCode::NOT_FOUND, "unknown job id").into_response(),diff --git a/services/search_processing_service/src/api/internal/delete_document.rs b/services/search_processing_service/src/api/internal/delete_document.rsindex cb0d4a849c..643e84b0eb 100644--- a/services/search_processing_service/src/api/internal/delete_document.rs+++ b/services/search_processing_service/src/api/internal/delete_document.rs@@ -1,9 +1,10 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::{extract::{self, State},http::StatusCode,response::{IntoResponse, Response},};+use macro_authorization::InternalMacroAuthorizationExtractor;#[derive(serde::Deserialize)]pub struct Params {@@ -11,9 +12,10 @@ pub struct Params {}/// Deletes a given document from the open search index-#[tracing::instrument(skip(ctx))]+#[tracing::instrument(skip(ctx, _internal_authorization))]pub async fn handler(State(ctx): State<ApiContext>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Path(Params { document_id }): extract::Path<Params>,) -> Result<Response, Response> {tracing::info!("delete document request initiated");diff --git a/services/search_processing_service/src/api/internal/extract_sync.rs b/services/search_processing_service/src/api/internal/extract_sync.rsindex 599515722c..949ca5a6cf 100644--- a/services/search_processing_service/src/api/internal/extract_sync.rs+++ b/services/search_processing_service/src/api/internal/extract_sync.rs@@ -1,9 +1,10 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::{extract::{self, State},http::StatusCode,response::{IntoResponse, Response},};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::document::FileType;use sqs_client::search::{SearchQueueMessage, document::SearchExtractorMessage};use uuid::Uuid;@@ -48,9 +49,10 @@ fn documents_to_messages(documents: Vec<SyncDocument>) -> Vec<SearchQueueMessage}/// internal handler to batch queue messages to the worker queue-#[tracing::instrument(skip(ctx, req))]+#[tracing::instrument(skip(ctx, _internal_authorization, req))]pub async fn handler(State(ctx): State<ApiContext>,+ _internal_authorization: InternalMacroAuthorizationExtractor<AuthorizationService>,extract::Json(req): extract::Json<ExtractSyncRequest>,) -> Result<Response, Response> {let document_ids: Vec<&str> = reqdiff --git a/services/search_processing_service/src/api/mod.rs b/services/search_processing_service/src/api/mod.rsindex edfe7b7629..ad1e0d310d 100644--- a/services/search_processing_service/src/api/mod.rs+++ b/services/search_processing_service/src/api/mod.rs@@ -1,7 +1,6 @@use anyhow::Context;use axum::Router;use context::ApiContext;-use macro_auth::InternalApiKey;use tower::ServiceBuilder;use tower_http::trace::TraceLayer;use utoipa::OpenApi;@@ -21,7 +20,7 @@ pub async fn setup_and_serve(state: ApiContext) -> anyhow::Result<()> {let port = state.config.port;let env = state.config.environment;let backfill_jobs = state.backfill_jobs.clone();- let app = api_router(state.internal_api_key.clone())+ let app = api_router().with_state(state).layer(cors.clone()).layer(ServiceBuilder::new().layer(TraceLayer::new_for_http()))@@ -80,18 +79,11 @@ async fn shutdown_signal(backfill_jobs: crate::domain::jobs::BackfillJobs) {backfill_jobs.cancel_all_local();}-fn api_router(internal_secret: InternalApiKey) -> Router<ApiContext> {+fn api_router() -> Router<ApiContext> {Router::new().nest("/internal",- internal::router().layer(- ServiceBuilder::new()- .layer(axum::middleware::from_fn_with_state(- internal_secret,- macro_middleware::auth::internal_access::handler,- ))- .layer(axum::middleware::from_fn(- macro_middleware::connection_drop_prevention_handler,- )),- ),+ internal::router().layer(ServiceBuilder::new().layer(axum::middleware::from_fn(+ macro_middleware::connection_drop_prevention_handler,+ ))),)}diff --git a/services/search_processing_service/src/main.rs b/services/search_processing_service/src/main.rsindex 04dd1b4056..ea153f966c 100644--- a/services/search_processing_service/src/main.rs+++ b/services/search_processing_service/src/main.rs@@ -2,7 +2,7 @@use std::sync::Arc;use crate::{- api::context::ApiContext,+ api::context::{ApiContext, AuthorizationService},config::DatabaseUrlReadonly,domain::{jobs::BackfillJobs, service::BackfillOrchestrator},outbound::{publisher::SqsSearchEventPublisher, source::PgBackfillSource},@@ -11,6 +11,7 @@ use crate::{use anyhow::Context;use config::{Config, Environment};use lexical_client::LexicalClient;+use macro_authorization::{InternalAuthConfig, MacroAuthorizationState, NoopMacroAuthJwtValidator};use macro_entrypoint::MacroEntrypoint;use opensearch_client::OpensearchClient;#[cfg(feature = "pdf")]@@ -69,8 +70,15 @@ async fn main() -> anyhow::Result<()> {let config = Config::from_env().context("expected to be able to generate config")?;tracing::trace!("initialized config");- let aws_config = macro_aws_config::get_macro_aws_config().await;+ let authorization_state = MacroAuthorizationState::new(Arc::new(AuthorizationService::new(+ NoopMacroAuthJwtValidator, // we only have internal calls in this service.+ InternalAuthConfig {+ api_key: config.internal_api_key.to_string(),+ default_user_id: None,+ },+ )));+ let aws_config = macro_aws_config::get_macro_aws_config().await;let search_event_queue = macro_queues::SearchEventQueue::new();let sqs_client = sqs_client::SQS::new(aws_sdk_sqs::Client::new(&aws_config)).search_event_queue(&search_event_queue);@@ -179,7 +187,7 @@ async fn main() -> anyhow::Result<()> {api::setup_and_serve(ApiContext {db,- internal_api_key: config.internal_api_key.clone(),+ authorization_state,sqs_client,opensearch_client: Arc::new(opensearch_client),config: Arc::new(config),