Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(documents): use macro authorization documents (#4852)

Will Hutchinson1540a033e705
diff --git a/.agents/skills/cloud-storage-hexagonal-architecture/SKILL.md b/.agents/skills/cloud-storage-hexagonal-architecture/SKILL.md
index 68df19e006..8c5cd5c40f 100644
--- a/.agents/skills/cloud-storage-hexagonal-architecture/SKILL.md
+++ b/.agents/skills/cloud-storage-hexagonal-architecture/SKILL.md
@@ -39,7 +39,7 @@ Put the following here:
Axum handlers, AI tools, Kafka/listener handlers, lambda handlers, and CLI entrypoints are adapters. Keep them thin:
-- Extract authentication/identity from transport (`MacroUserExtractor`, JWT, signed internal header, request context).
+- Extract authentication/identity from transport (`MacroAuthorizationExtractor`, `OptionalMacroAuthorizationExtractor`, JWT, signed internal header, request context).
- Parse path/query/body/header data and perform transport/syntax validation.
- Convert transport DTOs into domain request/command types.
- Call exactly the appropriate domain service/port method.
diff --git a/.claude/skills/cloud-storage-hexagonal-architecture/SKILL.md b/.claude/skills/cloud-storage-hexagonal-architecture/SKILL.md
index 54eca6c2a7..7d7ebb8e8f 100644
--- a/.claude/skills/cloud-storage-hexagonal-architecture/SKILL.md
+++ b/.claude/skills/cloud-storage-hexagonal-architecture/SKILL.md
@@ -39,7 +39,7 @@ Put the following here:
Axum handlers, AI tools, Kafka/listener handlers, lambda handlers, and CLI entrypoints are adapters. Keep them thin:
-- Extract authentication/identity from transport (`MacroUserExtractor`, JWT, signed internal header, request context).
+- Extract authentication/identity from transport (`MacroAuthorizationExtractor`, `OptionalMacroAuthorizationExtractor`, JWT, signed internal header, request context).
- Parse path/query/body/header data and perform transport/syntax validation.
- Convert transport DTOs into domain request/command types.
- Call exactly the appropriate domain service/port method.
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.json
index 53c9a79566..fa9e6370bb 100644
--- a/.github/workspace-dep-closures.json
+++ b/.github/workspace-dep-closures.json
@@ -59,6 +59,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -143,6 +144,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -223,6 +225,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -361,6 +364,7 @@
"crates/lexical_client",
"crates/loops_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_cache_client",
"crates/macro_config",
@@ -487,6 +491,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_db_client",
"crates/macro_env",
"crates/macro_env_var",
@@ -585,6 +590,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -677,6 +683,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -773,6 +780,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_db_client",
"crates/macro_env",
"crates/macro_env_var",
@@ -826,6 +834,9 @@
"crates/entity_access",
"crates/entity_access_db_utils",
"crates/entity_access_management",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_env",
"crates/macro_env_var",
"crates/macro_user_id",
"crates/macro_uuid",
@@ -840,6 +851,7 @@
"crates/models_permissions",
"crates/non_empty",
"crates/prompt",
+ "crates/remote_env_var",
"crates/roles_and_permissions",
"crates/workspace-hack"
],
@@ -873,6 +885,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_db_client",
"crates/macro_env",
"crates/macro_env_var",
@@ -952,6 +965,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -1010,6 +1024,9 @@
"crates/cowlike",
"crates/document_sub_type",
"crates/entity_access",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_env",
"crates/macro_env_var",
"crates/macro_user_id",
"crates/macro_uuid",
@@ -1023,6 +1040,7 @@
"crates/models_permissions",
"crates/non_empty",
"crates/prompt",
+ "crates/remote_env_var",
"crates/workspace-hack"
],
"connection_gateway": [
@@ -1206,6 +1224,7 @@
"crates/lambda_client",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -1275,6 +1294,7 @@
"crates/invite_email",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_service_urls",
@@ -1361,6 +1381,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -1447,6 +1468,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -1572,6 +1594,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_axum_utils",
"crates/macro_config",
@@ -1734,6 +1757,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -1823,6 +1847,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -1901,6 +1926,7 @@
"crates/lambda_client",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -1977,6 +2003,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -2068,6 +2095,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -2129,6 +2157,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -2196,6 +2225,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -2272,6 +2302,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -2326,6 +2357,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -2422,6 +2454,9 @@
"crates/cowlike",
"crates/document_sub_type",
"crates/entity_access",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_env",
"crates/macro_env_var",
"crates/macro_user_id",
"crates/macro_uuid",
@@ -2435,6 +2470,7 @@
"crates/models_permissions",
"crates/non_empty",
"crates/prompt",
+ "crates/remote_env_var",
"crates/workspace-hack"
],
"entity_access_db_utils": [
@@ -2470,6 +2506,9 @@
"crates/document_sub_type",
"crates/entity_access",
"crates/favorites",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_env",
"crates/macro_env_var",
"crates/macro_user_id",
"crates/macro_uuid",
@@ -2483,6 +2522,7 @@
"crates/models_permissions",
"crates/non_empty",
"crates/prompt",
+ "crates/remote_env_var",
"crates/workspace-hack"
],
"filter_ast": [
@@ -2501,6 +2541,9 @@
"crates/filter_ast",
"crates/foreign_entity",
"crates/item_filters",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_env",
"crates/macro_env_var",
"crates/macro_user_id",
"crates/macro_uuid",
@@ -2514,6 +2557,7 @@
"crates/models_permissions",
"crates/non_empty",
"crates/prompt",
+ "crates/remote_env_var",
"crates/workspace-hack"
],
"frecency": [
@@ -2571,6 +2615,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -2672,6 +2717,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -2749,6 +2795,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_service_urls",
@@ -2809,6 +2856,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -2984,6 +3032,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -3064,6 +3113,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -3308,6 +3358,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -3472,6 +3523,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -3577,6 +3629,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -3795,6 +3848,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -3881,6 +3935,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -4119,6 +4174,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -4180,6 +4236,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -4236,6 +4293,7 @@
"crates/invite_email",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_service_urls",
@@ -4278,6 +4336,7 @@
"crates/ip_extractor",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_db_client",
"crates/macro_env",
"crates/macro_env_var",
@@ -4410,6 +4469,7 @@
"crates/lexical_client",
"crates/lexical_mention_extractor",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -4509,6 +4569,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_config",
"crates/macro_config_derive",
@@ -4596,6 +4657,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -4678,6 +4740,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -4751,6 +4814,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -4826,6 +4890,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -4935,6 +5000,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_env",
@@ -5005,6 +5071,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -5189,6 +5256,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
@@ -5264,6 +5332,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_env",
"crates/macro_env_var",
"crates/macro_event_broker",
@@ -5343,6 +5412,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -5404,6 +5474,7 @@
"crates/item_filters",
"crates/last_online_tracker",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_entrypoint",
"crates/macro_env",
@@ -5514,6 +5585,7 @@
"crates/last_online_tracker",
"crates/lexical_client",
"crates/macro_auth",
+ "crates/macro_authorization",
"crates/macro_aws_config",
"crates/macro_db_client",
"crates/macro_entrypoint",
diff --git a/Cargo.lock b/Cargo.lock
index 94c20f11b0..157d96cbf8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4233,6 +4233,7 @@ dependencies = [
"lexical_client",
"lexical_mention_extractor",
"macro_auth",
+ "macro_authorization",
"macro_aws_config",
"macro_axum_utils",
"macro_config",
@@ -4407,6 +4408,7 @@ dependencies = [
"connection",
"document_sub_type",
"dotenvy",
+ "embedding",
"entity_access",
"entity_access_db_utils",
"entity_access_management",
@@ -4416,6 +4418,7 @@ dependencies = [
"http-body-util",
"jsonwebtoken 10.3.0",
"lexical_client",
+ "macro_authorization",
"macro_aws_config",
"macro_db_migrator",
"macro_entrypoint",
@@ -4438,6 +4441,7 @@ dependencies = [
"non_empty",
"rdkafka",
"reqwest 0.13.4",
+ "rootcause",
"s3_key",
"schemars 1.2.1",
"serde",
@@ -5080,6 +5084,7 @@ dependencies = [
"cached",
"cool_asserts",
"futures",
+ "macro_authorization",
"macro_db_migrator",
"macro_user_id",
"mockall",
@@ -5088,11 +5093,13 @@ dependencies = [
"model-error-response",
"model_user",
"models_permissions",
+ "rootcause",
"serde",
"serde_json",
"sqlx",
"thiserror 2.0.18",
"tokio",
+ "tower 0.5.3",
"tracing",
"utoipa",
"uuid",
@@ -8132,10 +8139,12 @@ name = "macro_authorization"
version = "0.1.0"
dependencies = [
"axum",
+ "constant_time_eq",
"cookie",
"http-body-util",
"jsonwebtoken 10.3.0",
"macro_auth",
+ "macro_env_var",
"macro_user_id",
"model-error-response",
"model_user",
diff --git a/Cargo.toml b/Cargo.toml
index 9aea23bb98..c88cfe3fca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,6 +121,7 @@ cached = { version = "0.54.0", features = ["async_tokio_rt_multi_thread"] }
chrono = { version = "0.4.39", features = ["serde"] }
clap = { version = "4.5.20", features = ["derive"] }
cloudfront_sign = "0.3.0"
+constant_time_eq = "0.3.1"
cookie = "0.18.1"
csv = "1"
dashmap = "6.1.0"
diff --git a/crates/documents/Cargo.toml b/crates/documents/Cargo.toml
index e01e570b35..11a3702269 100644
--- a/crates/documents/Cargo.toml
+++ b/crates/documents/Cargo.toml
@@ -10,14 +10,6 @@ path = "src/bin/backfill_markdown_content_location.rs"
required-features = ["backfill_binary"]
[features]
-attachment = [
- "dep:attachment",
- "dep:ai_toolset",
- "dep:lexical_client",
- "dep:model_file_type",
- "dep:reqwest",
- "ports",
-]
ai_tools = [
"dep:ai_toolset",
"dep:ai_usage",
@@ -29,28 +21,26 @@ ai_tools = [
"outbound",
"ports",
]
+attachment = [
+ "dep:ai_toolset",
+ "dep:attachment",
+ "dep:lexical_client",
+ "dep:model_file_type",
+ "dep:reqwest",
+ "ports",
+]
axum = [
"dep:axum",
"dep:axum-extra",
"dep:jsonwebtoken",
"dep:lexical_client",
+ "dep:macro_authorization",
"dep:model-error-response",
"dep:model_user",
"dep:task_dedup",
"dep:utoipa",
"entity_access/axum",
]
-default = ["ai_tools", "axum", "inbound", "outbound", "ports", "service"]
-document_create = [
- "dep:base64",
- "dep:sha2",
- "ports",
-]
-document_create_adapters = [
- "dep:reqwest",
- "document_create",
- "markdown_init",
-]
backfill_binary = [
"dep:clap",
"dep:macro_entrypoint",
@@ -59,6 +49,9 @@ backfill_binary = [
"outbound",
"ports",
]
+default = ["ai_tools", "axum", "inbound", "outbound", "ports", "service"]
+document_create = ["dep:base64", "dep:sha2", "ports"]
+document_create_adapters = ["dep:reqwest", "document_create", "markdown_init"]
inbound = ["axum", "document_create_adapters", "ports"]
markdown_init = ["dep:lexical_client"]
outbound = [
@@ -102,11 +95,15 @@ entity_access_management = { path = "../entity_access_management", default-featu
foreign_entity = { path = "../foreign_entity", default-features = false, features = [
"ports",
], optional = true }
+macro_authorization = { path = "../macro_authorization", optional = true, default-features = false, features = [
+ "axum",
+] }
macro_aws_config = { path = "../macro_aws_config", features = ["s3"] }
macro_entrypoint = { path = "../macro_entrypoint", optional = true }
macro_env_var = { path = "../macro_env_var" }
macro_event_broker = { path = "../macro_event_broker", default-features = false }
macro_event_topics = { path = "../macro_event_topics" }
+macro_service_urls = { path = "../macro_service_urls", optional = true }
macro_sync_service_jwt = { path = "../macro_sync_service_jwt" }
macro_user_id = { path = "../macro_user_id" }
macro_uuid = { path = "../macro_uuid" }
@@ -115,15 +112,14 @@ model-entity = { path = "../model-entity" }
models_permissions = { path = "../models_permissions" }
models_properties = { path = "../models_properties" }
s3_key = { path = "../s3_key" }
-macro_service_urls = { path = "../macro_service_urls", optional = true }
# Async runtime (for ports)
tokio = { workspace = true, optional = true }
# Axum dependencies (for inbound)
axum = { workspace = true, optional = true }
-jsonwebtoken = { workspace = true, optional = true }
axum-extra = { workspace = true, optional = true }
+jsonwebtoken = { workspace = true, optional = true }
model-error-response = { path = "../model-error-response", optional = true }
model_user = { path = "../model_user", optional = true, features = ["axum"] }
utoipa = { workspace = true, optional = true }
@@ -157,6 +153,7 @@ workspace-hack = { version = "0.1", path = "../workspace-hack" }
[dev-dependencies]
dotenvy = { workspace = true }
+embedding = { path = "../embedding" }
http-body-util = { workspace = true }
macro_db_migrator = { path = "../macro_db_migrator" }
macro_env = { path = "../macro_env" }
@@ -164,6 +161,7 @@ macro_env = { path = "../macro_env" }
macro_event_broker = { path = "../macro_event_broker" }
mockall = { workspace = true }
rdkafka = { workspace = true }
+rootcause = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
tower = { workspace = true }
diff --git a/crates/documents/src/inbound/axum_router.rs b/crates/documents/src/inbound/axum_router.rs
index 6bc9198a36..ee95962ea8 100644
--- a/crates/documents/src/inbound/axum_router.rs
+++ b/crates/documents/src/inbound/axum_router.rs
@@ -46,6 +46,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use lexical_client::LexicalClient;
+use macro_authorization::{MacroAuthorizationService, MacroAuthorizationState};
use model_error_response::ErrorResponse;
use serde::Deserialize;
use sqlx::PgPool;
@@ -143,11 +144,13 @@ pub type DefaultDocumentCreator<T> = crate::domain::create::DocumentCreator<
>;
/// Router state containing document router dependencies.
-pub struct DocumentRouterState<T, Svc> {
+pub struct DocumentRouterState<T, Svc, Auth> {
/// The document service implementation.
pub service: Arc<T>,
/// The entity access service for authorization.
pub access_service: Arc<Svc>,
+ /// State for request authorization.
+ pub authorization_state: MacroAuthorizationState<Auth>,
/// The database pool (used by middleware for document lookups).
pub pool: PgPool,
/// Task duplicate detection service.
@@ -162,12 +165,13 @@ pub struct DocumentRouterState<T, Svc> {
pub document_permission_jwt_secret: String,
}
-// Manual Clone impl so T and Svc don't need to be Clone (they're behind Arc).
-impl<T, Svc> Clone for DocumentRouterState<T, Svc> {
+// Manual Clone impl so T, Svc, and Auth don't need to be Clone.
+impl<T, Svc, Auth> Clone for DocumentRouterState<T, Svc, Auth> {
fn clone(&self) -> Self {
Self {
service: self.service.clone(),
access_service: self.access_service.clone(),
+ authorization_state: self.authorization_state.clone(),
pool: self.pool.clone(),
task_dedup_service: self.task_dedup_service.clone(),
lexical_client: self.lexical_client.clone(),
@@ -178,12 +182,18 @@ impl<T, Svc> Clone for DocumentRouterState<T, Svc> {
}
}
-impl<T, Svc> FromRef<DocumentRouterState<T, Svc>> for Arc<Svc> {
- fn from_ref(state: &DocumentRouterState<T, Svc>) -> Self {
+impl<T, Svc, Auth> FromRef<DocumentRouterState<T, Svc, Auth>> for Arc<Svc> {
+ fn from_ref(state: &DocumentRouterState<T, Svc, Auth>) -> Self {
state.access_service.clone()
}
}
+impl<T, Svc, Auth> FromRef<DocumentRouterState<T, Svc, Auth>> for MacroAuthorizationState<Auth> {
+ fn from_ref(state: &DocumentRouterState<T, Svc, Auth>) -> Self {
+ state.authorization_state.clone()
+ }
+}
+
/// Path parameters for document endpoints (document_id extraction).
#[derive(Deserialize)]
pub struct Params {
@@ -191,92 +201,96 @@ pub struct Params {
}
/// Build the documents router with all endpoints.
-pub fn documents_router<T, Svc, S>(state: DocumentRouterState<T, Svc>) -> Router<S>
+pub fn documents_router<T, Svc, Auth, S>(state: DocumentRouterState<T, Svc, Auth>) -> Router<S>
where
T: DocumentService + DocumentCreationService,
Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
S: Send + Sync + 'static,
{
// Routes that need ensure_document_exists middleware
let document_id_routes = Router::new()
.route(
"/{document_id}",
- axum::routing::get(get_document_handler::<T, Svc>)
- .patch(edit_document_handler::<T, Svc>)
- .delete(delete_document_handler::<T, Svc>),
+ axum::routing::get(get_document_handler::<T, Svc, Auth>)
+ .patch(edit_document_handler::<T, Svc, Auth>)
+ .delete(delete_document_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/location_v3",
- axum::routing::get(get_location_v3_handler::<T, Svc>),
+ axum::routing::get(get_location_v3_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/branch_name",
- axum::routing::get(get_branch_name_handler::<T, Svc>),
+ axum::routing::get(get_branch_name_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/github_prs",
- axum::routing::get(get_github_pull_requests_handler::<T, Svc>),
+ axum::routing::get(get_github_pull_requests_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/short_id",
- axum::routing::get(get_short_id_handler::<T, Svc>),
+ axum::routing::get(get_short_id_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/copy",
- axum::routing::post(copy_document_handler::<T, Svc>),
+ axum::routing::post(copy_document_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/duplicates",
- axum::routing::get(get_task_duplicates_handler::<T, Svc>),
+ axum::routing::get(get_task_duplicates_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/duplicates/dismiss",
- axum::routing::post(dismiss_task_duplicates_handler::<T, Svc>),
+ axum::routing::post(dismiss_task_duplicates_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/duplicates/{match_id}/delete_this",
- axum::routing::post(delete_this_duplicate_task_handler::<T, Svc>),
+ axum::routing::post(delete_this_duplicate_task_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/cached_snapshot_url",
- axum::routing::get(get_cached_snapshot_url_handler::<T, Svc>),
+ axum::routing::get(get_cached_snapshot_url_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/snapshot",
- axum::routing::put(put_snapshot_handler::<T, Svc>),
+ axum::routing::put(put_snapshot_handler::<T, Svc, Auth>),
)
.route(
"/{document_id}/team_share",
- axum::routing::get(get_team_share_handler::<T, Svc>)
- .put(set_team_share_handler::<T, Svc>),
+ axum::routing::get(get_team_share_handler::<T, Svc, Auth>)
+ .put(set_team_share_handler::<T, Svc, Auth>),
);
let document_id_routes = document_id_routes.layer(middleware::from_fn_with_state(
state.clone(),
- ensure_document_exists,
+ ensure_document_exists::<T, Svc, Auth>,
));
let router = Router::new()
.merge(document_id_routes)
- .route("/", axum::routing::post(create_document_handler::<T, Svc>))
+ .route(
+ "/",
+ axum::routing::post(create_document_handler::<T, Svc, Auth>),
+ )
.route(
"/create_task",
- axum::routing::post(create_task_handler::<T, Svc>),
+ axum::routing::post(create_task_handler::<T, Svc, Auth>),
)
.route(
"/similarity_search",
- axum::routing::post(task_similarity_search_handler::<T, Svc>),
+ axum::routing::post(task_similarity_search_handler::<T, Svc, Auth>),
);
#[cfg(feature = "document_create")]
let router = router
.route(
"/create_markdown",
- axum::routing::post(create_markdown_handler::<T, Svc>),
+ axum::routing::post(create_markdown_handler::<T, Svc, Auth>),
)
.route(
"/create_snippet",
- axum::routing::post(create_snippet_handler::<T, Svc>),
+ axum::routing::post(create_snippet_handler::<T, Svc, Auth>),
);
router.with_state(state)
@@ -293,8 +307,12 @@ pub struct DocumentIdPathParams {
/// Extracts `document_id` from the path and queries the database.
/// Returns 404 if the document does not exist.
#[tracing::instrument(skip(state, request, next))]
-async fn ensure_document_exists<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
+async fn ensure_document_exists<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
Path(Params { document_id }): Path<Params>,
request: Request<Body>,
next: Next,
diff --git a/crates/documents/src/inbound/axum_router/copy_document.rs b/crates/documents/src/inbound/axum_router/copy_document.rs
index e093458d1c..aa9e4f5e99 100644
--- a/crates/documents/src/inbound/axum_router/copy_document.rs
+++ b/crates/documents/src/inbound/axum_router/copy_document.rs
@@ -6,8 +6,8 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use model::document::{DocumentBasic, FileTypeExt};
-use model_user::axum_extractor::MacroUserExtractor;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use super::{DocumentRouterState, Params};
@@ -38,11 +38,15 @@ use crate::domain::ports::DocumentService;
(status = 500, body = model_error_response::ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, access, user_context, document_context, req), fields(user_id=%user_context.macro_user_id, document_version_id=?params.version_id))]
-pub async fn copy_document_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
- user_context: MacroUserExtractor,
+#[tracing::instrument(skip(state, access, user, document_context, req), fields(user_id=%user.macro_user_id, document_version_id=?params.version_id))]
+pub async fn copy_document_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
Query(params): Query<CopyDocumentQueryParams>,
@@ -57,7 +61,7 @@ pub async fn copy_document_handler<T: DocumentService, Svc: EntityAccessService>
.copy_document(
access.entity_access_receipt,
document_context.0,
- user_context.macro_user_id,
+ user.macro_user_id,
req.document_name,
params.version_id,
req.version_id,
diff --git a/crates/documents/src/inbound/axum_router/create_document.rs b/crates/documents/src/inbound/axum_router/create_document.rs
index b32d5d5cdf..a4e27aa153 100644
--- a/crates/documents/src/inbound/axum_router/create_document.rs
+++ b/crates/documents/src/inbound/axum_router/create_document.rs
@@ -2,12 +2,12 @@
use std::str::FromStr;
-use axum::{Extension, Json, extract::State};
+use axum::{Json, extract::State};
use entity_access::domain::ports::EntityAccessService;
-use entity_access::inbound::axum_extractors::{InternalUser, ProjectBodyAccessLevelExtractor};
+use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractorV2;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use model::document::response::CreateDocumentRequest;
use model::document::{FileType, FileTypeExt};
-use model_user::axum_extractor::MacroUserExtractor;
use models_permissions::share_permission::access_level::EditAccessLevel;
use super::DocumentRouterState;
@@ -34,17 +34,20 @@ use crate::domain::response::CreateDocumentResponse;
(status = 500, body = model_error_response::ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, project), fields(user_id=?user_context.macro_user_id))]
-pub async fn create_document_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- internal_user: Option<Extension<InternalUser>>,
- user_context: MacroUserExtractor,
- project: ProjectBodyAccessLevelExtractor<EditAccessLevel, CreateDocumentRequest, Svc>,
+#[tracing::instrument(skip(state, user, project), fields(user_id=?user.macro_user_id))]
+pub async fn create_document_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
+ project: ProjectBodyAccessLevelExtractorV2<EditAccessLevel, CreateDocumentRequest, Svc, Auth>,
) -> Result<Json<CreateDocumentResponse>, DocumentError> {
let req = project.into_inner();
// Email linking is internal only
- if req.email_attachment_id.is_some() && internal_user.is_none() {
+ if req.email_attachment_id.is_some() && !user.is_internal_access {
return Err(DocumentError::Unauthorized);
}
@@ -85,7 +88,7 @@ pub async fn create_document_handler<T: DocumentService, Svc: EntityAccessServic
id: req.id,
sha: req.sha,
document_name,
- user_id: user_context.macro_user_id.clone(),
+ user_id: user.macro_user_id.clone(),
file_type,
project_id: req.project_id,
team_id,
@@ -99,7 +102,7 @@ pub async fn create_document_handler<T: DocumentService, Svc: EntityAccessServic
let response_data = state
.service
- .create_document(user_context.macro_user_id, args, req.job_id)
+ .create_document(user.macro_user_id, args, req.job_id)
.await?;
Ok(Json(CreateDocumentResponse {
diff --git a/crates/documents/src/inbound/axum_router/create_markdown.rs b/crates/documents/src/inbound/axum_router/create_markdown.rs
index c04f75496d..a9688250a2 100644
--- a/crates/documents/src/inbound/axum_router/create_markdown.rs
+++ b/crates/documents/src/inbound/axum_router/create_markdown.rs
@@ -2,8 +2,8 @@
use axum::{Json, extract::State};
use entity_access::domain::ports::EntityAccessService;
-use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractor;
-use model_user::axum_extractor::MacroUserExtractor;
+use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractorV2;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use models_permissions::share_permission::access_level::{AccessLevel, EditAccessLevel};
use super::DocumentRouterState;
@@ -29,14 +29,20 @@ use crate::domain::ports::create::DocumentCreationService;
(status = 500, body = model_error_response::ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, project), fields(user_id=?user_context.macro_user_id))]
+#[tracing::instrument(skip(state, user, project), fields(user_id=?user.macro_user_id))]
pub async fn create_markdown_handler<
T: DocumentService + DocumentCreationService,
Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
>(
- State(state): State<DocumentRouterState<T, Svc>>,
- user_context: MacroUserExtractor,
- project: ProjectBodyAccessLevelExtractor<EditAccessLevel, CreateMarkdownDocumentRequest, Svc>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
+ project: ProjectBodyAccessLevelExtractorV2<
+ EditAccessLevel,
+ CreateMarkdownDocumentRequest,
+ Svc,
+ Auth,
+ >,
) -> Result<Json<CreateMarkdownDocumentResponse>, DocumentError> {
let req = project.into_inner();
@@ -51,7 +57,7 @@ pub async fn create_markdown_handler<
let created = state
.creator
.create_markdown_text(
- user_context.macro_user_id.clone(),
+ user.macro_user_id.clone(),
NewMarkdownTextDocument {
metadata: metadata.build(),
markdown: req.markdown.unwrap_or_default(),
@@ -69,7 +75,7 @@ pub async fn create_markdown_handler<
.clone();
let token = encode_permission_token(
- Some(user_context.macro_user_id.as_ref().to_string()),
+ Some(user.macro_user_id.as_ref().to_string()),
document_id.clone(),
AccessLevel::Edit,
&state.document_permission_jwt_secret,
diff --git a/crates/documents/src/inbound/axum_router/create_snippet.rs b/crates/documents/src/inbound/axum_router/create_snippet.rs
index 6959234032..e4e5608737 100644
--- a/crates/documents/src/inbound/axum_router/create_snippet.rs
+++ b/crates/documents/src/inbound/axum_router/create_snippet.rs
@@ -2,8 +2,8 @@
use axum::{Json, extract::State};
use entity_access::domain::ports::EntityAccessService;
-use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractor;
-use model_user::axum_extractor::MacroUserExtractor;
+use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractorV2;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use models_permissions::share_permission::access_level::EditAccessLevel;
use super::DocumentRouterState;
@@ -27,14 +27,15 @@ use crate::domain::ports::create::DocumentCreationService;
(status = 500, body = model_error_response::ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, project), fields(user_id=?user_context.macro_user_id))]
+#[tracing::instrument(skip(state, user, project), fields(user_id=?user.macro_user_id))]
pub async fn create_snippet_handler<
T: DocumentService + DocumentCreationService,
Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
>(
- State(state): State<DocumentRouterState<T, Svc>>,
- user_context: MacroUserExtractor,
- project: ProjectBodyAccessLevelExtractor<EditAccessLevel, CreateSnippetRequest, Svc>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
+ project: ProjectBodyAccessLevelExtractorV2<EditAccessLevel, CreateSnippetRequest, Svc, Auth>,
) -> Result<Json<CreateSnippetResponse>, DocumentError> {
let req = project.into_inner();
@@ -46,7 +47,7 @@ pub async fn create_snippet_handler<
let created = state
.creator
.create_markdown_text(
- user_context.macro_user_id,
+ user.macro_user_id,
NewMarkdownTextDocument {
metadata: metadata.build(),
markdown: req.markdown.unwrap_or_default(),
diff --git a/crates/documents/src/inbound/axum_router/create_task.rs b/crates/documents/src/inbound/axum_router/create_task.rs
index cc71a656ad..3a08885bf6 100644
--- a/crates/documents/src/inbound/axum_router/create_task.rs
+++ b/crates/documents/src/inbound/axum_router/create_task.rs
@@ -4,9 +4,9 @@ use axum::{Json, extract::State};
use entity_access::domain::models::MemberTeamRole;
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::{
- OptionalMacroUserTeamExtractor, ProjectBodyAccessLevelExtractor,
+ OptionalMacroUserTeamExtractorV2, ProjectBodyAccessLevelExtractorV2,
};
-use model_user::axum_extractor::MacroUserExtractor;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use models_permissions::share_permission::access_level::{AccessLevel, EditAccessLevel};
use super::DocumentRouterState;
@@ -33,20 +33,21 @@ use super::task_duplicates::spawn_task_duplicate_detection;
(status = 500, body = model_error_response::ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, optional_team, project), fields(user_id=?user_context.macro_user_id))]
+#[tracing::instrument(skip(state, user, optional_team, project), fields(user_id=?user.macro_user_id))]
pub async fn create_task_handler<
T: DocumentService + DocumentCreationService,
Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
>(
- State(state): State<DocumentRouterState<T, Svc>>,
- user_context: MacroUserExtractor,
- optional_team: OptionalMacroUserTeamExtractor<MemberTeamRole, Svc>,
- project: ProjectBodyAccessLevelExtractor<EditAccessLevel, CreateTaskRequest, Svc>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
+ optional_team: OptionalMacroUserTeamExtractorV2<MemberTeamRole, Svc, Auth>,
+ project: ProjectBodyAccessLevelExtractorV2<EditAccessLevel, CreateTaskRequest, Svc, Auth>,
) -> Result<Json<CreateTaskResponse>, DocumentError> {
let req = project.into_inner();
let task_name = req.task_name.clone();
let markdown = req.markdown.clone().unwrap_or_default();
- let owner = user_context.macro_user_id.as_ref().to_string();
+ let owner = user.macro_user_id.as_ref().to_string();
let mut metadata = NewDocumentMetadata::builder(task_name.clone());
if let Some(project_id) = req.project_id {
@@ -64,7 +65,7 @@ pub async fn create_task_handler<
let created = state
.creator
.create_markdown_text(
- user_context.macro_user_id.clone(),
+ user.macro_user_id.clone(),
NewMarkdownTextDocument {
metadata: metadata.build(),
markdown,
@@ -94,7 +95,7 @@ pub async fn create_task_handler<
);
let token = encode_permission_token(
- Some(user_context.macro_user_id.as_ref().to_string()),
+ Some(user.macro_user_id.as_ref().to_string()),
document_id.clone(),
AccessLevel::Edit,
&state.document_permission_jwt_secret,
diff --git a/crates/documents/src/inbound/axum_router/delete_document.rs b/crates/documents/src/inbound/axum_router/delete_document.rs
index d03cdcaa10..db15177e6f 100644
--- a/crates/documents/src/inbound/axum_router/delete_document.rs
+++ b/crates/documents/src/inbound/axum_router/delete_document.rs
@@ -6,9 +6,9 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use model::document::DocumentBasic;
use model::response::GenericSuccessResponse;
-use model::user::UserContext;
use models_permissions::share_permission::access_level::OwnerAccessLevel;
use super::{DocumentRouterState, Params};
@@ -34,10 +34,13 @@ use crate::domain::ports::DocumentService;
)
)]
#[tracing::instrument(skip(state, access, doc), err)]
-pub async fn delete_document_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<OwnerAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
- user_context: Extension<UserContext>,
+pub async fn delete_document_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<OwnerAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
doc: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<GenericSuccessResponse>, DocumentError> {
diff --git a/crates/documents/src/inbound/axum_router/edit_document.rs b/crates/documents/src/inbound/axum_router/edit_document.rs
index b0ef579c35..e22f690b3b 100644
--- a/crates/documents/src/inbound/axum_router/edit_document.rs
+++ b/crates/documents/src/inbound/axum_router/edit_document.rs
@@ -6,8 +6,9 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::{
- DocumentAccessExtractor, ProjectBodyAccessLevelExtractor,
+ DocumentAccessExtractor, ProjectBodyAccessLevelExtractorV2,
};
+use macro_authorization::MacroAuthorizationService;
use model::document::DocumentBasic;
use model::response::GenericSuccessResponse;
use models_permissions::share_permission::access_level::EditAccessLevel;
@@ -48,12 +49,16 @@ pub struct EditDocumentResponse {
)
)]
#[tracing::instrument(skip(state, access, doc, project), err)]
-pub async fn edit_document_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<EditAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn edit_document_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<EditAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
doc: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
- project: ProjectBodyAccessLevelExtractor<EditAccessLevel, EditDocumentServiceArgs, Svc>,
+ project: ProjectBodyAccessLevelExtractorV2<EditAccessLevel, EditDocumentServiceArgs, Svc, Auth>,
) -> Result<Json<EditDocumentResponse>, DocumentError> {
if doc.deleted_at.is_some() {
return Err(DocumentError::BadRequest(
diff --git a/crates/documents/src/inbound/axum_router/get_branch_name.rs b/crates/documents/src/inbound/axum_router/get_branch_name.rs
index 926564c53c..110afe368a 100644
--- a/crates/documents/src/inbound/axum_router/get_branch_name.rs
+++ b/crates/documents/src/inbound/axum_router/get_branch_name.rs
@@ -6,6 +6,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use super::{DocumentRouterState, Params};
@@ -44,9 +45,13 @@ pub struct BranchNameResponse {
)
)]
#[tracing::instrument(skip(state, access), err)]
-pub async fn get_branch_name_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
+pub async fn get_branch_name_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<BranchNameResponse>, DocumentError> {
let receipt = access.entity_access_receipt;
diff --git a/crates/documents/src/inbound/axum_router/get_cached_snapshot_url.rs b/crates/documents/src/inbound/axum_router/get_cached_snapshot_url.rs
index fdf1dc0c20..68e8deb5b8 100644
--- a/crates/documents/src/inbound/axum_router/get_cached_snapshot_url.rs
+++ b/crates/documents/src/inbound/axum_router/get_cached_snapshot_url.rs
@@ -8,6 +8,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use super::{DocumentRouterState, Params};
@@ -15,9 +16,13 @@ use crate::domain::ports::DocumentService;
/// Proxies the cached Loro snapshot bytes, or 404 if none exists.
#[tracing::instrument(skip(state, _access))]
-pub async fn get_cached_snapshot_url_handler<T: DocumentService, Svc: EntityAccessService>(
- _access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn get_cached_snapshot_url_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ _access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
match state.service.get_snapshot(&document_id).await {
diff --git a/crates/documents/src/inbound/axum_router/get_document.rs b/crates/documents/src/inbound/axum_router/get_document.rs
index 4ad18530f1..b69d6b7de8 100644
--- a/crates/documents/src/inbound/axum_router/get_document.rs
+++ b/crates/documents/src/inbound/axum_router/get_document.rs
@@ -1,12 +1,12 @@
//! Handler for `GET /documents/{document_id}`.
use axum::{
- Extension, Json,
+ Json,
extract::{Path, State},
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
-use model::user::UserContext;
+use macro_authorization::MacroAuthorizationService;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use super::{DocumentRouterState, Params};
@@ -33,10 +33,13 @@ use crate::domain::response::GetDocumentResponse;
)
)]
#[tracing::instrument(skip(state, access), err)]
-pub async fn get_document_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- user_context: Extension<UserContext>,
+pub async fn get_document_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<GetDocumentResponse>, DocumentError> {
let response_data = state
diff --git a/crates/documents/src/inbound/axum_router/get_github_pull_requests.rs b/crates/documents/src/inbound/axum_router/get_github_pull_requests.rs
index 9ac7b36c02..1a01f66c66 100644
--- a/crates/documents/src/inbound/axum_router/get_github_pull_requests.rs
+++ b/crates/documents/src/inbound/axum_router/get_github_pull_requests.rs
@@ -6,6 +6,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use model::document::DocumentBasic;
use models_permissions::share_permission::access_level::ViewAccessLevel;
@@ -34,9 +35,13 @@ use crate::domain::ports::DocumentService;
)
)]
#[tracing::instrument(skip(state, access, document_context), err)]
-pub async fn get_github_pull_requests_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn get_github_pull_requests_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
Extension(document_context): Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<GithubPullRequestsResponse>, DocumentError> {
diff --git a/crates/documents/src/inbound/axum_router/get_location.rs b/crates/documents/src/inbound/axum_router/get_location.rs
index eb91e926c7..06ec8b8669 100644
--- a/crates/documents/src/inbound/axum_router/get_location.rs
+++ b/crates/documents/src/inbound/axum_router/get_location.rs
@@ -7,6 +7,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use model::document::DocumentBasic;
use models_permissions::share_permission::access_level::ViewAccessLevel;
@@ -38,9 +39,13 @@ use crate::domain::response::LocationResponseV3;
)
)]
#[tracing::instrument(skip(state, access, document_context), err)]
-pub async fn get_location_v3_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn get_location_v3_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
Extension(document_context): Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
Query(params): Query<LocationQueryParams>,
diff --git a/crates/documents/src/inbound/axum_router/get_short_id.rs b/crates/documents/src/inbound/axum_router/get_short_id.rs
index b32782b9c2..ccae515b3c 100644
--- a/crates/documents/src/inbound/axum_router/get_short_id.rs
+++ b/crates/documents/src/inbound/axum_router/get_short_id.rs
@@ -6,6 +6,7 @@ use axum::{
};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use super::{DocumentRouterState, Params};
@@ -39,9 +40,13 @@ pub struct ShortIdResponse {
)
)]
#[tracing::instrument(skip(state, access), err)]
-pub async fn get_short_id_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
+pub async fn get_short_id_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<ShortIdResponse>, DocumentError> {
let short_id = state
diff --git a/crates/documents/src/inbound/axum_router/put_snapshot.rs b/crates/documents/src/inbound/axum_router/put_snapshot.rs
index cb11d6898c..cd9bd6243c 100644
--- a/crates/documents/src/inbound/axum_router/put_snapshot.rs
+++ b/crates/documents/src/inbound/axum_router/put_snapshot.rs
@@ -7,14 +7,20 @@ use axum::{
response::IntoResponse,
};
use entity_access::domain::ports::EntityAccessService;
+use macro_authorization::{InternalMacroAuthorizationExtractor, MacroAuthorizationService};
use super::{DocumentRouterState, Params};
use crate::domain::ports::DocumentService;
/// Accepts raw snapshot bytes and stores them in S3.
-#[tracing::instrument(skip(state, body))]
-pub async fn put_snapshot_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
+#[tracing::instrument(skip(state, body, _internal_authorization))]
+pub async fn put_snapshot_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ _internal_authorization: InternalMacroAuthorizationExtractor<Auth>,
Path(Params { document_id }): Path<Params>,
body: Bytes,
) -> impl IntoResponse {
diff --git a/crates/documents/src/inbound/axum_router/task_duplicates.rs b/crates/documents/src/inbound/axum_router/task_duplicates.rs
index 57754d7207..0cb0b83f14 100644
--- a/crates/documents/src/inbound/axum_router/task_duplicates.rs
+++ b/crates/documents/src/inbound/axum_router/task_duplicates.rs
@@ -9,12 +9,12 @@ use axum::{
use entity_access::domain::models::MemberTeamRole;
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::{
- DocumentAccessExtractor, OptionalMacroUserTeamExtractor,
+ DocumentAccessExtractor, OptionalMacroUserTeamExtractorV2,
};
use lexical_client::LexicalClient;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService};
use model::document::DocumentBasic;
use model::response::GenericSuccessResponse;
-use model_user::axum_extractor::MacroUserExtractor;
use models_permissions::share_permission::access_level::{OwnerAccessLevel, ViewAccessLevel};
use serde::{Deserialize, Serialize};
use task_dedup::{
@@ -71,9 +71,13 @@ pub struct TaskSimilaritySearchResponse {
/// Handler for `GET /documents/{document_id}/duplicates`.
#[tracing::instrument(skip(state, _access), err)]
-pub async fn get_task_duplicates_handler<T: DocumentService, Svc: EntityAccessService>(
- _access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn get_task_duplicates_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ _access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
Path(Params { document_id }): Path<Params>,
) -> Result<Json<TaskDuplicatesResponse>, DocumentError> {
let duplicates = state
@@ -101,10 +105,14 @@ pub async fn get_task_duplicates_handler<T: DocumentService, Svc: EntityAccessSe
)
)]
#[tracing::instrument(skip(state, user, optional_team, request), fields(user_id=?user.macro_user_id), err)]
-pub async fn task_similarity_search_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- user: MacroUserExtractor,
- optional_team: OptionalMacroUserTeamExtractor<MemberTeamRole, Svc>,
+pub async fn task_similarity_search_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
+ optional_team: OptionalMacroUserTeamExtractorV2<MemberTeamRole, Svc, Auth>,
Json(request): Json<TaskSimilaritySearchRequest>,
) -> Result<Json<TaskSimilaritySearchResponse>, DocumentError> {
// Search the user's whole team, not just their own tasks: a duplicate is a
@@ -134,10 +142,14 @@ pub async fn task_similarity_search_handler<T: DocumentService, Svc: EntityAcces
/// Handler for `POST /documents/{document_id}/duplicates/dismiss`.
#[tracing::instrument(skip(state, _access, user), err)]
-pub async fn dismiss_task_duplicates_handler<T: DocumentService, Svc: EntityAccessService>(
- _access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
- user: model_user::axum_extractor::MacroUserExtractor,
+pub async fn dismiss_task_duplicates_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ _access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ user: MacroAuthorizationExtractor<Auth>,
Path(Params { document_id }): Path<Params>,
Json(request): Json<DismissTaskDuplicatesRequest>,
) -> Result<Json<GenericSuccessResponse>, DocumentError> {
@@ -156,9 +168,13 @@ pub async fn dismiss_task_duplicates_handler<T: DocumentService, Svc: EntityAcce
/// Handler for `POST /documents/{document_id}/duplicates/{match_id}/delete_this`.
#[tracing::instrument(skip(state, access, doc), err)]
-pub async fn delete_this_duplicate_task_handler<T: DocumentService, Svc: EntityAccessService>(
- access: DocumentAccessExtractor<OwnerAccessLevel, Svc>,
- State(state): State<DocumentRouterState<T, Svc>>,
+pub async fn delete_this_duplicate_task_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ access: DocumentAccessExtractor<OwnerAccessLevel, Svc, Auth>,
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
doc: Extension<DocumentBasic>,
Path((document_id, match_id)): Path<(String, Uuid)>,
) -> Result<Json<GenericSuccessResponse>, DocumentError> {
diff --git a/crates/documents/src/inbound/axum_router/team_share.rs b/crates/documents/src/inbound/axum_router/team_share.rs
index c2b8e45c84..a489ecdf22 100644
--- a/crates/documents/src/inbound/axum_router/team_share.rs
+++ b/crates/documents/src/inbound/axum_router/team_share.rs
@@ -3,6 +3,7 @@
use axum::{Json, extract::State};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationService;
use models_permissions::share_permission::access_level::{EditAccessLevel, ViewAccessLevel};
use super::DocumentRouterState;
@@ -30,9 +31,13 @@ use crate::domain::ports::DocumentService;
)
)]
#[tracing::instrument(skip(state, access), err)]
-pub async fn get_team_share_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- access: DocumentAccessExtractor<ViewAccessLevel, Svc>,
+pub async fn get_team_share_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ access: DocumentAccessExtractor<ViewAccessLevel, Svc, Auth>,
) -> Result<Json<DocumentTeamShareResponse>, DocumentError> {
let response = state
.service
@@ -63,9 +68,13 @@ pub async fn get_team_share_handler<T: DocumentService, Svc: EntityAccessService
)
)]
#[tracing::instrument(skip(state, access, request), err)]
-pub async fn set_team_share_handler<T: DocumentService, Svc: EntityAccessService>(
- State(state): State<DocumentRouterState<T, Svc>>,
- access: DocumentAccessExtractor<EditAccessLevel, Svc>,
+pub async fn set_team_share_handler<
+ T: DocumentService,
+ Svc: EntityAccessService,
+ Auth: MacroAuthorizationService,
+>(
+ State(state): State<DocumentRouterState<T, Svc, Auth>>,
+ access: DocumentAccessExtractor<EditAccessLevel, Svc, Auth>,
Json(request): Json<SetDocumentTeamShareRequest>,
) -> Result<Json<DocumentTeamShareResponse>, DocumentError> {
let response = state
diff --git a/crates/documents/src/inbound/axum_router/tests.rs b/crates/documents/src/inbound/axum_router/tests.rs
index bd65af6757..c3534001f7 100644
--- a/crates/documents/src/inbound/axum_router/tests.rs
+++ b/crates/documents/src/inbound/axum_router/tests.rs
@@ -1,4 +1,776 @@
-// Placeholder for handler integration tests.
-// Full integration tests would require mocking the entity access service
-// and document service, constructing a test router, and making HTTP requests.
-// For now, the core logic is tested via the domain service and outbound repo tests.
+use std::sync::{Arc, Mutex};
+
+use async_trait::async_trait;
+use axum::{
+ Router,
+ body::Body,
+ http::{Request, StatusCode, request::Builder},
+};
+use embedding::embedding_provider::openai::TextEmbedding3Small;
+use entity_access::domain::{
+ models::{
+ AccessError, AccessLevel, BotId, CallChannelInfo, EntityAccessReceipt, EntityPermission,
+ EntityType, RequiredPermission, UserTeamInfo,
+ },
+ ports::EntityAccessService,
+};
+use http_body_util::BodyExt;
+use lexical_client::LexicalClient;
+use macro_authorization::{
+ INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER, InternalIdentityClaims,
+ MacroAuthorizationError, MacroAuthorizationService, MacroAuthorizationState,
+};
+use macro_user_id::{lowercased::Lowercase, user_id::MacroUserId, user_id::MacroUserIdStr};
+use model::{
+ document::{DocumentBasic, response::DocumentResponseMetadata},
+ sync_service::SyncServiceVersionID,
+};
+use model_entity::Entity;
+use model_user::UserContext;
+use rootcause::Report;
+use serde_json::{Value, json};
+use sqlx::postgres::PgPoolOptions;
+use sync_service_client::SyncServiceClient;
+use task_dedup::{
+ JudgeResult, PgTaskDedupService,
+ domain::ports::{TaskDedupNotifier, TaskDuplicateJudge},
+ outbound::{
+ cohere::CohereReranker,
+ postgres::{PgTaskMatchRepo, PgTaskVectorDb},
+ },
+};
+use tower::ServiceExt;
+use uuid::Uuid;
+
+use super::{DocumentRouterState, documents_router};
+use crate::{
+ domain::{
+ content::DocumentContent,
+ create::DocumentCreator,
+ models::{
+ CommentThread, CreateDocumentRepoArgs, CreateTaskRequest, DocumentError,
+ DocumentTeamShareResponse, EditDocumentServiceArgs, GithubPullRequestsResponse,
+ LocationQueryParams, TaskBranchName,
+ },
+ ports::{DocumentService, create::DocumentCreationService},
+ response::{
+ CreateDocumentResponseData, DocumentResponse, DocumentResponseMetadataWithContent,
+ GetDocumentResponseData, LocationResponseV3,
+ },
+ },
+ outbound::{
+ document_bytes_upload::ReqwestDocumentBytesUploader,
+ markdown_init::LexicalSyncMarkdownInitializer,
+ },
+};
+
+const JWT_TOKEN: &str = "valid-jwt";
+const JWT_USER_ID: &str = "macro|[email protected]";
+const STANDARD_INTERNAL_KEY: &str = "standard-internal-key";
+const STANDARD_INTERNAL_USER_ID: &str = "macro|[email protected]";
+const LEGACY_INTERNAL_KEY: &str = "legacy-internal-key";
+const LEGACY_INTERNAL_USER_ID: &str = "macro|[email protected]";
+const LEGACY_INTERNAL_API_KEY_HEADER: &str = "x-document-storage-service-auth-key";
+const LEGACY_INTERNAL_USER_ID_HEADER: &str = "x-document-storage-service-user-id";
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+struct CreateDocumentCall {
+ user_id: String,
+ email_attachment_id: Option<Uuid>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+struct UploadSnapshotCall {
+ document_id: String,
+ bytes: Vec<u8>,
+}
+
+#[derive(Default)]
+struct FakeDocumentService {
+ create_calls: Mutex<Vec<CreateDocumentCall>>,
+ upload_snapshot_calls: Mutex<Vec<UploadSnapshotCall>>,
+}
+
+impl FakeDocumentService {
+ fn create_calls(&self) -> Vec<CreateDocumentCall> {
+ self.create_calls
+ .lock()
+ .expect("create calls lock poisoned")
+ .clone()
+ }
+
+ fn upload_snapshot_calls(&self) -> Vec<UploadSnapshotCall> {
+ self.upload_snapshot_calls
+ .lock()
+ .expect("upload snapshot calls lock poisoned")
+ .clone()
+ }
+}
+
+impl DocumentService for FakeDocumentService {
+ async fn internal_get_basic_document(
+ &self,
+ document_id: &str,
+ ) -> Result<DocumentBasic, DocumentError> {
+ Ok(DocumentBasic {
+ document_id: document_id.to_string(),
+ document_name: "test document".to_string(),
+ owner: MacroUserIdStr::try_from(JWT_USER_ID.to_string())
+ .expect("test user id should be valid"),
+ file_type: Some("pdf".to_string()),
+ sub_type: None,
+ branched_from_id: None,
+ branched_from_version_id: None,
+ document_family_id: None,
+ project_id: None,
+ deleted_at: None,
+ })
+ }
+
+ async fn get_document(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ ) -> Result<GetDocumentResponseData, DocumentError> {
+ panic!("unexpected get_document call")
+ }
+
+ async fn get_document_location(
+ &self,
+ _document_context: &DocumentBasic,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ _params: LocationQueryParams,
+ ) -> Result<LocationResponseV3, DocumentError> {
+ panic!("unexpected get_document_location call")
+ }
+
+ async fn delete_document(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<
+ entity_access::domain::models::OwnerAccessLevel,
+ >,
+ _project_id: Option<String>,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected delete_document call")
+ }
+
+ async fn get_document_text(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ ) -> Result<String, DocumentError> {
+ panic!("unexpected get_document_text call")
+ }
+
+ async fn get_document_comments(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ ) -> Result<Vec<CommentThread>, DocumentError> {
+ panic!("unexpected get_document_comments call")
+ }
+
+ async fn create_document(
+ &self,
+ user_id: MacroUserIdStr<'static>,
+ args: CreateDocumentRepoArgs,
+ _job_id: Option<String>,
+ ) -> Result<CreateDocumentResponseData, DocumentError> {
+ self.create_calls
+ .lock()
+ .expect("create calls lock poisoned")
+ .push(CreateDocumentCall {
+ user_id: user_id.as_ref().to_string(),
+ email_attachment_id: args.email_attachment_id,
+ });
+
+ Ok(create_document_response(user_id))
+ }
+
+ async fn get_document_content(
+ &self,
+ _document_context: &DocumentBasic,
+ ) -> Result<DocumentContent, DocumentError> {
+ panic!("unexpected get_document_content call")
+ }
+
+ async fn get_short_id(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ ) -> Result<String, DocumentError> {
+ panic!("unexpected get_short_id call")
+ }
+
+ async fn get_task_branch_name(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ _document_name: String,
+ ) -> Result<TaskBranchName, DocumentError> {
+ panic!("unexpected get_task_branch_name call")
+ }
+
+ async fn get_task_github_pull_requests(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ _document_context: &DocumentBasic,
+ ) -> Result<GithubPullRequestsResponse, DocumentError> {
+ panic!("unexpected get_task_github_pull_requests call")
+ }
+
+ async fn edit_document(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::EditAccessLevel>,
+ _document_context: DocumentBasic,
+ _args: EditDocumentServiceArgs,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected edit_document call")
+ }
+
+ async fn update_task_status(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::EditAccessLevel>,
+ _status: &str,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected update_task_status call")
+ }
+
+ async fn copy_document(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ _document_context: DocumentBasic,
+ _user_id: MacroUserIdStr<'static>,
+ _document_name: String,
+ _query_version_id: Option<i64>,
+ _sync_version_id: Option<SyncServiceVersionID>,
+ ) -> Result<DocumentResponse, DocumentError> {
+ panic!("unexpected copy_document call")
+ }
+
+ async fn get_project_name(&self, _project_id: &str) -> Result<String, DocumentError> {
+ panic!("unexpected get_project_name call")
+ }
+
+ async fn get_project_children(
+ &self,
+ _project_id: &str,
+ ) -> Result<Vec<Entity<'static>>, DocumentError> {
+ panic!("unexpected get_project_children call")
+ }
+
+ async fn handle_task_properties(
+ &self,
+ _user_id: MacroUserIdStr<'static>,
+ _document_id: &str,
+ _request: &CreateTaskRequest,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected handle_task_properties call")
+ }
+
+ async fn get_snapshot(&self, _document_id: &str) -> anyhow::Result<Option<Vec<u8>>> {
+ panic!("unexpected get_snapshot call")
+ }
+
+ async fn upload_snapshot(&self, document_id: &str, bytes: Vec<u8>) -> anyhow::Result<()> {
+ self.upload_snapshot_calls
+ .lock()
+ .expect("upload snapshot calls lock poisoned")
+ .push(UploadSnapshotCall {
+ document_id: document_id.to_string(),
+ bytes,
+ });
+ Ok(())
+ }
+
+ async fn get_team_share(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::ViewAccessLevel>,
+ ) -> Result<DocumentTeamShareResponse, DocumentError> {
+ panic!("unexpected get_team_share call")
+ }
+
+ async fn set_team_share(
+ &self,
+ _entity_access_receipt: EntityAccessReceipt<entity_access::domain::models::EditAccessLevel>,
+ _share: bool,
+ ) -> Result<DocumentTeamShareResponse, DocumentError> {
+ panic!("unexpected set_team_share call")
+ }
+}
+
+impl DocumentCreationService for FakeDocumentService {
+ async fn create_document(
+ &self,
+ user_id: MacroUserIdStr<'static>,
+ args: CreateDocumentRepoArgs,
+ job_id: Option<String>,
+ ) -> Result<CreateDocumentResponseData, DocumentError> {
+ DocumentService::create_document(self, user_id, args, job_id).await
+ }
+
+ async fn handle_task_properties(
+ &self,
+ _user_id: MacroUserIdStr<'static>,
+ _document_id: &str,
+ _request: &CreateTaskRequest,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected creation handle_task_properties call")
+ }
+
+ async fn mark_document_uploaded(&self, _document_id: &str) -> Result<(), DocumentError> {
+ panic!("unexpected mark_document_uploaded call")
+ }
+
+ async fn set_document_content(
+ &self,
+ _document_id: &str,
+ _content: DocumentContent,
+ ) -> Result<(), DocumentError> {
+ panic!("unexpected set_document_content call")
+ }
+
+ async fn cleanup_created_document(&self, _document_id: &str) {
+ panic!("unexpected cleanup_created_document call")
+ }
+}
+
+fn create_document_response(user_id: MacroUserIdStr<'static>) -> CreateDocumentResponseData {
+ CreateDocumentResponseData {
+ document_response: DocumentResponse {
+ document_metadata: DocumentResponseMetadataWithContent::new(
+ DocumentResponseMetadata {
+ document_id: "created-document".to_string(),
+ document_version_id: 1,
+ owner: user_id,
+ document_name: "test document".to_string(),
+ file_type: Some("pdf".to_string()),
+ sha: Some("test-sha".to_string()),
+ branched_from_id: None,
+ branched_from_version_id: None,
+ document_family_id: None,
+ document_bom: None,
+ modification_data: None,
+ created_at: None,
+ updated_at: None,
+ sub_type: None,
+ },
+ DocumentContent::pending(),
+ ),
+ presigned_url: None,
+ },
+ content_type: "application/pdf".to_string(),
+ file_type: Some("pdf".to_string()),
+ }
+}
+
+#[derive(Clone, Default)]
+struct FakeEntityAccessService;
+
+impl EntityAccessService for FakeEntityAccessService {
+ async fn generate_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ _user_org_id: Option<i64>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_entity_access_receipt call")
+ }
+
+ async fn generate_bot_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _bot_id: BotId,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_bot_entity_access_receipt call")
+ }
+
+ async fn get_access_level(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Option<AccessLevel>, AccessError> {
+ panic!("unexpected get_access_level call")
+ }
+
+ async fn check_access(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_access call")
+ }
+
+ async fn check_public_access(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_public_access call")
+ }
+
+ async fn get_entity_permission(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _user_org_id: Option<i64>,
+ ) -> Result<EntityPermission, AccessError> {
+ panic!("unexpected get_entity_permission call")
+ }
+
+ async fn get_crm_entity_permission_with_team(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<(EntityPermission, Uuid), AccessError> {
+ panic!("unexpected get_crm_entity_permission_with_team call")
+ }
+
+ async fn get_users_by_entity(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Vec<MacroUserIdStr<'static>>, AccessError> {
+ panic!("unexpected get_users_by_entity call")
+ }
+
+ async fn get_call_channel(
+ &self,
+ _call_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel call")
+ }
+
+ async fn get_call_channel_by_channel_id(
+ &self,
+ _channel_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel_by_channel_id call")
+ }
+
+ async fn get_user_team(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ ) -> Result<Option<UserTeamInfo>, AccessError> {
+ panic!("unexpected get_user_team call")
+ }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+enum AuthorizationCall {
+ Jwt(String),
+ Internal {
+ provided_key: String,
+ claims: InternalIdentityClaims,
+ },
+}
+
+#[derive(Clone, Default)]
+struct FakeAuthorizationService {
+ calls: Arc<Mutex<Vec<AuthorizationCall>>>,
+}
+
+impl FakeAuthorizationService {
+ fn calls(&self) -> Vec<AuthorizationCall> {
+ self.calls.lock().expect("auth calls lock poisoned").clone()
+ }
+}
+
+impl MacroAuthorizationService for FakeAuthorizationService {
+ async fn authorize(&self, jwt: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
+ self.calls
+ .lock()
+ .expect("auth calls lock poisoned")
+ .push(AuthorizationCall::Jwt(jwt.to_string()));
+
+ if jwt != JWT_TOKEN {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(user_context(JWT_USER_ID))
+ }
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ self.calls
+ .lock()
+ .expect("auth calls lock poisoned")
+ .push(AuthorizationCall::Internal {
+ provided_key: provided_key.to_string(),
+ claims: claims.clone(),
+ });
+
+ if !matches!(provided_key, STANDARD_INTERNAL_KEY | LEGACY_INTERNAL_KEY) {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(claims.user_id.as_deref().map(user_context))
+ }
+}
+
+fn user_context(user_id: &str) -> UserContext {
+ UserContext {
+ user_id: user_id.to_string(),
+ fusion_user_id: "test-fusion-user".to_string(),
+ permissions: None,
+ organization_id: None,
+ }
+}
+
+struct FakeTaskDuplicateJudge;
+
+#[async_trait]
+impl TaskDuplicateJudge for FakeTaskDuplicateJudge {
+ async fn judge(&self, _left: &str, _right: &str) -> JudgeResult {
+ panic!("unexpected task duplicate judge call")
+ }
+}
+
+struct FakeTaskDedupNotifier;
+
+#[async_trait]
+impl TaskDedupNotifier for FakeTaskDedupNotifier {
+ async fn notify_matches_updated(&self, _document_id: &str) -> anyhow::Result<()> {
+ panic!("unexpected task dedup notifier call")
+ }
+}
+
+fn test_router() -> (Router, Arc<FakeDocumentService>, FakeAuthorizationService) {
+ let pool = PgPoolOptions::new()
+ .connect_lazy("postgres://postgres:postgres@localhost/documents-router-test")
+ .expect("test database URL should be valid");
+ let document_service = Arc::new(FakeDocumentService::default());
+ let authorization_service = FakeAuthorizationService::default();
+ let lexical_client = Arc::new(LexicalClient::new(
+ "unused-internal-key".to_string(),
+ "http://localhost/lexical".to_string(),
+ ));
+ let task_dedup_service = Arc::new(PgTaskDedupService::new(
+ TextEmbedding3Small::new("unused-openai-key"),
+ PgTaskVectorDb::new(pool.clone()),
+ CohereReranker::new("unused-cohere-key"),
+ Arc::new(FakeTaskDuplicateJudge),
+ Arc::new(FakeTaskDedupNotifier),
+ Arc::new(PgTaskMatchRepo::new(pool.clone())),
+ ));
+ let creator = DocumentCreator::new(
+ document_service.clone(),
+ LexicalSyncMarkdownInitializer::new(
+ lexical_client.as_ref().clone(),
+ SyncServiceClient::new(
+ "unused-internal-key".to_string(),
+ "http://localhost/sync".to_string(),
+ ),
+ ),
+ ReqwestDocumentBytesUploader::default(),
+ );
+ let state = DocumentRouterState {
+ service: document_service.clone(),
+ access_service: Arc::new(FakeEntityAccessService),
+ authorization_state: MacroAuthorizationState::new(Arc::new(authorization_service.clone())),
+ pool,
+ task_dedup_service,
+ lexical_client,
+ creator,
+ document_permission_jwt_secret: "unused-jwt-secret".to_string(),
+ };
+ let router = documents_router::<
+ FakeDocumentService,
+ FakeEntityAccessService,
+ FakeAuthorizationService,
+ (),
+ >(state);
+
+ (router, document_service, authorization_service)
+}
+
+fn create_request() -> Builder {
+ Request::post("/").header("content-type", "application/json")
+}
+
+fn request_body(email_attachment_id: Option<Uuid>) -> Body {
+ Body::from(
+ serde_json::to_vec(&json!({
+ "sha": "test-sha",
+ "documentName": "test document.pdf",
+ "fileType": "pdf",
+ "emailAttachmentId": email_attachment_id,
+ }))
+ .expect("request should serialize"),
+ )
+}
+
+fn finish_request(builder: Builder, email_attachment_id: Option<Uuid>) -> Request<Body> {
+ builder
+ .body(request_body(email_attachment_id))
+ .expect("request should build")
+}
+
+async fn send(router: &Router, request: Request<Body>) -> (StatusCode, Value) {
+ let response = router.clone().oneshot(request).await.unwrap();
+ let status = response.status();
+ let bytes = response
+ .into_body()
+ .collect()
+ .await
+ .expect("response body should collect")
+ .to_bytes();
+ let body = serde_json::from_slice(&bytes).expect("response should contain JSON");
+
+ (status, body)
+}
+
+async fn send_status(router: &Router, request: Request<Body>) -> StatusCode {
+ router.clone().oneshot(request).await.unwrap().status()
+}
+
+#[tokio::test]
+async fn snapshot_upload_requires_internal_api_key() {
+ let snapshot = b"snapshot bytes";
+ let (router, document_service, authorization_service) = test_router();
+
+ let jwt_request = Request::put("/snapshot-document/snapshot")
+ .header("authorization", format!("Bearer {JWT_TOKEN}"))
+ .body(Body::from(snapshot.as_slice()))
+ .expect("request should build");
+ assert_eq!(
+ send_status(&router, jwt_request).await,
+ StatusCode::UNAUTHORIZED
+ );
+ assert!(document_service.upload_snapshot_calls().is_empty());
+ assert!(authorization_service.calls().is_empty());
+
+ let internal_request = Request::put("/snapshot-document/snapshot")
+ .header(INTERNAL_API_KEY_HEADER, STANDARD_INTERNAL_KEY)
+ .body(Body::from(snapshot.as_slice()))
+ .expect("request should build");
+ assert_eq!(send_status(&router, internal_request).await, StatusCode::OK);
+ assert_eq!(
+ document_service.upload_snapshot_calls(),
+ [UploadSnapshotCall {
+ document_id: "snapshot-document".to_string(),
+ bytes: snapshot.to_vec(),
+ }]
+ );
+ assert_eq!(
+ authorization_service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: STANDARD_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
+#[tokio::test]
+async fn legacy_internal_headers_reach_the_internal_only_creation_path() {
+ let email_attachment_id = Uuid::new_v4();
+ let (router, document_service, authorization_service) = test_router();
+ let request = finish_request(
+ create_request()
+ .header(LEGACY_INTERNAL_API_KEY_HEADER, LEGACY_INTERNAL_KEY)
+ .header(LEGACY_INTERNAL_USER_ID_HEADER, LEGACY_INTERNAL_USER_ID),
+ Some(email_attachment_id),
+ );
+
+ let (status, _body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(
+ document_service.create_calls(),
+ [CreateDocumentCall {
+ user_id: LEGACY_INTERNAL_USER_ID.to_string(),
+ email_attachment_id: Some(email_attachment_id),
+ }]
+ );
+ assert!(!authorization_service.calls().is_empty());
+ assert!(authorization_service.calls().iter().all(|call| matches!(
+ call,
+ AuthorizationCall::Internal { provided_key, .. }
+ if provided_key == LEGACY_INTERNAL_KEY
+ )));
+}
+
+#[tokio::test]
+async fn standard_internal_headers_reach_the_document_service() {
+ let (router, document_service, authorization_service) = test_router();
+ let request = finish_request(
+ create_request()
+ .header(INTERNAL_API_KEY_HEADER, STANDARD_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID),
+ None,
+ );
+
+ let (status, _body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(
+ document_service.create_calls(),
+ [CreateDocumentCall {
+ user_id: STANDARD_INTERNAL_USER_ID.to_string(),
+ email_attachment_id: None,
+ }]
+ );
+ assert!(!authorization_service.calls().is_empty());
+ assert!(authorization_service.calls().iter().all(|call| matches!(
+ call,
+ AuthorizationCall::Internal { provided_key, .. }
+ if provided_key == STANDARD_INTERNAL_KEY
+ )));
+}
+
+#[tokio::test]
+async fn standard_internal_headers_take_precedence_over_legacy_headers() {
+ let (router, document_service, authorization_service) = test_router();
+ let request = finish_request(
+ create_request()
+ .header(INTERNAL_API_KEY_HEADER, STANDARD_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(LEGACY_INTERNAL_API_KEY_HEADER, LEGACY_INTERNAL_KEY)
+ .header(LEGACY_INTERNAL_USER_ID_HEADER, LEGACY_INTERNAL_USER_ID),
+ None,
+ );
+
+ let (status, _body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(
+ document_service.create_calls(),
+ [CreateDocumentCall {
+ user_id: STANDARD_INTERNAL_USER_ID.to_string(),
+ email_attachment_id: None,
+ }]
+ );
+ assert!(!authorization_service.calls().is_empty());
+ assert!(authorization_service.calls().iter().all(|call| matches!(
+ call,
+ AuthorizationCall::Internal {
+ provided_key,
+ claims: InternalIdentityClaims {
+ user_id: Some(user_id),
+ ..
+ },
+ } if provided_key == STANDARD_INTERNAL_KEY && user_id == STANDARD_INTERNAL_USER_ID
+ )));
+}
+
+#[tokio::test]
+async fn jwt_user_cannot_create_a_document_for_an_email_attachment() {
+ let email_attachment_id = Uuid::new_v4();
+ let (router, document_service, _authorization_service) = test_router();
+ let request = finish_request(
+ create_request().header("authorization", format!("Bearer {JWT_TOKEN}")),
+ Some(email_attachment_id),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert!(document_service.create_calls().is_empty());
+}
diff --git a/crates/entity_access/Cargo.toml b/crates/entity_access/Cargo.toml
index 3982910f95..9d37004884 100644
--- a/crates/entity_access/Cargo.toml
+++ b/crates/entity_access/Cargo.toml
@@ -7,6 +7,7 @@ version = "0.1.0"
[features]
axum = [
"dep:axum",
+ "dep:macro_authorization",
"dep:model",
"dep:model-error-response",
"dep:model_user",
@@ -38,6 +39,7 @@ tokio = { workspace = true, optional = true }
# Axum dependencies (for inbound)
axum = { workspace = true, optional = true }
+macro_authorization = { path = "../macro_authorization", optional = true, default-features = false, features = ["axum"] }
model = { path = "../model", optional = true }
model-error-response = { path = "../model-error-response", optional = true }
model_user = { path = "../model_user", optional = true, features = ["axum"] }
@@ -54,5 +56,7 @@ workspace-hack = { version = "0.1", path = "../workspace-hack" }
cool_asserts = "2"
macro_db_migrator = { path = "../macro_db_migrator" }
mockall = { workspace = true }
+rootcause = { workspace = true }
sqlx = { workspace = true, features = ["postgres", "runtime-tokio-rustls"] }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+tower = { workspace = true }
diff --git a/crates/entity_access/src/inbound/axum_extractors/document.rs b/crates/entity_access/src/inbound/axum_extractors/document.rs
index 8018c9013d..37afdb36f6 100644
--- a/crates/entity_access/src/inbound/axum_extractors/document.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/document.rs
@@ -1,5 +1,8 @@
//! Document access extractor.
+#[cfg(test)]
+mod test;
+
use std::marker::PhantomData;
use std::sync::Arc;
@@ -8,42 +11,42 @@ use axum::{
extract::{FromRef, FromRequestParts},
http::request::Parts,
};
+use macro_authorization::{
+ MacroAuthorizationService, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
+};
use super::{ExtractorError, RequiredPermission};
-use crate::{
- domain::{
- models::{
- AccessLevel, Entity, EntityAccessAuth, EntityAccessReceipt, EntityPermission,
- EntityType,
- },
- ports::EntityAccessService,
+use crate::domain::{
+ models::{
+ AccessLevel, Entity, EntityAccessAuth, EntityAccessReceipt, EntityPermission, EntityType,
},
- inbound::axum_extractors::InternalUser,
+ ports::EntityAccessService,
};
use model::document::DocumentBasic;
-use model_user::axum_extractor::OptionalMacroUserExtractor;
/// Validates that the user has at least the required access level to a document.
///
/// Type parameter `T` specifies the required access level (ViewAccessLevel, EditAccessLevel, etc.)
/// Type parameter `Svc` is the entity access service implementation.
+/// Type parameter `Auth` is the authorization service implementation.
///
/// # Prerequisites
///
-/// - User must be authenticated (MacroUserExtractor in extensions)
-/// - Document context must be loaded (DocumentBasic in extensions)
+/// - Document context must be loaded (`DocumentBasic` in extensions)
#[derive(Debug)]
-pub struct DocumentAccessExtractor<T: RequiredPermission, Svc> {
+pub struct DocumentAccessExtractor<T: RequiredPermission, Svc, Auth> {
/// The entity access receipt
pub entity_access_receipt: EntityAccessReceipt<T>,
- _marker: PhantomData<(T, Svc)>,
+ _marker: PhantomData<(T, Svc, Auth)>,
}
-impl<T, S, Svc> FromRequestParts<S> for DocumentAccessExtractor<T, Svc>
+impl<T, S, Svc, Auth> FromRequestParts<S> for DocumentAccessExtractor<T, Svc, Auth>
where
T: RequiredPermission,
Arc<Svc>: FromRef<S>,
Svc: EntityAccessService,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = ExtractorError;
@@ -52,26 +55,20 @@ where
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
let service = <Arc<Svc>>::from_ref(state);
- let OptionalMacroUserExtractor { macro_user_id, .. } = parts
- .extract()
+ let OptionalMacroAuthorizationExtractor {
+ macro_user_id,
+ is_internal_access,
+ ..
+ } = OptionalMacroAuthorizationExtractor::<Auth>::from_request_parts(parts, state)
.await
- .map_err(|_| ExtractorError::Internal)?;
+ .map_err(ExtractorError::from)?;
let document_context: Extension<DocumentBasic> = parts
.extract()
.await
.map_err(|_| ExtractorError::Internal)?;
- let internal_user: Option<Extension<InternalUser>> = if macro_user_id.is_none() {
- parts
- .extract()
- .await
- .map_err(|_| ExtractorError::Internal)?
- } else {
- None
- };
-
- if internal_user.is_some() {
+ if macro_user_id.is_none() && is_internal_access {
return Ok(Self {
entity_access_receipt: EntityAccessReceipt {
entity: Entity {
diff --git a/crates/entity_access/src/inbound/axum_extractors/document/test.rs b/crates/entity_access/src/inbound/axum_extractors/document/test.rs
new file mode 100644
index 0000000000..486dbaadf9
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/document/test.rs
@@ -0,0 +1,502 @@
+use std::sync::{Arc, Mutex};
+
+use axum::{
+ body::{Body, to_bytes},
+ extract::{FromRef, FromRequestParts},
+ http::{Request, StatusCode, header},
+ response::IntoResponse,
+};
+use macro_authorization::{
+ INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER, InternalIdentityClaims,
+ MacroAuthorizationError, MacroAuthorizationService, MacroAuthorizationState,
+};
+#[allow(deprecated)]
+use macro_authorization::{
+ LEGACY_DSS_INTERNAL_API_KEY_HEADER, LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+};
+use macro_user_id::{
+ lowercased::Lowercase,
+ user_id::{MacroUserId, MacroUserIdStr},
+};
+use model::document::DocumentBasic;
+use model_user::UserContext;
+use rootcause::Report;
+use uuid::Uuid;
+
+use super::*;
+use crate::domain::models::{
+ AccessError, BotId, CallChannelInfo, EditAccessLevel, EntityAccessAuth, UserTeamInfo,
+ ViewAccessLevel,
+};
+
+const DOCUMENT_ID: &str = "document-1";
+const OWNER_ID: &str = "macro|[email protected]";
+const USER_ID: &str = "macro|[email protected]";
+const STANDARD_ACT_AS_ID: &str = "macro|[email protected]";
+const LEGACY_ACT_AS_ID: &str = "macro|[email protected]";
+const DEFAULT_INTERNAL_ID: &str = "macro|[email protected]";
+const INTERNAL_KEY: &str = "valid-internal-key";
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+struct AccessCall {
+ user_id: Option<String>,
+ entity_id: String,
+ entity_type: EntityType,
+}
+
+#[derive(Clone, Debug)]
+struct FakeEntityAccessService {
+ access_level: Option<AccessLevel>,
+ calls: Arc<Mutex<Vec<AccessCall>>>,
+}
+
+impl FakeEntityAccessService {
+ fn new(access_level: Option<AccessLevel>) -> Self {
+ Self {
+ access_level,
+ calls: Arc::new(Mutex::new(Vec::new())),
+ }
+ }
+
+ fn calls(&self) -> Vec<AccessCall> {
+ self.calls.lock().expect("calls lock poisoned").clone()
+ }
+}
+
+impl EntityAccessService for FakeEntityAccessService {
+ async fn generate_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ _user_org_id: Option<i64>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_entity_access_receipt call")
+ }
+
+ async fn generate_bot_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _bot_id: BotId,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_bot_entity_access_receipt call")
+ }
+
+ async fn get_access_level(
+ &self,
+ user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ entity_id: &str,
+ entity_type: EntityType,
+ ) -> Result<Option<AccessLevel>, AccessError> {
+ self.calls
+ .lock()
+ .expect("calls lock poisoned")
+ .push(AccessCall {
+ user_id: user_id.map(|id| id.as_ref().to_string()),
+ entity_id: entity_id.to_string(),
+ entity_type,
+ });
+ Ok(self.access_level)
+ }
+
+ async fn check_access(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_access call")
+ }
+
+ async fn check_public_access(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_public_access call")
+ }
+
+ async fn get_entity_permission(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _user_org_id: Option<i64>,
+ ) -> Result<EntityPermission, AccessError> {
+ panic!("unexpected get_entity_permission call")
+ }
+
+ async fn get_crm_entity_permission_with_team(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<(EntityPermission, Uuid), AccessError> {
+ panic!("unexpected get_crm_entity_permission_with_team call")
+ }
+
+ async fn get_users_by_entity(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Vec<MacroUserIdStr<'static>>, AccessError> {
+ panic!("unexpected get_users_by_entity call")
+ }
+
+ async fn get_call_channel(
+ &self,
+ _call_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel call")
+ }
+
+ async fn get_call_channel_by_channel_id(
+ &self,
+ _channel_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel_by_channel_id call")
+ }
+
+ async fn get_user_team(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ ) -> Result<Option<UserTeamInfo>, AccessError> {
+ panic!("unexpected get_user_team call")
+ }
+}
+
+#[derive(Clone, Debug, Default)]
+struct FakeAuthorizationService {
+ default_internal_user_id: Option<String>,
+}
+
+impl FakeAuthorizationService {
+ fn with_default_internal_user() -> Self {
+ Self {
+ default_internal_user_id: Some(DEFAULT_INTERNAL_ID.to_string()),
+ }
+ }
+}
+
+impl MacroAuthorizationService for FakeAuthorizationService {
+ async fn authorize(&self, jwt: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
+ match jwt {
+ "owner" => Ok(user_context(OWNER_ID)),
+ "valid" => Ok(user_context(USER_ID)),
+ "expired" => Err(Report::new(MacroAuthorizationError::CredentialsExpired)),
+ _ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
+ }
+ }
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ if provided_key != INTERNAL_KEY {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(claims
+ .user_id
+ .or_else(|| self.default_internal_user_id.clone())
+ .map(|user_id| user_context(&user_id)))
+ }
+}
+
+struct TestState {
+ entity_access: Arc<FakeEntityAccessService>,
+ authorization: MacroAuthorizationState<FakeAuthorizationService>,
+}
+
+impl TestState {
+ fn new(access_level: Option<AccessLevel>) -> Self {
+ Self::with_authorization(access_level, FakeAuthorizationService::default())
+ }
+
+ fn with_authorization(
+ access_level: Option<AccessLevel>,
+ authorization: FakeAuthorizationService,
+ ) -> Self {
+ Self {
+ entity_access: Arc::new(FakeEntityAccessService::new(access_level)),
+ authorization: MacroAuthorizationState::new(Arc::new(authorization)),
+ }
+ }
+}
+
+impl FromRef<TestState> for Arc<FakeEntityAccessService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.entity_access.clone()
+ }
+}
+
+impl FromRef<TestState> for MacroAuthorizationState<FakeAuthorizationService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.authorization.clone()
+ }
+}
+
+fn user_context(user_id: &str) -> UserContext {
+ UserContext {
+ user_id: user_id.to_string(),
+ fusion_user_id: "fusion-user-id".to_string(),
+ organization_id: None,
+ permissions: None,
+ }
+}
+
+fn document(deleted: bool) -> DocumentBasic {
+ let mut document = DocumentBasic {
+ document_id: DOCUMENT_ID.to_string(),
+ document_name: "Test document".to_string(),
+ owner: MacroUserIdStr::parse_from_str(OWNER_ID).expect("owner id should be valid"),
+ file_type: None,
+ sub_type: None,
+ branched_from_id: None,
+ branched_from_version_id: None,
+ document_family_id: None,
+ project_id: None,
+ deleted_at: None,
+ };
+ if deleted {
+ document.deleted_at = Some(
+ "2026-01-01T00:00:00Z"
+ .parse()
+ .expect("deleted timestamp should be valid"),
+ );
+ }
+ document
+}
+
+fn request(token: Option<&str>, document: DocumentBasic) -> Request<Body> {
+ let mut request = Request::new(Body::empty());
+ request.extensions_mut().insert(document);
+ if let Some(token) = token {
+ request.headers_mut().insert(
+ header::AUTHORIZATION,
+ format!("Bearer {token}")
+ .parse()
+ .expect("header should be valid"),
+ );
+ }
+ request
+}
+
+fn internal_request(
+ key_header: &'static str,
+ user_header: Option<&'static str>,
+ user_id: Option<&str>,
+ document: DocumentBasic,
+) -> Request<Body> {
+ let mut request = request(None, document);
+ request.headers_mut().insert(
+ key_header,
+ INTERNAL_KEY.parse().expect("key should be valid"),
+ );
+ if let (Some(user_header), Some(user_id)) = (user_header, user_id) {
+ request.headers_mut().insert(
+ user_header,
+ user_id.parse().expect("user id should be valid"),
+ );
+ }
+ request
+}
+
+async fn extract<T: RequiredPermission>(
+ request: Request<Body>,
+ state: &TestState,
+) -> Result<
+ DocumentAccessExtractor<T, FakeEntityAccessService, FakeAuthorizationService>,
+ ExtractorError,
+> {
+ let (mut parts, _) = request.into_parts();
+ DocumentAccessExtractor::from_request_parts(&mut parts, state).await
+}
+
+#[tokio::test]
+async fn anonymous_link_share_access_returns_unauthenticated_receipt() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let extracted = extract::<ViewAccessLevel>(request(None, document(false)), &state)
+ .await
+ .expect("public link access should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Unauthenticated
+ ));
+ assert_eq!(state.entity_access.calls()[0].user_id, None);
+}
+
+#[tokio::test]
+async fn authenticated_owner_bypasses_access_lookup() {
+ let state = TestState::new(None);
+ let extracted = extract::<EditAccessLevel>(request(Some("owner"), document(false)), &state)
+ .await
+ .expect("the owner should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Owner
+ }
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn insufficient_access_is_rejected() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let result = extract::<EditAccessLevel>(request(Some("valid"), document(false)), &state).await;
+
+ assert!(matches!(result, Err(ExtractorError::Unauthorized)));
+}
+
+#[tokio::test]
+async fn deleted_document_allows_owner_but_rejects_non_owner() {
+ let owner_state = TestState::new(None);
+ extract::<EditAccessLevel>(request(Some("owner"), document(true)), &owner_state)
+ .await
+ .expect("the owner should access a deleted document");
+
+ let non_owner_state = TestState::new(Some(AccessLevel::Owner));
+ let result =
+ extract::<ViewAccessLevel>(request(Some("valid"), document(true)), &non_owner_state).await;
+ assert!(matches!(
+ result,
+ Err(ExtractorError::UnauthorizedWithMessage(
+ "only owner can access deleted resource"
+ ))
+ ));
+ assert!(non_owner_state.entity_access.calls().is_empty());
+}
+
+async fn assert_internal_act_as_uses_acl(
+ key_header: &'static str,
+ user_header: &'static str,
+ user_id: &str,
+) {
+ let state = TestState::new(Some(AccessLevel::Edit));
+ let extracted = extract::<EditAccessLevel>(
+ internal_request(
+ key_header,
+ Some(user_header),
+ Some(user_id),
+ document(false),
+ ),
+ &state,
+ )
+ .await
+ .expect("internal act-as identity should use its ACL");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Authenticated(actual) if actual.as_ref() == user_id
+ ));
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(user_id)
+ );
+}
+
+#[tokio::test]
+async fn standard_internal_act_as_uses_ordinary_acl_evaluation() {
+ assert_internal_act_as_uses_acl(
+ INTERNAL_API_KEY_HEADER,
+ INTERNAL_MACRO_USER_ID_HEADER,
+ STANDARD_ACT_AS_ID,
+ )
+ .await;
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn legacy_internal_act_as_uses_ordinary_acl_evaluation() {
+ assert_internal_act_as_uses_acl(
+ LEGACY_DSS_INTERNAL_API_KEY_HEADER,
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+ LEGACY_ACT_AS_ID,
+ )
+ .await;
+}
+
+#[tokio::test]
+async fn default_internal_identity_uses_ordinary_acl_evaluation() {
+ let state = TestState::with_authorization(
+ Some(AccessLevel::View),
+ FakeAuthorizationService::with_default_internal_user(),
+ );
+ let extracted = extract::<ViewAccessLevel>(
+ internal_request(INTERNAL_API_KEY_HEADER, None, None, document(false)),
+ &state,
+ )
+ .await
+ .expect("default internal identity should use its ACL");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Authenticated(actual) if actual.as_ref() == DEFAULT_INTERNAL_ID
+ ));
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(DEFAULT_INTERNAL_ID)
+ );
+}
+
+#[tokio::test]
+async fn identity_less_internal_request_receives_owner_without_acl_lookup() {
+ let state = TestState::new(None);
+ let extracted = extract::<EditAccessLevel>(
+ internal_request(INTERNAL_API_KEY_HEADER, None, None, document(false)),
+ &state,
+ )
+ .await
+ .expect("identity-less internal access should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Internal
+ ));
+ assert!(matches!(
+ extracted.entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Owner
+ }
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn invalid_internal_credentials_are_rejected_without_acl_lookup() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let mut request = internal_request(INTERNAL_API_KEY_HEADER, None, None, document(false));
+ request
+ .headers_mut()
+ .insert(INTERNAL_API_KEY_HEADER, "invalid".parse().unwrap());
+ let error = extract::<ViewAccessLevel>(request, &state)
+ .await
+ .expect_err("invalid credentials should be rejected");
+ let response = error.into_response();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn expired_token_preserves_exact_unauthorized_json() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let error = extract::<ViewAccessLevel>(request(Some("expired"), document(false)), &state)
+ .await
+ .expect_err("expired credentials should be rejected");
+ let response = error.into_response();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("response body should be readable");
+ assert_eq!(body.as_ref(), br#"{"message":"jwt expired"}"#);
+ assert!(state.entity_access.calls().is_empty());
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/history.rs b/crates/entity_access/src/inbound/axum_extractors/history.rs
index a90342faef..c6f13a81f2 100644
--- a/crates/entity_access/src/inbound/axum_extractors/history.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/history.rs
@@ -1,23 +1,26 @@
//! History access extractor.
+#[cfg(test)]
+mod test;
+
use std::marker::PhantomData;
use std::sync::Arc;
use axum::{
- Extension, RequestPartsExt,
extract::{FromRef, FromRequestParts, Path},
http::request::Parts,
};
+use macro_authorization::{
+ MacroAuthorizationService, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
+};
-use super::{ExtractorError, InternalUser, RequiredPermission};
+use super::{ExtractorError, RequiredPermission};
use crate::domain::{
models::{
AccessLevel, Entity, EntityAccessAuth, EntityAccessReceipt, EntityPermission, EntityType,
},
ports::EntityAccessService,
};
-use model_user::axum_extractor::OptionalMacroUserExtractor;
-
/// Path parameters for history routes.
#[derive(serde::Deserialize)]
pub struct HistoryParams {
@@ -29,19 +32,23 @@ pub struct HistoryParams {
/// Validates the user has access to view the history of a particular item.
///
-/// Extracts both item_id and item_type from the path parameters.
+/// Extracts both `item_id` and `item_type` from the path parameters. Type parameter `T` specifies
+/// the required access level, `Svc` is the entity access service, and `Auth` is the authorization
+/// service.
#[derive(Debug)]
-pub struct HistoryAccessExtractor<T: RequiredPermission, Svc> {
+pub struct HistoryAccessExtractor<T: RequiredPermission, Svc, Auth> {
/// The entity access receipt
pub entity_access_receipt: EntityAccessReceipt<T>,
- _marker: PhantomData<(T, Svc)>,
+ _marker: PhantomData<(T, Svc, Auth)>,
}
-impl<T, S, Svc> FromRequestParts<S> for HistoryAccessExtractor<T, Svc>
+impl<T, S, Svc, Auth> FromRequestParts<S> for HistoryAccessExtractor<T, Svc, Auth>
where
T: RequiredPermission,
Arc<Svc>: FromRef<S>,
Svc: EntityAccessService,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = ExtractorError;
@@ -50,10 +57,13 @@ where
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
let service = <Arc<Svc>>::from_ref(state);
- let OptionalMacroUserExtractor { macro_user_id, .. } = parts
- .extract()
+ let OptionalMacroAuthorizationExtractor {
+ macro_user_id,
+ is_internal_access,
+ ..
+ } = OptionalMacroAuthorizationExtractor::<Auth>::from_request_parts(parts, state)
.await
- .map_err(|_| ExtractorError::Internal)?;
+ .map_err(ExtractorError::from)?;
let Path(HistoryParams { item_id, item_type }) =
<Path<HistoryParams>>::from_request_parts(parts, state)
@@ -65,16 +75,7 @@ where
.parse()
.map_err(|_| ExtractorError::BadRequest("Invalid item_type"))?;
- let internal_user: Option<Extension<InternalUser>> = if macro_user_id.is_none() {
- parts
- .extract()
- .await
- .map_err(|_| ExtractorError::Internal)?
- } else {
- None
- };
-
- if internal_user.is_some() {
+ if macro_user_id.is_none() && is_internal_access {
return Ok(Self {
entity_access_receipt: EntityAccessReceipt {
entity: Entity {
diff --git a/crates/entity_access/src/inbound/axum_extractors/history/test.rs b/crates/entity_access/src/inbound/axum_extractors/history/test.rs
new file mode 100644
index 0000000000..cea63849e7
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/history/test.rs
@@ -0,0 +1,129 @@
+use axum::{
+ Router,
+ body::{Body, to_bytes},
+ http::{Request, StatusCode, header},
+ routing::post,
+};
+use macro_authorization::{INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER};
+use tower::ServiceExt;
+
+use super::*;
+use crate::{
+ domain::models::{AccessLevel, EntityAccessAuth, EntityType, ViewAccessLevel},
+ inbound::axum_extractors::test_support::{
+ AccessCall, FakeAuthorizationService, FakeEntityAccessService, INTERNAL_KEY, TestState,
+ USER_ID,
+ },
+};
+
+const ITEM_ID: &str = "document-1";
+
+type ViewExtractor =
+ HistoryAccessExtractor<ViewAccessLevel, FakeEntityAccessService, FakeAuthorizationService>;
+
+async fn handler(access: ViewExtractor) -> &'static str {
+ match access.entity_access_receipt.auth() {
+ EntityAccessAuth::Authenticated(_) => "authenticated",
+ EntityAccessAuth::Unauthenticated => "unauthenticated",
+ EntityAccessAuth::Internal => "internal",
+ EntityAccessAuth::Bot(_) => "bot",
+ }
+}
+
+fn router(state: TestState) -> Router {
+ Router::new()
+ .route("/history/{item_type}/{item_id}", post(handler))
+ .with_state(state)
+}
+
+fn request() -> axum::http::request::Builder {
+ Request::post(format!("/history/document/{ITEM_ID}"))
+}
+
+async fn response_body(response: axum::response::Response) -> String {
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("response body should be readable");
+ String::from_utf8(body.to_vec()).expect("response body should be UTF-8")
+}
+
+#[tokio::test]
+async fn anonymous_history_access_uses_public_acl() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(request().body(Body::empty()).unwrap())
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(response_body(response).await, "unauthenticated");
+ assert_eq!(
+ state.entity_access.calls(),
+ [AccessCall {
+ user_id: None,
+ entity_id: ITEM_ID.to_string(),
+ entity_type: EntityType::Document,
+ }]
+ );
+}
+
+#[tokio::test]
+async fn identity_less_internal_history_access_receives_owner_without_acl_lookup() {
+ let state = TestState::new(None);
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .body(Body::empty())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(response_body(response).await, "internal");
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn internal_history_act_as_identity_uses_acl() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, USER_ID)
+ .body(Body::empty())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(response_body(response).await, "authenticated");
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(USER_ID)
+ );
+}
+
+#[tokio::test]
+async fn expired_history_credentials_preserve_authorization_rejection() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(header::AUTHORIZATION, "Bearer expired")
+ .body(Body::empty())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert_eq!(
+ response_body(response).await,
+ r#"{"message":"jwt expired"}"#
+ );
+ assert!(state.entity_access.calls().is_empty());
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/mod.rs b/crates/entity_access/src/inbound/axum_extractors/mod.rs
index 1a33c7e478..500e33ec19 100644
--- a/crates/entity_access/src/inbound/axum_extractors/mod.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/mod.rs
@@ -3,6 +3,11 @@
//! These extractors validate that the requesting user has sufficient
//! access to the entity being accessed.
+#[cfg(test)]
+mod test;
+#[cfg(test)]
+mod test_support;
+
mod call;
mod channel;
mod chat;
@@ -23,13 +28,23 @@ pub use entity_permission::EntityPermissionExtractor;
pub use foreign_entity::ForeignEntityAccessLevelExtractor;
pub use history::HistoryAccessExtractor;
pub use pin::PinAccessLevelExtractor;
-pub use project::{ProjectAccessLevelExtractor, ProjectBodyAccessLevelExtractor};
-pub use team::{MacroUserTeamExtractor, OptionalMacroUserTeamExtractor};
+pub use project::{
+ ProjectAccessLevelExtractor, ProjectBodyAccessLevelExtractor, ProjectBodyAccessLevelExtractorV2,
+};
+pub use team::{
+ MacroUserTeamExtractor, OptionalMacroUserTeamExtractor, OptionalMacroUserTeamExtractorV2,
+};
pub use thread::ThreadAccessLevelExtractor;
+use std::borrow::Cow;
+
use crate::domain::models::{AccessError, AccessLevel};
-use axum::http::StatusCode;
-use axum::response::{IntoResponse, Response};
+use axum::{
+ Json,
+ http::StatusCode,
+ response::{IntoResponse, Response},
+};
+use macro_authorization::MacroAuthorizationRejection;
use model_error_response::ErrorResponse;
pub use crate::domain::models::RequiredPermission;
@@ -50,6 +65,15 @@ pub enum ExtractorError {
#[error("User does not have access to the requested resource")]
Unauthorized,
+ /// User credentials were rejected by the authorization service.
+ #[error("{message}")]
+ Authorization {
+ /// HTTP status returned by the authorization extractor.
+ status: StatusCode,
+ /// Error message returned by the authorization extractor.
+ message: Cow<'static, str>,
+ },
+
/// User does not have access with a specific message.
#[error("{0}")]
UnauthorizedWithMessage(&'static str),
@@ -86,23 +110,30 @@ impl From<AccessError> for ExtractorError {
}
}
+impl From<MacroAuthorizationRejection> for ExtractorError {
+ fn from((status, Json(ErrorResponse { message })): MacroAuthorizationRejection) -> Self {
+ Self::Authorization { status, message }
+ }
+}
+
impl IntoResponse for ExtractorError {
fn into_response(self) -> Response {
- let (status, message) = match &self {
- ExtractorError::Unauthorized => (StatusCode::UNAUTHORIZED, self.to_string()),
- ExtractorError::UnauthorizedWithMessage(_) => {
- (StatusCode::UNAUTHORIZED, self.to_string())
+ let (status, message) = match self {
+ ExtractorError::Authorization { status, message } => (status, message),
+ error @ (ExtractorError::Unauthorized | ExtractorError::UnauthorizedWithMessage(_)) => {
+ (StatusCode::UNAUTHORIZED, error.to_string().into())
+ }
+ error @ ExtractorError::BadRequest(_) => {
+ (StatusCode::BAD_REQUEST, error.to_string().into())
}
- ExtractorError::BadRequest(_) => (StatusCode::BAD_REQUEST, self.to_string()),
- ExtractorError::NotFound(_) => (StatusCode::NOT_FOUND, self.to_string()),
- ExtractorError::Internal | ExtractorError::Database => {
- (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
+ error @ ExtractorError::NotFound(_) => {
+ (StatusCode::NOT_FOUND, error.to_string().into())
+ }
+ error @ (ExtractorError::Internal | ExtractorError::Database) => {
+ (StatusCode::INTERNAL_SERVER_ERROR, error.to_string().into())
}
};
- let error_response = ErrorResponse {
- message: message.into(),
- };
- (status, axum::Json(error_response)).into_response()
+ (status, Json(ErrorResponse { message })).into_response()
}
}
diff --git a/crates/entity_access/src/inbound/axum_extractors/pin.rs b/crates/entity_access/src/inbound/axum_extractors/pin.rs
index 9f5b2d90f0..e70d8a15d9 100644
--- a/crates/entity_access/src/inbound/axum_extractors/pin.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/pin.rs
@@ -1,5 +1,8 @@
//! Pin access extractor.
+#[cfg(test)]
+mod test;
+
use serde::de::DeserializeOwned;
use std::marker::PhantomData;
use std::sync::Arc;
@@ -8,14 +11,15 @@ use axum::{
Json, RequestExt,
extract::{FromRef, FromRequest, Path, Request},
};
+use macro_authorization::{
+ MacroAuthorizationService, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
+};
use super::{ExtractorError, RequiredPermission};
use crate::domain::{
models::{Entity, EntityAccessAuth, EntityAccessReceipt, EntityPermission, EntityType},
ports::EntityAccessService,
};
-use model_user::axum_extractor::MacroUserExtractor;
-
/// Path parameters for pin routes.
#[derive(serde::Deserialize)]
pub struct PinParams {
@@ -31,24 +35,29 @@ pub struct JsonBodyWithPinType {
pub pin_type: String,
}
-/// Validates the user has access to pin the particular item.
+/// Validates an authenticated user has access to pin the particular item.
+///
+/// Type parameter `T` specifies the required access level, `Svc` is the entity access service,
+/// `V` is the request body, and `Auth` is the authorization service.
#[derive(Debug)]
-pub struct PinAccessLevelExtractor<T: RequiredPermission, Svc, V> {
+pub struct PinAccessLevelExtractor<T: RequiredPermission, Svc, V, Auth> {
/// The entity access receipt
pub entity_access_receipt: EntityAccessReceipt<T>,
/// The pin type extracted from the request body
pub pin_type: JsonBodyWithPinType,
/// Request body
pub inner: V,
- _marker: PhantomData<(T, Svc)>,
+ _marker: PhantomData<(T, Svc, Auth)>,
}
-impl<T, S, Svc, V> FromRequest<S> for PinAccessLevelExtractor<T, Svc, V>
+impl<T, S, Svc, V, Auth> FromRequest<S> for PinAccessLevelExtractor<T, Svc, V, Auth>
where
T: RequiredPermission,
Arc<Svc>: FromRef<S>,
Svc: EntityAccessService,
V: DeserializeOwned + std::fmt::Debug,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = ExtractorError;
@@ -57,12 +66,11 @@ where
async fn from_request(mut req: Request, state: &S) -> Result<Self, Self::Rejection> {
let service = <Arc<Svc>>::from_ref(state);
- // NOTE: for pinned items, the user must exist so we explicitly do not
- // use the OptionalMacroUserExtractor
- let MacroUserExtractor { macro_user_id, .. } = req
- .extract_parts()
+ let OptionalMacroAuthorizationExtractor { macro_user_id, .. } = req
+ .extract_parts_with_state::<OptionalMacroAuthorizationExtractor<Auth>, _>(state)
.await
- .map_err(|_| ExtractorError::Internal)?;
+ .map_err(ExtractorError::from)?;
+ let macro_user_id = macro_user_id.ok_or(ExtractorError::Unauthorized)?;
let Path(PinParams { pinned_item_id }) = req
.extract_parts_with_state(state)
diff --git a/crates/entity_access/src/inbound/axum_extractors/pin/test.rs b/crates/entity_access/src/inbound/axum_extractors/pin/test.rs
new file mode 100644
index 0000000000..2c4a173f83
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/pin/test.rs
@@ -0,0 +1,172 @@
+use axum::{
+ Router,
+ body::{Body, to_bytes},
+ http::{Request, StatusCode, header},
+ routing::post,
+};
+use macro_authorization::{INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER};
+use serde::Deserialize;
+use tower::ServiceExt;
+
+use super::*;
+use crate::{
+ domain::models::{AccessLevel, EntityAccessAuth, EntityType, ViewAccessLevel},
+ inbound::axum_extractors::test_support::{
+ AccessCall, FakeAuthorizationService, FakeEntityAccessService, INTERNAL_KEY, TestState,
+ USER_ID,
+ },
+};
+
+const ITEM_ID: &str = "document-1";
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct PinBody {
+ pin_type: String,
+ pin_index: i32,
+}
+
+type ViewExtractor = PinAccessLevelExtractor<
+ ViewAccessLevel,
+ FakeEntityAccessService,
+ PinBody,
+ FakeAuthorizationService,
+>;
+
+async fn handler(access: ViewExtractor) -> String {
+ let auth = match access.entity_access_receipt.auth() {
+ EntityAccessAuth::Authenticated(_) => "authenticated",
+ EntityAccessAuth::Unauthenticated => "unauthenticated",
+ EntityAccessAuth::Internal => "internal",
+ EntityAccessAuth::Bot(_) => "bot",
+ };
+
+ format!(
+ "{auth}:{}:{}:{}",
+ access.pin_type.pin_type, access.inner.pin_type, access.inner.pin_index
+ )
+}
+
+fn router(state: TestState) -> Router {
+ Router::new()
+ .route("/pins/{pinned_item_id}", post(handler))
+ .with_state(state)
+}
+
+fn request() -> axum::http::request::Builder {
+ Request::post(format!("/pins/{ITEM_ID}")).header(header::CONTENT_TYPE, "application/json")
+}
+
+fn body() -> Body {
+ Body::from(r#"{"pinType":"document","pinIndex":7}"#)
+}
+
+async fn response_body(response: axum::response::Response) -> String {
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("response body should be readable");
+ String::from_utf8(body.to_vec()).expect("response body should be UTF-8")
+}
+
+#[tokio::test]
+async fn authenticated_pin_access_uses_user_acl_and_preserves_body() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(header::AUTHORIZATION, "Bearer valid")
+ .body(body())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(
+ response_body(response).await,
+ "authenticated:document:document:7"
+ );
+ assert_eq!(
+ state.entity_access.calls(),
+ [AccessCall {
+ user_id: Some(USER_ID.to_string()),
+ entity_id: ITEM_ID.to_string(),
+ entity_type: EntityType::Document,
+ }]
+ );
+}
+
+#[tokio::test]
+async fn anonymous_pin_access_is_rejected_before_acl_lookup() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(request().body(body()).unwrap())
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn identity_less_internal_pin_access_is_rejected_without_acl_lookup() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .body(body())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn internal_pin_act_as_identity_uses_acl() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, USER_ID)
+ .body(body())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(
+ response_body(response).await,
+ "authenticated:document:document:7"
+ );
+ assert_eq!(
+ state.entity_access.calls()[0].user_id.as_deref(),
+ Some(USER_ID)
+ );
+}
+
+#[tokio::test]
+async fn expired_pin_credentials_preserve_authorization_rejection() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let response = router(state.clone())
+ .oneshot(
+ request()
+ .header(header::AUTHORIZATION, "Bearer expired")
+ .body(body())
+ .unwrap(),
+ )
+ .await
+ .unwrap();
+
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert_eq!(
+ response_body(response).await,
+ r#"{"message":"jwt expired"}"#
+ );
+ assert!(state.entity_access.calls().is_empty());
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/project.rs b/crates/entity_access/src/inbound/axum_extractors/project.rs
index 2bd8d53303..ea72bb7906 100644
--- a/crates/entity_access/src/inbound/axum_extractors/project.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/project.rs
@@ -1,5 +1,8 @@
//! Project access extractors.
+#[cfg(test)]
+mod test;
+
use std::marker::PhantomData;
use std::sync::Arc;
@@ -8,6 +11,10 @@ use axum::{
extract::{FromRef, FromRequest, FromRequestParts, Request},
http::request::Parts,
};
+use macro_authorization::{
+ MacroAuthorizationService, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
+};
+use macro_user_id::user_id::MacroUserIdStr;
use serde::de::DeserializeOwned;
use super::{ExtractorError, InternalUser, RequiredPermission};
@@ -24,22 +31,25 @@ use model_user::axum_extractor::OptionalMacroUserExtractor;
///
/// Type parameter `T` specifies the required access level.
/// Type parameter `Svc` is the entity access service implementation.
+/// Type parameter `Auth` is the authorization service implementation.
///
/// # Prerequisites
///
-/// - Project context must be loaded (BasicProject in extensions)
+/// - Project context must be loaded (`BasicProject` in extensions)
#[derive(Debug)]
-pub struct ProjectAccessLevelExtractor<T: RequiredPermission, Svc> {
+pub struct ProjectAccessLevelExtractor<T: RequiredPermission, Svc, Auth> {
/// The entity access receipt
pub entity_access_receipt: EntityAccessReceipt<T>,
- _marker: PhantomData<(T, Svc)>,
+ _marker: PhantomData<(T, Svc, Auth)>,
}
-impl<T, S, Svc> FromRequestParts<S> for ProjectAccessLevelExtractor<T, Svc>
+impl<T, S, Svc, Auth> FromRequestParts<S> for ProjectAccessLevelExtractor<T, Svc, Auth>
where
T: RequiredPermission,
Arc<Svc>: FromRef<S>,
Svc: EntityAccessService,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = ExtractorError;
@@ -48,26 +58,20 @@ where
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
let service = <Arc<Svc>>::from_ref(state);
- let OptionalMacroUserExtractor { macro_user_id, .. } = parts
- .extract()
+ let OptionalMacroAuthorizationExtractor {
+ macro_user_id,
+ is_internal_access,
+ ..
+ } = OptionalMacroAuthorizationExtractor::<Auth>::from_request_parts(parts, state)
.await
- .map_err(|_| ExtractorError::Internal)?;
+ .map_err(ExtractorError::from)?;
let project_context: Extension<BasicProject> = parts
.extract()
.await
.map_err(|_| ExtractorError::Internal)?;
- let internal_user: Option<Extension<InternalUser>> = if macro_user_id.is_none() {
- parts
- .extract()
- .await
- .map_err(|_| ExtractorError::Internal)?
- } else {
- None
- };
-
- if internal_user.is_some() {
+ if macro_user_id.is_none() && is_internal_access {
return Ok(Self {
entity_access_receipt: EntityAccessReceipt {
entity: Entity {
@@ -221,8 +225,26 @@ impl<T: RequiredPermission, V, Svc> ProjectBodyAccessLevelExtractor<T, V, Svc> {
/// Extract the body from this extractor.
pub fn into_inner(self) -> V {
match self {
- ProjectBodyAccessLevelExtractor::FoundProject { body, .. } => body,
- ProjectBodyAccessLevelExtractor::ProjectNotInBody { body, .. } => body,
+ Self::FoundProject { body, .. } | Self::ProjectNotInBody { body, .. } => body,
+ }
+ }
+
+ fn from_outcome(outcome: ProjectBodyAccessOutcome<T, V>) -> Self {
+ match outcome {
+ ProjectBodyAccessOutcome::FoundProject {
+ project,
+ entity_access_receipt,
+ body,
+ } => Self::FoundProject {
+ project,
+ desired: PhantomData,
+ entity_access_receipt,
+ body,
+ },
+ ProjectBodyAccessOutcome::ProjectNotInBody { body } => Self::ProjectNotInBody {
+ body,
+ _marker: PhantomData,
+ },
}
}
}
@@ -239,12 +261,10 @@ where
async fn from_request(mut req: Request, state: &S) -> Result<Self, Self::Rejection> {
let service = <Arc<Svc>>::from_ref(state);
-
let OptionalMacroUserExtractor { macro_user_id, .. } = req
.extract_parts()
.await
.map_err(|_| ExtractorError::Internal)?;
-
let internal_user: Option<Extension<InternalUser>> = if macro_user_id.is_none() {
req.extract_parts()
.await
@@ -253,80 +273,189 @@ where
None
};
- let Json(json) = req
- .extract::<Json<serde_json::Value>, _>()
+ extract_project_body_access(req, service, macro_user_id, internal_user.is_some())
.await
- .map_err(|_| ExtractorError::BadRequest("Invalid JSON body"))?;
-
- let json_clone = json.clone();
- let cb = move || {
- serde_json::from_value::<V>(json_clone)
- .map_err(|_| ExtractorError::BadRequest("Invalid request body"))
- };
+ .map(Self::from_outcome)
+ }
+}
- let Ok(Some(project)) = serde_json::from_value::<Option<ProjectOrParentId>>(json) else {
- return Ok(Self::ProjectNotInBody {
- body: cb()?,
- _marker: PhantomData,
- });
- };
+/// V2 of [`ProjectBodyAccessLevelExtractor`], backed by state-resolved authorization.
+///
+/// This preserves the V1 body and receipt semantics while resolving identity
+/// through [`OptionalMacroAuthorizationExtractor`] and using native internal
+/// authorization instead of request extensions. Type parameter `T` specifies
+/// the required project access level, `V` is the request body, `Svc` is the
+/// entity access service, and `Auth` is the authorization service.
+#[derive(Debug)]
+pub enum ProjectBodyAccessLevelExtractorV2<T: RequiredPermission, V, Svc, Auth> {
+ /// A project was found in the body and access was validated.
+ FoundProject {
+ /// The project ID that was found.
+ project: ProjectOrParentId,
+ /// Marker for the extractor's service and permission types.
+ desired: PhantomData<(T, Svc, Auth)>,
+ /// The entity access receipt.
+ entity_access_receipt: EntityAccessReceipt<T>,
+ /// The parsed body.
+ body: V,
+ },
+ /// No project was found in the body.
+ ProjectNotInBody {
+ /// The parsed body.
+ body: V,
+ /// Marker for the extractor's service and permission types.
+ _marker: PhantomData<(T, Svc, Auth)>,
+ },
+}
- // An empty id clears the entity's project: no target project to authorize
- if project.id().is_empty() {
- return Ok(Self::ProjectNotInBody {
- body: cb()?,
- _marker: PhantomData,
- });
+#[allow(dead_code)]
+impl<T: RequiredPermission, V, Svc, Auth> ProjectBodyAccessLevelExtractorV2<T, V, Svc, Auth> {
+ /// Extract the body from this extractor.
+ pub fn into_inner(self) -> V {
+ match self {
+ Self::FoundProject { body, .. } | Self::ProjectNotInBody { body, .. } => body,
}
+ }
- if internal_user.is_some() {
- return Ok(Self::FoundProject {
- entity_access_receipt: EntityAccessReceipt {
- entity: Entity {
- entity_id: project.id().to_owned(),
- entity_type: EntityType::Project,
- },
- auth: EntityAccessAuth::Internal,
- entity_permission: EntityPermission::AccessLevel {
- access_level: AccessLevel::Owner,
- },
- _marker: PhantomData,
- },
+ fn from_outcome(outcome: ProjectBodyAccessOutcome<T, V>) -> Self {
+ match outcome {
+ ProjectBodyAccessOutcome::FoundProject {
+ project,
+ entity_access_receipt,
+ body,
+ } => Self::FoundProject {
project,
desired: PhantomData,
- body: cb()?,
- });
+ entity_access_receipt,
+ body,
+ },
+ ProjectBodyAccessOutcome::ProjectNotInBody { body } => Self::ProjectNotInBody {
+ body,
+ _marker: PhantomData,
+ },
}
+ }
+}
- let access_level = match service
+impl<T, S, V, Svc, Auth> FromRequest<S> for ProjectBodyAccessLevelExtractorV2<T, V, Svc, Auth>
+where
+ T: RequiredPermission,
+ Arc<Svc>: FromRef<S>,
+ Svc: EntityAccessService,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
+ S: Send + Sync + 'static,
+ V: DeserializeOwned,
+{
+ type Rejection = ExtractorError;
+
+ async fn from_request(mut req: Request, state: &S) -> Result<Self, Self::Rejection> {
+ let service = <Arc<Svc>>::from_ref(state);
+ let OptionalMacroAuthorizationExtractor {
+ macro_user_id,
+ is_internal_access,
+ ..
+ } = req
+ .extract_parts_with_state(state)
+ .await
+ .map_err(ExtractorError::from)?;
+ let has_internal_owner_access = macro_user_id.is_none() && is_internal_access;
+
+ extract_project_body_access(req, service, macro_user_id, has_internal_owner_access)
+ .await
+ .map(Self::from_outcome)
+ }
+}
+
+enum ProjectBodyAccessOutcome<T: RequiredPermission, V> {
+ FoundProject {
+ project: ProjectOrParentId,
+ entity_access_receipt: EntityAccessReceipt<T>,
+ body: V,
+ },
+ ProjectNotInBody {
+ body: V,
+ },
+}
+
+async fn extract_project_body_access<T, V, Svc>(
+ req: Request,
+ service: Arc<Svc>,
+ macro_user_id: Option<MacroUserIdStr<'static>>,
+ has_internal_owner_access: bool,
+) -> Result<ProjectBodyAccessOutcome<T, V>, ExtractorError>
+where
+ T: RequiredPermission,
+ V: DeserializeOwned,
+ Svc: EntityAccessService,
+{
+ let Json(json) = req
+ .extract::<Json<serde_json::Value>, _>()
+ .await
+ .map_err(|_| ExtractorError::BadRequest("Invalid JSON body"))?;
+ let project = serde_json::from_value::<Option<ProjectOrParentId>>(json.clone());
+
+ let Ok(Some(project)) = project else {
+ return Ok(ProjectBodyAccessOutcome::ProjectNotInBody {
+ body: deserialize_body(json)?,
+ });
+ };
+
+ // An empty id clears the entity's project: no target project to authorize.
+ if project.id().is_empty() {
+ return Ok(ProjectBodyAccessOutcome::ProjectNotInBody {
+ body: deserialize_body(json)?,
+ });
+ }
+
+ let entity_access_receipt = if has_internal_owner_access {
+ project_access_receipt(
+ project.id(),
+ EntityAccessAuth::Internal,
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Owner,
+ },
+ )
+ } else {
+ let access_level = service
.get_access_level(macro_user_id.as_deref(), project.id(), EntityType::Project)
.await
.map_err(ExtractorError::from)?
- {
- Some(access_level) => access_level,
- None => return Err(ExtractorError::Unauthorized),
- };
-
+ .ok_or(ExtractorError::Unauthorized)?;
let permission = EntityPermission::AccessLevel { access_level };
if !permission.satisfies::<T>() {
return Err(ExtractorError::Unauthorized);
- };
+ }
+ let auth = macro_user_id
+ .map(EntityAccessAuth::Authenticated)
+ .unwrap_or(EntityAccessAuth::Unauthenticated);
+
+ project_access_receipt(project.id(), auth, permission)
+ };
+
+ Ok(ProjectBodyAccessOutcome::FoundProject {
+ project,
+ entity_access_receipt,
+ body: deserialize_body(json)?,
+ })
+}
- Ok(Self::FoundProject {
- entity_access_receipt: EntityAccessReceipt {
- entity: Entity {
- entity_id: project.id().to_owned(),
- entity_type: EntityType::Project,
- },
- auth: macro_user_id
- .map(EntityAccessAuth::Authenticated)
- .unwrap_or(EntityAccessAuth::Unauthenticated),
- entity_permission: permission,
- _marker: PhantomData,
- },
- project,
- desired: PhantomData,
- body: cb()?,
- })
+fn deserialize_body<V: DeserializeOwned>(json: serde_json::Value) -> Result<V, ExtractorError> {
+ serde_json::from_value(json).map_err(|_| ExtractorError::BadRequest("Invalid request body"))
+}
+
+fn project_access_receipt<T: RequiredPermission>(
+ project_id: &str,
+ auth: EntityAccessAuth,
+ entity_permission: EntityPermission,
+) -> EntityAccessReceipt<T> {
+ EntityAccessReceipt {
+ entity: Entity {
+ entity_id: project_id.to_owned(),
+ entity_type: EntityType::Project,
+ },
+ auth,
+ entity_permission,
+ _marker: PhantomData,
}
}
diff --git a/crates/entity_access/src/inbound/axum_extractors/project/test.rs b/crates/entity_access/src/inbound/axum_extractors/project/test.rs
new file mode 100644
index 0000000000..53e7e2671d
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/project/test.rs
@@ -0,0 +1,687 @@
+use std::sync::{Arc, Mutex};
+
+use axum::{
+ body::{Body, to_bytes},
+ extract::{FromRef, FromRequest, FromRequestParts},
+ http::{Request, StatusCode, header},
+ response::IntoResponse,
+};
+use macro_authorization::{
+ INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER, InternalIdentityClaims,
+ MacroAuthorizationError, MacroAuthorizationService, MacroAuthorizationState,
+};
+use macro_user_id::{lowercased::Lowercase, user_id::MacroUserId, user_id::MacroUserIdStr};
+use model_user::UserContext;
+use rootcause::Report;
+use uuid::Uuid;
+
+use super::*;
+use crate::domain::models::{
+ AccessError, BotId, CallChannelInfo, EditAccessLevel, EntityAccessAuth, UserTeamInfo,
+ ViewAccessLevel,
+};
+
+const PROJECT_ID: &str = "project-1";
+const OWNER_ID: &str = "macro|[email protected]";
+const VALID_INTERNAL_KEY: &str = "valid-internal-key";
+const USER_ID: &str = "macro|[email protected]";
+const INTERNAL_USER_ID: &str = "macro|[email protected]";
+
+#[derive(Debug, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct TestBody {
+ name: String,
+ #[serde(default)]
+ project_id: Option<String>,
+ #[serde(default)]
+ project_parent_id: Option<String>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+struct AccessCall {
+ user_id: Option<String>,
+ entity_id: String,
+ entity_type: EntityType,
+}
+
+#[derive(Clone, Debug)]
+struct FakeEntityAccessService {
+ access_level: Option<AccessLevel>,
+ calls: Arc<Mutex<Vec<AccessCall>>>,
+}
+
+impl FakeEntityAccessService {
+ fn new(access_level: Option<AccessLevel>) -> Self {
+ Self {
+ access_level,
+ calls: Arc::new(Mutex::new(Vec::new())),
+ }
+ }
+
+ fn calls(&self) -> Vec<AccessCall> {
+ self.calls.lock().expect("calls lock poisoned").clone()
+ }
+}
+
+impl EntityAccessService for FakeEntityAccessService {
+ async fn generate_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ _user_org_id: Option<i64>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_entity_access_receipt call")
+ }
+
+ async fn generate_bot_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _bot_id: BotId,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_bot_entity_access_receipt call")
+ }
+
+ async fn get_access_level(
+ &self,
+ user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ entity_id: &str,
+ entity_type: EntityType,
+ ) -> Result<Option<AccessLevel>, AccessError> {
+ self.calls
+ .lock()
+ .expect("calls lock poisoned")
+ .push(AccessCall {
+ user_id: user_id.map(|user_id| user_id.as_ref().to_string()),
+ entity_id: entity_id.to_string(),
+ entity_type,
+ });
+
+ Ok(self.access_level)
+ }
+
+ async fn check_access(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_access call")
+ }
+
+ async fn check_public_access(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_public_access call")
+ }
+
+ async fn get_entity_permission(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _user_org_id: Option<i64>,
+ ) -> Result<EntityPermission, AccessError> {
+ panic!("unexpected get_entity_permission call")
+ }
+
+ async fn get_crm_entity_permission_with_team(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<(EntityPermission, Uuid), AccessError> {
+ panic!("unexpected get_crm_entity_permission_with_team call")
+ }
+
+ async fn get_users_by_entity(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Vec<MacroUserIdStr<'static>>, AccessError> {
+ panic!("unexpected get_users_by_entity call")
+ }
+
+ async fn get_call_channel(
+ &self,
+ _call_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel call")
+ }
+
+ async fn get_call_channel_by_channel_id(
+ &self,
+ _channel_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel_by_channel_id call")
+ }
+
+ async fn get_user_team(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ ) -> Result<Option<UserTeamInfo>, AccessError> {
+ panic!("unexpected get_user_team call")
+ }
+}
+
+#[derive(Clone, Debug, Default)]
+struct FakeAuthorizationService;
+
+impl MacroAuthorizationService for FakeAuthorizationService {
+ async fn authorize(&self, jwt: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
+ match jwt {
+ "owner" => Ok(user_context(OWNER_ID)),
+ "valid" => Ok(user_context(USER_ID)),
+ "expired" => Err(Report::new(MacroAuthorizationError::CredentialsExpired)),
+ _ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
+ }
+ }
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ if provided_key != VALID_INTERNAL_KEY {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(claims.user_id.as_deref().map(user_context))
+ }
+}
+
+fn user_context(user_id: &str) -> UserContext {
+ UserContext {
+ user_id: user_id.to_string(),
+ fusion_user_id: "fusion-user-id".to_string(),
+ organization_id: None,
+ permissions: None,
+ }
+}
+
+#[derive(Clone)]
+struct TestState {
+ entity_access: Arc<FakeEntityAccessService>,
+ authorization: MacroAuthorizationState<FakeAuthorizationService>,
+}
+
+impl FromRef<TestState> for Arc<FakeEntityAccessService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.entity_access.clone()
+ }
+}
+
+impl FromRef<TestState> for MacroAuthorizationState<FakeAuthorizationService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.authorization.clone()
+ }
+}
+
+impl TestState {
+ fn new(access_level: Option<AccessLevel>) -> Self {
+ Self {
+ entity_access: Arc::new(FakeEntityAccessService::new(access_level)),
+ authorization: MacroAuthorizationState::new(Arc::new(FakeAuthorizationService)),
+ }
+ }
+}
+
+type EditExtractor = ProjectBodyAccessLevelExtractorV2<
+ EditAccessLevel,
+ TestBody,
+ FakeEntityAccessService,
+ FakeAuthorizationService,
+>;
+type ViewExtractor = ProjectBodyAccessLevelExtractorV2<
+ ViewAccessLevel,
+ TestBody,
+ FakeEntityAccessService,
+ FakeAuthorizationService,
+>;
+
+fn json_request(body: &str) -> Request<Body> {
+ Request::post("/")
+ .header(header::CONTENT_TYPE, "application/json")
+ .body(Body::from(body.to_string()))
+ .expect("request should be valid")
+}
+
+fn bearer_request(body: &str, token: &str) -> Request<Body> {
+ Request::post("/")
+ .header(header::CONTENT_TYPE, "application/json")
+ .header(header::AUTHORIZATION, format!("Bearer {token}"))
+ .body(Body::from(body.to_string()))
+ .expect("request should be valid")
+}
+
+fn internal_request(body: &str, user_id: Option<&str>) -> Request<Body> {
+ let mut request = Request::post("/")
+ .header(header::CONTENT_TYPE, "application/json")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY);
+ if let Some(user_id) = user_id {
+ request = request.header(INTERNAL_MACRO_USER_ID_HEADER, user_id);
+ }
+
+ request
+ .body(Body::from(body.to_string()))
+ .expect("request should be valid")
+}
+
+fn project(deleted: bool) -> BasicProject {
+ BasicProject {
+ id: PROJECT_ID.to_string(),
+ user_id: MacroUserIdStr::parse_from_str(OWNER_ID).expect("owner id should be valid"),
+ parent_id: None,
+ name: "Test project".to_string(),
+ deleted_at: deleted.then(|| {
+ "2026-01-01T00:00:00Z"
+ .parse()
+ .expect("deleted timestamp should be valid")
+ }),
+ }
+}
+
+fn project_request(token: Option<&str>, project: BasicProject) -> Request<Body> {
+ let mut request = Request::new(Body::empty());
+ request.extensions_mut().insert(project);
+ if let Some(token) = token {
+ request.headers_mut().insert(
+ header::AUTHORIZATION,
+ format!("Bearer {token}")
+ .parse()
+ .expect("header should be valid"),
+ );
+ }
+ request
+}
+
+fn internal_project_request(user_id: Option<&str>, project: BasicProject) -> Request<Body> {
+ let mut request = internal_request("", user_id);
+ request.extensions_mut().insert(project);
+ request
+}
+
+async fn extract_project_access<T: RequiredPermission>(
+ request: Request<Body>,
+ state: &TestState,
+) -> Result<
+ ProjectAccessLevelExtractor<T, FakeEntityAccessService, FakeAuthorizationService>,
+ ExtractorError,
+> {
+ let (mut parts, _) = request.into_parts();
+ ProjectAccessLevelExtractor::from_request_parts(&mut parts, state).await
+}
+
+#[tokio::test]
+async fn anonymous_project_access_returns_unauthenticated_receipt() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let extracted =
+ extract_project_access::<ViewAccessLevel>(project_request(None, project(false)), &state)
+ .await
+ .expect("public project access should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Unauthenticated
+ ));
+ assert_eq!(state.entity_access.calls()[0].user_id, None);
+}
+
+#[tokio::test]
+async fn authenticated_project_owner_bypasses_access_lookup() {
+ let state = TestState::new(None);
+ let extracted = extract_project_access::<EditAccessLevel>(
+ project_request(Some("owner"), project(false)),
+ &state,
+ )
+ .await
+ .expect("the project owner should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Owner
+ }
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn deleted_project_rejects_non_owner_before_access_lookup() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let result = extract_project_access::<ViewAccessLevel>(
+ project_request(Some("valid"), project(true)),
+ &state,
+ )
+ .await;
+
+ assert!(matches!(
+ result,
+ Err(ExtractorError::UnauthorizedWithMessage(
+ "only owner can access deleted resource"
+ ))
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn identity_less_internal_project_access_receives_owner_without_lookup() {
+ let state = TestState::new(None);
+ let extracted = extract_project_access::<EditAccessLevel>(
+ internal_project_request(None, project(false)),
+ &state,
+ )
+ .await
+ .expect("identity-less internal access should be allowed");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Internal
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn internal_project_act_as_identity_uses_acl() {
+ let state = TestState::new(Some(AccessLevel::Edit));
+ let extracted = extract_project_access::<EditAccessLevel>(
+ internal_project_request(Some(INTERNAL_USER_ID), project(false)),
+ &state,
+ )
+ .await
+ .expect("the internal identity should use its project ACL");
+
+ assert!(matches!(
+ extracted.entity_access_receipt.auth(),
+ EntityAccessAuth::Authenticated(user_id) if user_id.as_ref() == INTERNAL_USER_ID
+ ));
+ assert_eq!(
+ state.entity_access.calls(),
+ [AccessCall {
+ user_id: Some(INTERNAL_USER_ID.to_string()),
+ entity_id: PROJECT_ID.to_string(),
+ entity_type: EntityType::Project,
+ }]
+ );
+}
+
+#[tokio::test]
+async fn direct_project_id_with_sufficient_access_returns_receipt_and_body() {
+ let state = TestState::new(Some(AccessLevel::Edit));
+ let result = EditExtractor::from_request(
+ bearer_request(r#"{"name":"document","projectId":"project-1"}"#, "valid"),
+ &state,
+ )
+ .await
+ .expect("edit access should be allowed");
+
+ let ProjectBodyAccessLevelExtractorV2::FoundProject {
+ project,
+ entity_access_receipt,
+ body,
+ ..
+ } = result
+ else {
+ panic!("project should be found")
+ };
+
+ assert_eq!(project.id(), "project-1");
+ assert_eq!(body.name, "document");
+ assert_eq!(body.project_id.as_deref(), Some("project-1"));
+ assert!(body.project_parent_id.is_none());
+ assert_eq!(entity_access_receipt.entity().entity_id, "project-1");
+ assert!(matches!(
+ entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Edit
+ }
+ ));
+ assert!(matches!(
+ entity_access_receipt.auth(),
+ EntityAccessAuth::Authenticated(user_id) if user_id.to_string() == USER_ID
+ ));
+ assert_eq!(
+ state.entity_access.calls(),
+ [AccessCall {
+ user_id: Some(USER_ID.to_string()),
+ entity_id: "project-1".to_string(),
+ entity_type: EntityType::Project,
+ }]
+ );
+}
+
+#[tokio::test]
+async fn parent_project_id_is_used_for_access_lookup() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let result = EditExtractor::from_request(
+ bearer_request(
+ r#"{"name":"document","projectParentId":"parent-project"}"#,
+ "valid",
+ ),
+ &state,
+ )
+ .await
+ .expect("owner access should be allowed");
+
+ let ProjectBodyAccessLevelExtractorV2::FoundProject { project, body, .. } = result else {
+ panic!("parent project should be found")
+ };
+
+ assert_eq!(project.id(), "parent-project");
+ assert_eq!(body.project_parent_id.as_deref(), Some("parent-project"));
+ assert_eq!(state.entity_access.calls()[0].entity_id, "parent-project");
+}
+
+#[tokio::test]
+async fn insufficient_access_level_is_rejected() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let result = EditExtractor::from_request(
+ bearer_request(r#"{"name":"document","projectId":"project-1"}"#, "valid"),
+ &state,
+ )
+ .await;
+
+ assert!(matches!(result, Err(ExtractorError::Unauthorized)));
+}
+
+#[tokio::test]
+async fn anonymous_without_project_access_is_rejected() {
+ let state = TestState::new(None);
+ let result = EditExtractor::from_request(
+ json_request(r#"{"name":"document","projectId":"project-1"}"#),
+ &state,
+ )
+ .await;
+
+ assert!(matches!(result, Err(ExtractorError::Unauthorized)));
+ assert_eq!(state.entity_access.calls()[0].user_id, None);
+}
+
+#[tokio::test]
+async fn absent_project_returns_the_parsed_body_without_access_lookup() {
+ let state = TestState::new(None);
+ let result = EditExtractor::from_request(json_request(r#"{"name":"document"}"#), &state)
+ .await
+ .expect("a project is optional");
+
+ let ProjectBodyAccessLevelExtractorV2::ProjectNotInBody { body, .. } = result else {
+ panic!("project should not be found")
+ };
+
+ assert_eq!(body.name, "document");
+ assert!(body.project_id.is_none());
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn empty_project_id_returns_no_project_without_access_lookup() {
+ let state = TestState::new(None);
+ let result = EditExtractor::from_request(
+ json_request(r#"{"name":"document","projectId":""}"#),
+ &state,
+ )
+ .await
+ .expect("an empty project id clears the project");
+
+ assert!(matches!(
+ result,
+ ProjectBodyAccessLevelExtractorV2::ProjectNotInBody { .. }
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn malformed_json_and_invalid_body_are_distinguished() {
+ let state = TestState::new(Some(AccessLevel::Edit));
+ let malformed_json = EditExtractor::from_request(json_request("{"), &state).await;
+ assert!(matches!(
+ malformed_json,
+ Err(ExtractorError::BadRequest("Invalid JSON body"))
+ ));
+
+ let invalid_body = EditExtractor::from_request(
+ json_request(r#"{"name":42,"projectId":"project-1"}"#),
+ &state,
+ )
+ .await;
+ assert!(matches!(
+ invalid_body,
+ Err(ExtractorError::BadRequest("Invalid request body"))
+ ));
+}
+
+#[tokio::test]
+async fn anonymous_access_uses_public_project_access() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let result = ViewExtractor::from_request(
+ json_request(r#"{"name":"document","projectId":"public-project"}"#),
+ &state,
+ )
+ .await
+ .expect("anonymous view access should be allowed");
+
+ let ProjectBodyAccessLevelExtractorV2::FoundProject {
+ entity_access_receipt,
+ ..
+ } = result
+ else {
+ panic!("project should be found")
+ };
+
+ assert!(matches!(
+ entity_access_receipt.auth(),
+ EntityAccessAuth::Unauthenticated
+ ));
+ assert_eq!(state.entity_access.calls()[0].user_id, None);
+}
+
+#[tokio::test]
+async fn identity_less_internal_access_receives_owner_without_acl_lookup() {
+ let state = TestState::new(None);
+ let result = EditExtractor::from_request(
+ internal_request(
+ r#"{"name":"document","projectId":"internal-project"}"#,
+ None,
+ ),
+ &state,
+ )
+ .await
+ .expect("identity-less internal access should be allowed");
+
+ let ProjectBodyAccessLevelExtractorV2::FoundProject {
+ entity_access_receipt,
+ ..
+ } = result
+ else {
+ panic!("project should be found")
+ };
+
+ assert!(matches!(
+ entity_access_receipt.auth(),
+ EntityAccessAuth::Internal
+ ));
+ assert!(matches!(
+ entity_access_receipt.entity_permission(),
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Owner
+ }
+ ));
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[tokio::test]
+async fn internal_act_as_identity_must_satisfy_project_acl() {
+ let state = TestState::new(Some(AccessLevel::View));
+ let result = EditExtractor::from_request(
+ internal_request(
+ r#"{"name":"document","projectId":"internal-project"}"#,
+ Some(INTERNAL_USER_ID),
+ ),
+ &state,
+ )
+ .await;
+
+ assert!(matches!(result, Err(ExtractorError::Unauthorized)));
+ assert_eq!(
+ state.entity_access.calls(),
+ [AccessCall {
+ user_id: Some(INTERNAL_USER_ID.to_string()),
+ entity_id: "internal-project".to_string(),
+ entity_type: EntityType::Project,
+ }]
+ );
+}
+
+#[tokio::test]
+async fn expired_token_rejection_is_preserved() {
+ let state = TestState::new(Some(AccessLevel::Owner));
+ let error = EditExtractor::from_request(
+ bearer_request(r#"{"name":"document","projectId":"project-1"}"#, "expired"),
+ &state,
+ )
+ .await
+ .expect_err("an expired token should be rejected");
+
+ let response = error.into_response();
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("response body should be readable");
+ assert_eq!(body.as_ref(), br#"{"message":"jwt expired"}"#);
+ assert!(state.entity_access.calls().is_empty());
+}
+
+#[test]
+fn into_inner_matches_both_v2_variants() {
+ let without_project = EditExtractor::ProjectNotInBody {
+ body: TestBody {
+ name: "without project".to_string(),
+ project_id: None,
+ project_parent_id: None,
+ },
+ _marker: PhantomData,
+ };
+ assert_eq!(without_project.into_inner().name, "without project");
+
+ let with_project = EditExtractor::FoundProject {
+ project: ProjectOrParentId::ProjectId(ProjectId {
+ project_id: "project-1".to_string(),
+ }),
+ desired: PhantomData,
+ entity_access_receipt: EntityAccessReceipt::dangerously_assert_internal_user(
+ "project-1",
+ EntityType::Project,
+ ),
+ body: TestBody {
+ name: "with project".to_string(),
+ project_id: Some("project-1".to_string()),
+ project_parent_id: None,
+ },
+ };
+ assert_eq!(with_project.into_inner().name, "with project");
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/team.rs b/crates/entity_access/src/inbound/axum_extractors/team.rs
index 2dd4e1efde..d0633df845 100644
--- a/crates/entity_access/src/inbound/axum_extractors/team.rs
+++ b/crates/entity_access/src/inbound/axum_extractors/team.rs
@@ -4,6 +4,9 @@
//! the path — it resolves whichever team the authenticated user belongs to
//! and reports the role they hold.
+#[cfg(test)]
+mod test;
+
use std::marker::PhantomData;
use std::sync::Arc;
@@ -18,8 +21,61 @@ use crate::domain::{
models::{Entity, EntityAccessAuth, EntityAccessReceipt, EntityPermission, EntityType},
ports::EntityAccessService,
};
+use macro_authorization::{
+ MacroAuthorizationExtractor, MacroAuthorizationService, MacroAuthorizationState,
+};
+use macro_user_id::user_id::MacroUserIdStr;
use model_user::axum_extractor::MacroUserExtractor;
+enum TeamAccessOutcome<T: RequiredPermission> {
+ Qualifying(EntityAccessReceipt<T>),
+ NotInTeam,
+ InsufficientRole,
+}
+
+impl<T: RequiredPermission> TeamAccessOutcome<T> {
+ fn into_optional_receipt(self) -> Option<EntityAccessReceipt<T>> {
+ match self {
+ Self::Qualifying(receipt) => Some(receipt),
+ Self::NotInTeam | Self::InsufficientRole => None,
+ }
+ }
+}
+
+async fn team_access_outcome<T, Svc>(
+ service: &Svc,
+ macro_user_id: MacroUserIdStr<'static>,
+) -> Result<TeamAccessOutcome<T>, ExtractorError>
+where
+ T: RequiredPermission,
+ Svc: EntityAccessService,
+{
+ let Some(team_info) = service
+ .get_user_team(&macro_user_id)
+ .await
+ .map_err(ExtractorError::from)?
+ else {
+ return Ok(TeamAccessOutcome::NotInTeam);
+ };
+
+ let permission = EntityPermission::TeamRole {
+ role: team_info.role,
+ };
+ if !permission.satisfies::<T>() {
+ return Ok(TeamAccessOutcome::InsufficientRole);
+ }
+
+ Ok(TeamAccessOutcome::Qualifying(EntityAccessReceipt {
+ entity: Entity {
+ entity_id: team_info.team_id.to_string(),
+ entity_type: EntityType::Team,
+ },
+ auth: EntityAccessAuth::Authenticated(macro_user_id),
+ entity_permission: permission,
+ _marker: PhantomData,
+ }))
+}
+
/// Resolves the authenticated user's **OPTIONAL** team membership and exposes the receipt
/// when the user satisfies the required permission `T`.
///
@@ -66,39 +122,63 @@ where
.await
.map_err(|_| ExtractorError::Unauthorized)?;
- let team_info = service
- .get_user_team(&macro_user_id)
- .await
- .map_err(ExtractorError::from)?;
+ let outcome = team_access_outcome::<T, Svc>(service.as_ref(), macro_user_id).await?;
+
+ Ok(Self {
+ entity_access_receipt: outcome.into_optional_receipt(),
+ _marker: PhantomData,
+ })
+ }
+}
+
+/// Authorizes a user and resolves their optional team membership.
+///
+/// The extractor uses the required [`MacroAuthorizationExtractor`], so missing,
+/// invalid, and identity-less internal credentials are rejected. A qualifying
+/// team role produces a receipt; no membership or an insufficient role produces
+/// `None`.
+#[allow(dead_code)]
+#[derive(Debug)]
+pub struct OptionalMacroUserTeamExtractorV2<T: RequiredPermission, Svc, Auth> {
+ /// The entity access receipt, if the authorized user has a qualifying team membership.
+ pub entity_access_receipt: Option<EntityAccessReceipt<T>>,
+ _marker: PhantomData<(T, Svc, Auth)>,
+}
- let Some(team_info) = team_info else {
- return Ok(Self {
- entity_access_receipt: None,
- _marker: PhantomData,
- });
- };
-
- let permission = EntityPermission::TeamRole {
- role: team_info.role,
- };
-
- if !permission.satisfies::<T>() {
- return Ok(Self {
- entity_access_receipt: None,
- _marker: PhantomData,
- });
+impl<T: RequiredPermission, Svc, Auth> Clone for OptionalMacroUserTeamExtractorV2<T, Svc, Auth>
+where
+ EntityAccessReceipt<T>: Clone,
+{
+ fn clone(&self) -> Self {
+ Self {
+ entity_access_receipt: self.entity_access_receipt.clone(),
+ _marker: PhantomData,
}
+ }
+}
+
+impl<T, S, Svc, Auth> FromRequestParts<S> for OptionalMacroUserTeamExtractorV2<T, Svc, Auth>
+where
+ T: RequiredPermission,
+ Arc<Svc>: FromRef<S>,
+ Svc: EntityAccessService,
+ MacroAuthorizationState<Auth>: FromRef<S>,
+ Auth: MacroAuthorizationService,
+ S: Send + Sync + 'static,
+{
+ type Rejection = ExtractorError;
+
+ #[tracing::instrument(err, skip(state, parts))]
+ async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+ let service = <Arc<Svc>>::from_ref(state);
+ let MacroAuthorizationExtractor { macro_user_id, .. } = parts
+ .extract_with_state(state)
+ .await
+ .map_err(ExtractorError::from)?;
+ let outcome = team_access_outcome::<T, Svc>(service.as_ref(), macro_user_id).await?;
Ok(Self {
- entity_access_receipt: Some(EntityAccessReceipt {
- entity: Entity {
- entity_id: team_info.team_id.to_string(),
- entity_type: EntityType::Team,
- },
- auth: EntityAccessAuth::Authenticated(macro_user_id),
- entity_permission: permission,
- _marker: PhantomData,
- }),
+ entity_access_receipt: outcome.into_optional_receipt(),
_marker: PhantomData,
})
}
@@ -132,35 +212,21 @@ where
.await
.map_err(|_| ExtractorError::Unauthorized)?;
- let team_info = service
- .get_user_team(&macro_user_id)
- .await
- .map_err(ExtractorError::from)?;
-
- let Some(team_info) = team_info else {
- return Err(ExtractorError::UnauthorizedWithMessage("not in a team"));
- };
-
- let permission = EntityPermission::TeamRole {
- role: team_info.role,
- };
-
- if !permission.satisfies::<T>() {
- return Err(ExtractorError::UnauthorizedWithMessage(
- "you do not have a high enough role",
- ));
- }
+ let entity_access_receipt =
+ match team_access_outcome::<T, Svc>(service.as_ref(), macro_user_id).await? {
+ TeamAccessOutcome::Qualifying(receipt) => receipt,
+ TeamAccessOutcome::NotInTeam => {
+ return Err(ExtractorError::UnauthorizedWithMessage("not in a team"));
+ }
+ TeamAccessOutcome::InsufficientRole => {
+ return Err(ExtractorError::UnauthorizedWithMessage(
+ "you do not have a high enough role",
+ ));
+ }
+ };
Ok(Self {
- entity_access_receipt: EntityAccessReceipt {
- entity: Entity {
- entity_id: team_info.team_id.to_string(),
- entity_type: EntityType::Team,
- },
- auth: EntityAccessAuth::Authenticated(macro_user_id),
- entity_permission: permission,
- _marker: PhantomData,
- },
+ entity_access_receipt,
_marker: PhantomData,
})
}
diff --git a/crates/entity_access/src/inbound/axum_extractors/team/test.rs b/crates/entity_access/src/inbound/axum_extractors/team/test.rs
new file mode 100644
index 0000000000..92586a3df5
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/team/test.rs
@@ -0,0 +1,455 @@
+use std::{collections::HashMap, sync::Arc};
+
+use axum::{
+ body::{Body, to_bytes},
+ extract::{FromRef, FromRequestParts},
+ http::{Request, StatusCode, header},
+ response::{IntoResponse, Response},
+};
+#[allow(deprecated)]
+use macro_authorization::LEGACY_DSS_INTERNAL_API_KEY_HEADER;
+use macro_authorization::{
+ INTERNAL_API_KEY_HEADER, INTERNAL_MACRO_USER_ID_HEADER, InternalIdentityClaims,
+ MacroAuthorizationError, MacroAuthorizationService, MacroAuthorizationState,
+};
+use macro_user_id::{
+ lowercased::Lowercase,
+ user_id::{MacroUserId, MacroUserIdStr},
+};
+use model_user::UserContext;
+use rootcause::Report;
+use uuid::Uuid;
+
+use super::*;
+use crate::domain::models::{
+ AccessError, AccessLevel, AdminTeamRole, BotId, CallChannelInfo, EntityAccessAuth,
+ EntityPermission, TeamRole, UserTeamInfo,
+};
+
+const USER_ID: &str = "macro|[email protected]";
+const ACT_AS_USER_ID: &str = "macro|[email protected]";
+const DSS_DEFAULT_USER_ID: &str = "macro|[email protected]";
+const INTERNAL_KEY: &str = "valid-internal-key";
+const TEAM_ID: Uuid = Uuid::from_u128(0x6d67fd9b_9906_40aa_9c0e_cab546cb80ad);
+
+type V2Extractor = OptionalMacroUserTeamExtractorV2<
+ AdminTeamRole,
+ FakeEntityAccessService,
+ FakeAuthorizationService,
+>;
+type V1RequiredExtractor = MacroUserTeamExtractor<AdminTeamRole, FakeEntityAccessService>;
+
+#[derive(Clone, Debug, Default)]
+struct FakeEntityAccessService {
+ memberships: Arc<HashMap<String, UserTeamInfo>>,
+}
+
+impl FakeEntityAccessService {
+ fn with_membership(mut self, user_id: &str, role: TeamRole) -> Self {
+ Arc::make_mut(&mut self.memberships).insert(
+ user_id.to_string(),
+ UserTeamInfo {
+ team_id: TEAM_ID,
+ role,
+ },
+ );
+ self
+ }
+}
+
+impl EntityAccessService for FakeEntityAccessService {
+ async fn generate_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ _user_org_id: Option<i64>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn generate_bot_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _bot_id: BotId,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_access_level(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Option<AccessLevel>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn check_access(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn check_public_access(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_entity_permission(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _user_org_id: Option<i64>,
+ ) -> Result<EntityPermission, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_crm_entity_permission_with_team(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<(EntityPermission, Uuid), AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_users_by_entity(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Vec<MacroUserIdStr<'static>>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_call_channel(
+ &self,
+ _call_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_call_channel_by_channel_id(
+ &self,
+ _channel_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ Err(AccessError::Internal)
+ }
+
+ async fn get_user_team(
+ &self,
+ user_id: &MacroUserId<Lowercase<'_>>,
+ ) -> Result<Option<UserTeamInfo>, AccessError> {
+ Ok(self.memberships.get(user_id.as_ref()).copied())
+ }
+}
+
+#[derive(Clone, Debug, Default)]
+struct FakeAuthorizationService {
+ default_internal_user_id: Option<String>,
+}
+
+impl FakeAuthorizationService {
+ fn with_default_internal_user(user_id: &str) -> Self {
+ Self {
+ default_internal_user_id: Some(user_id.to_string()),
+ }
+ }
+}
+
+impl MacroAuthorizationService for FakeAuthorizationService {
+ async fn authorize(&self, jwt: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
+ match jwt {
+ "valid" => Ok(user_context(USER_ID)),
+ "expired" => Err(Report::new(MacroAuthorizationError::CredentialsExpired)),
+ _ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
+ }
+ }
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ if provided_key != INTERNAL_KEY {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(claims
+ .user_id
+ .or_else(|| self.default_internal_user_id.clone())
+ .map(|user_id| user_context(&user_id)))
+ }
+}
+
+struct TestState {
+ entity_access: Arc<FakeEntityAccessService>,
+ authorization: MacroAuthorizationState<FakeAuthorizationService>,
+}
+
+impl FromRef<TestState> for Arc<FakeEntityAccessService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.entity_access.clone()
+ }
+}
+
+impl FromRef<TestState> for MacroAuthorizationState<FakeAuthorizationService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.authorization.clone()
+ }
+}
+
+fn user_context(user_id: &str) -> UserContext {
+ UserContext {
+ user_id: user_id.to_string(),
+ fusion_user_id: "fusion-user-id".to_string(),
+ organization_id: None,
+ permissions: None,
+ }
+}
+
+fn state(
+ entity_access: FakeEntityAccessService,
+ authorization: FakeAuthorizationService,
+) -> TestState {
+ TestState {
+ entity_access: Arc::new(entity_access),
+ authorization: MacroAuthorizationState::new(Arc::new(authorization)),
+ }
+}
+
+fn request() -> Request<Body> {
+ Request::new(Body::empty())
+}
+
+fn bearer_request(token: &str) -> Request<Body> {
+ Request::builder()
+ .header(header::AUTHORIZATION, format!("Bearer {token}"))
+ .body(Body::empty())
+ .expect("request should be valid")
+}
+
+async fn extract_v2(
+ request: Request<Body>,
+ state: &TestState,
+) -> Result<V2Extractor, ExtractorError> {
+ let (mut parts, _) = request.into_parts();
+ V2Extractor::from_request_parts(&mut parts, state).await
+}
+
+async fn extract_v1_required(
+ mut request: Request<Body>,
+ state: &TestState,
+) -> Result<V1RequiredExtractor, ExtractorError> {
+ request.extensions_mut().insert(user_context(USER_ID));
+ let (mut parts, _) = request.into_parts();
+ V1RequiredExtractor::from_request_parts(&mut parts, state).await
+}
+
+async fn response_parts(response: Response) -> (StatusCode, String) {
+ let status = response.status();
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("response body should be readable");
+ let body = String::from_utf8(body.to_vec()).expect("response body should be UTF-8");
+ (status, body)
+}
+
+fn assert_receipt(receipt: &EntityAccessReceipt<AdminTeamRole>, user_id: &str, role: TeamRole) {
+ assert_eq!(receipt.entity().entity_id, TEAM_ID.to_string());
+ assert_eq!(receipt.entity().entity_type, EntityType::Team);
+ assert!(matches!(
+ receipt.auth(),
+ EntityAccessAuth::Authenticated(actual_user_id) if actual_user_id.to_string() == user_id
+ ));
+ assert!(matches!(
+ receipt.entity_permission(),
+ EntityPermission::TeamRole { role: actual_role } if *actual_role == role
+ ));
+}
+
+#[tokio::test]
+async fn qualifying_roles_return_authenticated_team_receipts() {
+ for role in [TeamRole::Admin, TeamRole::Owner] {
+ let state = state(
+ FakeEntityAccessService::default().with_membership(USER_ID, role),
+ FakeAuthorizationService::default(),
+ );
+
+ let extracted = extract_v2(bearer_request("valid"), &state)
+ .await
+ .expect("qualifying team membership should extract");
+ let receipt = extracted
+ .entity_access_receipt
+ .expect("qualifying role should produce a receipt");
+
+ assert_receipt(&receipt, USER_ID, role);
+ }
+}
+
+#[tokio::test]
+async fn non_qualifying_role_returns_no_receipt() {
+ let state = state(
+ FakeEntityAccessService::default().with_membership(USER_ID, TeamRole::Member),
+ FakeAuthorizationService::default(),
+ );
+
+ let extracted = extract_v2(bearer_request("valid"), &state)
+ .await
+ .expect("insufficient team membership should still extract");
+
+ assert!(extracted.entity_access_receipt.is_none());
+}
+
+#[tokio::test]
+async fn absent_membership_returns_no_receipt() {
+ let state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::default(),
+ );
+
+ let extracted = extract_v2(bearer_request("valid"), &state)
+ .await
+ .expect("a user without a team should still extract");
+
+ assert!(extracted.entity_access_receipt.is_none());
+}
+
+#[tokio::test]
+async fn missing_credentials_return_authorization_rejection() {
+ let state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::default(),
+ );
+
+ let error = extract_v2(request(), &state)
+ .await
+ .expect_err("required authorization should reject missing credentials");
+ let (status, body) = response_parts(error.into_response()).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, r#"{"message":"unauthorized"}"#);
+}
+
+#[tokio::test]
+async fn expired_credentials_preserve_authorization_response() {
+ let state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::default(),
+ );
+
+ let error = extract_v2(bearer_request("expired"), &state)
+ .await
+ .expect_err("expired credentials should be rejected");
+ let (status, body) = response_parts(error.into_response()).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, r#"{"message":"jwt expired"}"#);
+}
+
+#[tokio::test]
+async fn internal_act_as_identity_uses_ordinary_team_membership() {
+ let state = state(
+ FakeEntityAccessService::default().with_membership(ACT_AS_USER_ID, TeamRole::Owner),
+ FakeAuthorizationService::default(),
+ );
+ let request = Request::builder()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, ACT_AS_USER_ID)
+ .body(Body::empty())
+ .expect("request should be valid");
+
+ let extracted = extract_v2(request, &state)
+ .await
+ .expect("internal act-as membership should extract");
+ let receipt = extracted
+ .entity_access_receipt
+ .expect("qualifying act-as membership should produce a receipt");
+
+ assert_receipt(&receipt, ACT_AS_USER_ID, TeamRole::Owner);
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn dss_default_identity_without_team_returns_no_receipt() {
+ let state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::with_default_internal_user(DSS_DEFAULT_USER_ID),
+ );
+ let request = Request::builder()
+ .header(LEGACY_DSS_INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .body(Body::empty())
+ .expect("request should be valid");
+
+ let extracted = extract_v2(request, &state)
+ .await
+ .expect("configured DSS default identity should authorize");
+
+ assert!(extracted.entity_access_receipt.is_none());
+}
+
+#[tokio::test]
+async fn identity_less_internal_request_is_unauthorized() {
+ let state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::default(),
+ );
+ let request = Request::builder()
+ .header(INTERNAL_API_KEY_HEADER, INTERNAL_KEY)
+ .body(Body::empty())
+ .expect("request should be valid");
+
+ let error = extract_v2(request, &state)
+ .await
+ .expect_err("required authorization should reject an identity-less internal request");
+ let (status, body) = response_parts(error.into_response()).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, r#"{"message":"unauthorized"}"#);
+}
+
+#[tokio::test]
+async fn v1_required_extractor_preserves_team_failure_messages() {
+ let no_team_state = state(
+ FakeEntityAccessService::default(),
+ FakeAuthorizationService::default(),
+ );
+ let no_team_error = extract_v1_required(request(), &no_team_state)
+ .await
+ .expect_err("required V1 extraction should reject absent membership");
+ assert!(matches!(
+ no_team_error,
+ ExtractorError::UnauthorizedWithMessage("not in a team")
+ ));
+
+ let insufficient_role_state = state(
+ FakeEntityAccessService::default().with_membership(USER_ID, TeamRole::Member),
+ FakeAuthorizationService::default(),
+ );
+ let insufficient_role_error = extract_v1_required(request(), &insufficient_role_state)
+ .await
+ .expect_err("required V1 extraction should reject an insufficient role");
+ assert!(matches!(
+ insufficient_role_error,
+ ExtractorError::UnauthorizedWithMessage("you do not have a high enough role")
+ ));
+}
+
+#[test]
+fn v2_clone_does_not_require_service_types_to_be_clone() {
+ struct NotClone;
+
+ fn assert_clone<T: Clone>() {}
+
+ assert_clone::<OptionalMacroUserTeamExtractorV2<AdminTeamRole, NotClone, NotClone>>();
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/test.rs b/crates/entity_access/src/inbound/axum_extractors/test.rs
new file mode 100644
index 0000000000..158ecc640a
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/test.rs
@@ -0,0 +1,55 @@
+use std::borrow::Cow;
+
+use axum::{
+ Json,
+ body::to_bytes,
+ http::StatusCode,
+ response::{IntoResponse, Response},
+};
+use macro_authorization::MacroAuthorizationRejection;
+use model_error_response::ErrorResponse;
+
+use super::ExtractorError;
+
+async fn response_parts(response: Response) -> (StatusCode, String) {
+ let status = response.status();
+ let body = to_bytes(response.into_body(), usize::MAX)
+ .await
+ .expect("authorization error response body should be readable");
+ let body = String::from_utf8(body.to_vec())
+ .expect("authorization error response body should be UTF-8");
+
+ (status, body)
+}
+
+#[tokio::test]
+async fn authorization_rejection_preserves_status_and_owned_message() {
+ let rejection: MacroAuthorizationRejection = (
+ StatusCode::FORBIDDEN,
+ Json(ErrorResponse {
+ message: Cow::Owned("access forbidden".to_string()),
+ }),
+ );
+
+ let response = ExtractorError::from(rejection).into_response();
+ let (status, body) = response_parts(response).await;
+
+ assert_eq!(status, StatusCode::FORBIDDEN);
+ assert_eq!(body, r#"{"message":"access forbidden"}"#);
+}
+
+#[tokio::test]
+async fn authorization_rejection_preserves_jwt_expired_response() {
+ let rejection: MacroAuthorizationRejection = (
+ StatusCode::UNAUTHORIZED,
+ Json(ErrorResponse {
+ message: Cow::Borrowed("jwt expired"),
+ }),
+ );
+
+ let response = ExtractorError::from(rejection).into_response();
+ let (status, body) = response_parts(response).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, r#"{"message":"jwt expired"}"#);
+}
diff --git a/crates/entity_access/src/inbound/axum_extractors/test_support.rs b/crates/entity_access/src/inbound/axum_extractors/test_support.rs
new file mode 100644
index 0000000000..2b56feca56
--- /dev/null
+++ b/crates/entity_access/src/inbound/axum_extractors/test_support.rs
@@ -0,0 +1,219 @@
+use std::sync::{Arc, Mutex};
+
+use axum::extract::FromRef;
+use macro_authorization::{
+ InternalIdentityClaims, MacroAuthorizationError, MacroAuthorizationService,
+ MacroAuthorizationState,
+};
+use macro_user_id::{
+ lowercased::Lowercase,
+ user_id::{MacroUserId, MacroUserIdStr},
+};
+use model_user::UserContext;
+use rootcause::Report;
+use uuid::Uuid;
+
+use super::RequiredPermission;
+use crate::domain::{
+ models::{
+ AccessError, AccessLevel, BotId, CallChannelInfo, EntityAccessReceipt, EntityPermission,
+ EntityType, UserTeamInfo,
+ },
+ ports::EntityAccessService,
+};
+
+pub(super) const INTERNAL_KEY: &str = "valid-internal-key";
+pub(super) const USER_ID: &str = "macro|[email protected]";
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(super) struct AccessCall {
+ pub(super) user_id: Option<String>,
+ pub(super) entity_id: String,
+ pub(super) entity_type: EntityType,
+}
+
+#[derive(Clone, Debug)]
+pub(super) struct FakeEntityAccessService {
+ access_level: Option<AccessLevel>,
+ calls: Arc<Mutex<Vec<AccessCall>>>,
+}
+
+impl FakeEntityAccessService {
+ pub(super) fn new(access_level: Option<AccessLevel>) -> Self {
+ Self {
+ access_level,
+ calls: Arc::new(Mutex::new(Vec::new())),
+ }
+ }
+
+ pub(super) fn calls(&self) -> Vec<AccessCall> {
+ self.calls.lock().expect("calls lock poisoned").clone()
+ }
+}
+
+impl EntityAccessService for FakeEntityAccessService {
+ async fn generate_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ _user_org_id: Option<i64>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_entity_access_receipt call")
+ }
+
+ async fn generate_bot_entity_access_receipt<T: RequiredPermission>(
+ &self,
+ _bot_id: BotId,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<EntityAccessReceipt<T>, AccessError> {
+ panic!("unexpected generate_bot_entity_access_receipt call")
+ }
+
+ async fn get_access_level(
+ &self,
+ user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ entity_id: &str,
+ entity_type: EntityType,
+ ) -> Result<Option<AccessLevel>, AccessError> {
+ self.calls
+ .lock()
+ .expect("calls lock poisoned")
+ .push(AccessCall {
+ user_id: user_id.map(|user_id| user_id.as_ref().to_string()),
+ entity_id: entity_id.to_string(),
+ entity_type,
+ });
+
+ Ok(self.access_level)
+ }
+
+ async fn check_access(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_access call")
+ }
+
+ async fn check_public_access(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _required_level: AccessLevel,
+ ) -> Result<AccessLevel, AccessError> {
+ panic!("unexpected check_public_access call")
+ }
+
+ async fn get_entity_permission(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ _user_org_id: Option<i64>,
+ ) -> Result<EntityPermission, AccessError> {
+ panic!("unexpected get_entity_permission call")
+ }
+
+ async fn get_crm_entity_permission_with_team(
+ &self,
+ _user_id: Option<&MacroUserId<Lowercase<'_>>>,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<(EntityPermission, Uuid), AccessError> {
+ panic!("unexpected get_crm_entity_permission_with_team call")
+ }
+
+ async fn get_users_by_entity(
+ &self,
+ _entity_id: &str,
+ _entity_type: EntityType,
+ ) -> Result<Vec<MacroUserIdStr<'static>>, AccessError> {
+ panic!("unexpected get_users_by_entity call")
+ }
+
+ async fn get_call_channel(
+ &self,
+ _call_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel call")
+ }
+
+ async fn get_call_channel_by_channel_id(
+ &self,
+ _channel_id: &Uuid,
+ ) -> Result<Option<CallChannelInfo>, AccessError> {
+ panic!("unexpected get_call_channel_by_channel_id call")
+ }
+
+ async fn get_user_team(
+ &self,
+ _user_id: &MacroUserId<Lowercase<'_>>,
+ ) -> Result<Option<UserTeamInfo>, AccessError> {
+ panic!("unexpected get_user_team call")
+ }
+}
+
+#[derive(Clone, Debug, Default)]
+pub(super) struct FakeAuthorizationService;
+
+impl MacroAuthorizationService for FakeAuthorizationService {
+ async fn authorize(&self, jwt: &str) -> Result<UserContext, Report<MacroAuthorizationError>> {
+ match jwt {
+ "valid" => Ok(user_context(USER_ID)),
+ "expired" => Err(Report::new(MacroAuthorizationError::CredentialsExpired)),
+ _ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
+ }
+ }
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ if provided_key != INTERNAL_KEY {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ Ok(claims.user_id.as_deref().map(user_context))
+ }
+}
+
+fn user_context(user_id: &str) -> UserContext {
+ UserContext {
+ user_id: user_id.to_string(),
+ fusion_user_id: "fusion-user-id".to_string(),
+ organization_id: None,
+ permissions: None,
+ }
+}
+
+#[derive(Clone)]
+pub(super) struct TestState {
+ pub(super) entity_access: Arc<FakeEntityAccessService>,
+ authorization: MacroAuthorizationState<FakeAuthorizationService>,
+}
+
+impl TestState {
+ pub(super) fn new(access_level: Option<AccessLevel>) -> Self {
+ Self {
+ entity_access: Arc::new(FakeEntityAccessService::new(access_level)),
+ authorization: MacroAuthorizationState::new(Arc::new(FakeAuthorizationService)),
+ }
+ }
+}
+
+impl FromRef<TestState> for Arc<FakeEntityAccessService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.entity_access.clone()
+ }
+}
+
+impl FromRef<TestState> for MacroAuthorizationState<FakeAuthorizationService> {
+ fn from_ref(state: &TestState) -> Self {
+ state.authorization.clone()
+ }
+}
diff --git a/crates/macro_authorization/Cargo.toml b/crates/macro_authorization/Cargo.toml
index 0261e2b83b..70b1cc3f58 100644
--- a/crates/macro_authorization/Cargo.toml
+++ b/crates/macro_authorization/Cargo.toml
@@ -14,11 +14,14 @@ axum = [
"dep:tracing",
]
default = ["axum", "outbound"]
+local_auth = ["dep:macro_env_var"]
outbound = ["dep:macro_auth", "dep:tracing"]
[dependencies]
axum = { workspace = true, optional = true }
+constant_time_eq = { workspace = true }
macro_auth = { path = "../macro_auth", optional = true }
+macro_env_var = { path = "../macro_env_var", optional = true }
macro_user_id = { path = "../macro_user_id", optional = true }
model-error-response = { path = "../model-error-response", optional = true }
model_user = { path = "../model_user" }
diff --git a/crates/macro_authorization/src/domain/models.rs b/crates/macro_authorization/src/domain/models.rs
index 4fbaf125f0..09c8247437 100644
--- a/crates/macro_authorization/src/domain/models.rs
+++ b/crates/macro_authorization/src/domain/models.rs
@@ -2,6 +2,26 @@ use std::collections::HashSet;
use thiserror::Error;
+/// Identity claims presented by an internally authenticated caller.
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct InternalIdentityClaims {
+ /// The acting user's Macro identifier, when the caller acts on a user's behalf.
+ pub user_id: Option<String>,
+ /// The acting user's FusionAuth identifier.
+ pub fusion_user_id: Option<String>,
+ /// The acting user's organization.
+ pub organization_id: Option<i32>,
+}
+
+/// Configuration enabling internal service-to-service authorization.
+#[derive(Clone)]
+pub struct InternalAuthConfig {
+ /// The shared secret internal callers must present.
+ pub api_key: String,
+ /// Identity assumed for internal callers that supply no acting user.
+ pub default_user_id: Option<String>,
+}
+
/// An identity whose credential has already passed cryptographic validation.
///
/// Validation adapters construct this value without exposing token claim types
diff --git a/crates/macro_authorization/src/domain/ports.rs b/crates/macro_authorization/src/domain/ports.rs
index 89c28c1ca5..21fdc290df 100644
--- a/crates/macro_authorization/src/domain/ports.rs
+++ b/crates/macro_authorization/src/domain/ports.rs
@@ -3,7 +3,7 @@ use std::future::Future;
use model_user::UserContext;
use rootcause::Report;
-use super::models::{MacroAuthorizationError, ValidatedIdentity};
+use super::models::{InternalIdentityClaims, MacroAuthorizationError, ValidatedIdentity};
/// Cryptographic credential validation used by the authorization domain.
///
@@ -24,4 +24,14 @@ pub trait MacroAuthorizationService: Clone + Send + Sync + 'static {
&self,
jwt: &str,
) -> impl Future<Output = Result<UserContext, Report<MacroAuthorizationError>>> + Send;
+
+ /// Authorize an internal service-to-service caller.
+ ///
+ /// Returns `Ok(None)` when the key is valid but no identity is established
+ /// by either the acting-user claim or the configured default.
+ fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> impl Future<Output = Result<Option<UserContext>, Report<MacroAuthorizationError>>> + Send;
}
diff --git a/crates/macro_authorization/src/domain/service.rs b/crates/macro_authorization/src/domain/service.rs
index e8359eed82..3c99f3efc8 100644
--- a/crates/macro_authorization/src/domain/service.rs
+++ b/crates/macro_authorization/src/domain/service.rs
@@ -1,11 +1,12 @@
#[cfg(test)]
mod test;
+use constant_time_eq::constant_time_eq;
use model_user::UserContext;
use rootcause::Report;
use super::{
- models::MacroAuthorizationError,
+ models::{InternalAuthConfig, InternalIdentityClaims, MacroAuthorizationError},
ports::{JwtValidator, MacroAuthorizationService},
};
@@ -13,12 +14,16 @@ use super::{
#[derive(Clone)]
pub struct MacroAuthorizationServiceImpl<V> {
validator: V,
+ internal_auth: InternalAuthConfig,
}
impl<V> MacroAuthorizationServiceImpl<V> {
- /// Create an authorization service using the supplied validator.
- pub fn new(validator: V) -> Self {
- Self { validator }
+ /// Create an authorization service using the supplied validator and required internal authorization configuration.
+ pub fn new(validator: V, internal_auth: InternalAuthConfig) -> Self {
+ Self {
+ validator,
+ internal_auth,
+ }
}
}
@@ -36,4 +41,31 @@ where
organization_id: identity.organization_id,
})
}
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ if !constant_time_eq(
+ provided_key.as_bytes(),
+ self.internal_auth.api_key.as_bytes(),
+ ) {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ let Some(user_id) = claims
+ .user_id
+ .or_else(|| self.internal_auth.default_user_id.clone())
+ else {
+ return Ok(None);
+ };
+
+ Ok(Some(UserContext {
+ user_id,
+ fusion_user_id: claims.fusion_user_id.unwrap_or_default(),
+ permissions: None,
+ organization_id: claims.organization_id,
+ }))
+ }
}
diff --git a/crates/macro_authorization/src/domain/service/test.rs b/crates/macro_authorization/src/domain/service/test.rs
index e2500f9dcb..5b043c1d8e 100644
--- a/crates/macro_authorization/src/domain/service/test.rs
+++ b/crates/macro_authorization/src/domain/service/test.rs
@@ -4,7 +4,9 @@ use rootcause::Report;
use super::*;
use crate::domain::{
- models::{MacroAuthorizationError, ValidatedIdentity},
+ models::{
+ InternalAuthConfig, InternalIdentityClaims, MacroAuthorizationError, ValidatedIdentity,
+ },
ports::JwtValidator,
};
@@ -19,17 +21,40 @@ impl JwtValidator for FakeJwtValidator {
}
}
+const INTERNAL_API_KEY: &str = "secret-key";
+
+fn internal_auth_config(default_user_id: Option<&str>) -> InternalAuthConfig {
+ InternalAuthConfig {
+ api_key: INTERNAL_API_KEY.to_string(),
+ default_user_id: default_user_id.map(str::to_string),
+ }
+}
+
+fn service_with_internal_auth(
+ default_user_id: Option<&str>,
+) -> MacroAuthorizationServiceImpl<FakeJwtValidator> {
+ MacroAuthorizationServiceImpl::new(
+ FakeJwtValidator {
+ result: Err(MacroAuthorizationError::InvalidCredentials),
+ },
+ internal_auth_config(default_user_id),
+ )
+}
+
#[tokio::test]
async fn authorize_constructs_user_context_from_validated_identity() {
let permissions = HashSet::from(["documents:read".to_string(), "documents:write".to_string()]);
- let service = MacroAuthorizationServiceImpl::new(FakeJwtValidator {
- result: Ok(ValidatedIdentity {
- user_id: "macro|[email protected]".to_string(),
- fusion_user_id: "fusion-user-id".to_string(),
- organization_id: Some(42),
- permissions: Some(permissions.clone()),
- }),
- });
+ let service = MacroAuthorizationServiceImpl::new(
+ FakeJwtValidator {
+ result: Ok(ValidatedIdentity {
+ user_id: "macro|[email protected]".to_string(),
+ fusion_user_id: "fusion-user-id".to_string(),
+ organization_id: Some(42),
+ permissions: Some(permissions.clone()),
+ }),
+ },
+ internal_auth_config(None),
+ );
let context = service.authorize("valid-jwt").await.unwrap();
@@ -39,11 +64,80 @@ async fn authorize_constructs_user_context_from_validated_identity() {
assert_eq!(context.permissions, Some(permissions));
}
+#[tokio::test]
+async fn authorize_internal_rejects_an_incorrect_key() {
+ let service = service_with_internal_auth(None);
+
+ let error = service
+ .authorize_internal("secret-kex", InternalIdentityClaims::default())
+ .await
+ .unwrap_err();
+
+ assert_eq!(
+ error.current_context(),
+ &MacroAuthorizationError::InvalidCredentials
+ );
+}
+
+#[tokio::test]
+async fn authorize_internal_maps_explicit_identity_claims() {
+ let service = service_with_internal_auth(Some("macro|[email protected]"));
+
+ let context = service
+ .authorize_internal(
+ INTERNAL_API_KEY,
+ InternalIdentityClaims {
+ user_id: Some("macro|[email protected]".to_string()),
+ fusion_user_id: Some("fusion-user-id".to_string()),
+ organization_id: Some(42),
+ },
+ )
+ .await
+ .unwrap()
+ .expect("explicit user claim should establish an identity");
+
+ assert_eq!(context.user_id, "macro|[email protected]");
+ assert_eq!(context.fusion_user_id, "fusion-user-id");
+ assert_eq!(context.organization_id, Some(42));
+ assert_eq!(context.permissions, None);
+}
+
+#[tokio::test]
+async fn authorize_internal_uses_the_configured_default_user() {
+ let service = service_with_internal_auth(Some("macro|[email protected]"));
+
+ let context = service
+ .authorize_internal(INTERNAL_API_KEY, InternalIdentityClaims::default())
+ .await
+ .unwrap()
+ .expect("configured default user should establish an identity");
+
+ assert_eq!(context.user_id, "macro|[email protected]");
+ assert_eq!(context.fusion_user_id, "");
+ assert_eq!(context.organization_id, None);
+ assert_eq!(context.permissions, None);
+}
+
+#[tokio::test]
+async fn authorize_internal_returns_none_without_an_identity() {
+ let service = service_with_internal_auth(None);
+
+ let context = service
+ .authorize_internal(INTERNAL_API_KEY, InternalIdentityClaims::default())
+ .await
+ .unwrap();
+
+ assert!(context.is_none());
+}
+
#[tokio::test]
async fn authorize_propagates_expired_credentials() {
- let service = MacroAuthorizationServiceImpl::new(FakeJwtValidator {
- result: Err(MacroAuthorizationError::CredentialsExpired),
- });
+ let service = MacroAuthorizationServiceImpl::new(
+ FakeJwtValidator {
+ result: Err(MacroAuthorizationError::CredentialsExpired),
+ },
+ internal_auth_config(None),
+ );
let error = service.authorize("expired-jwt").await.unwrap_err();
@@ -55,9 +149,12 @@ async fn authorize_propagates_expired_credentials() {
#[tokio::test]
async fn authorize_propagates_invalid_credentials() {
- let service = MacroAuthorizationServiceImpl::new(FakeJwtValidator {
- result: Err(MacroAuthorizationError::InvalidCredentials),
- });
+ let service = MacroAuthorizationServiceImpl::new(
+ FakeJwtValidator {
+ result: Err(MacroAuthorizationError::InvalidCredentials),
+ },
+ internal_auth_config(None),
+ );
let error = service.authorize("invalid-jwt").await.unwrap_err();
diff --git a/crates/macro_authorization/src/inbound.rs b/crates/macro_authorization/src/inbound.rs
index 49d978ce30..1d4637fcd7 100644
--- a/crates/macro_authorization/src/inbound.rs
+++ b/crates/macro_authorization/src/inbound.rs
@@ -3,6 +3,11 @@
/// Axum extractors backed by the authorization service.
pub mod axum;
+#[allow(deprecated)]
pub use axum::{
- MacroAuthorizationExtractor, MacroAuthorizationRejection, OptionalMacroAuthorizationExtractor,
+ INTERNAL_API_KEY_HEADER, INTERNAL_FUSIONAUTH_USER_ID_HEADER,
+ INTERNAL_MACRO_ORGANIZATION_ID_HEADER, INTERNAL_MACRO_USER_ID_HEADER,
+ InternalMacroAuthorizationExtractor, LEGACY_DSS_INTERNAL_API_KEY_HEADER,
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER, MacroAuthorizationExtractor,
+ MacroAuthorizationRejection, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
};
diff --git a/crates/macro_authorization/src/inbound/axum.rs b/crates/macro_authorization/src/inbound/axum.rs
index 35eebd5d17..97b997320c 100644
--- a/crates/macro_authorization/src/inbound/axum.rs
+++ b/crates/macro_authorization/src/inbound/axum.rs
@@ -6,20 +6,64 @@ use std::{marker::PhantomData, sync::Arc};
use ::axum::{
Json,
extract::{FromRef, FromRequestParts, Query},
- http::{StatusCode, header, request::Parts},
+ http::{HeaderMap, StatusCode, header, request::Parts},
};
use macro_auth::headers::AccessTokenExtractor;
+#[cfg(feature = "local_auth")]
+use macro_env_var::maybe_env_vars;
use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};
use model_error_response::ErrorResponse;
use model_user::UserContext;
use rootcause::Report;
use serde::Deserialize;
-use crate::{MacroAuthorizationError, MacroAuthorizationService};
+use crate::{InternalIdentityClaims, MacroAuthorizationError, MacroAuthorizationService};
+
+/// Header carrying the shared key for standard internal service authorization.
+pub const INTERNAL_API_KEY_HEADER: &str = "x-internal-auth-key";
+/// Header carrying the acting Macro user ID for standard internal authorization.
+pub const INTERNAL_MACRO_USER_ID_HEADER: &str = "x-internal-macro-user-id";
+/// Header carrying the acting organization ID for standard internal authorization.
+pub const INTERNAL_MACRO_ORGANIZATION_ID_HEADER: &str = "x-internal-macro-organization-id";
+/// Header carrying the acting FusionAuth user ID for standard internal authorization.
+pub const INTERNAL_FUSIONAUTH_USER_ID_HEADER: &str = "x-internal-fusionauth-user-id";
+
+/// Legacy DSS header carrying the internal service authorization key.
+#[deprecated(note = "migrate callers to INTERNAL_API_KEY_HEADER")]
+pub const LEGACY_DSS_INTERNAL_API_KEY_HEADER: &str = "x-document-storage-service-auth-key";
+/// Legacy DSS header carrying the acting Macro user ID.
+#[deprecated(note = "migrate callers to INTERNAL_MACRO_USER_ID_HEADER")]
+pub const LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER: &str = "x-document-storage-service-user-id";
/// Rejection returned when request credentials cannot authorize a user.
pub type MacroAuthorizationRejection = (StatusCode, Json<ErrorResponse<'static>>);
+/// Axum state containing the service used by authorization extractors.
+pub struct MacroAuthorizationState<Svc> {
+ service: Arc<Svc>,
+}
+
+impl<Svc> MacroAuthorizationState<Svc> {
+ /// Create authorization state backed by the supplied service.
+ pub fn new(service: Arc<Svc>) -> Self {
+ Self { service }
+ }
+}
+
+impl<Svc> Clone for MacroAuthorizationState<Svc> {
+ fn clone(&self) -> Self {
+ Self {
+ service: self.service.clone(),
+ }
+ }
+}
+
+#[cfg(feature = "local_auth")]
+maybe_env_vars! {
+ struct LocalUserId;
+ struct LocalFusionUserId;
+}
+
#[derive(Deserialize)]
#[serde(rename_all = "kebab-case")]
struct AuthorizationQuery {
@@ -31,17 +75,47 @@ struct AuthorizedUser {
user_context: UserContext,
}
+struct AuthorizationOutcome {
+ identity: Option<AuthorizedUser>,
+ is_internal_access: bool,
+}
+
+struct InternalHeaderConvention {
+ key_header: &'static str,
+ user_id_header: &'static str,
+ organization_id_header: Option<&'static str>,
+ fusion_user_id_header: Option<&'static str>,
+}
+
+#[allow(deprecated)]
+static INTERNAL_HEADER_CONVENTIONS: [InternalHeaderConvention; 2] = [
+ InternalHeaderConvention {
+ key_header: INTERNAL_API_KEY_HEADER,
+ user_id_header: INTERNAL_MACRO_USER_ID_HEADER,
+ organization_id_header: Some(INTERNAL_MACRO_ORGANIZATION_ID_HEADER),
+ fusion_user_id_header: Some(INTERNAL_FUSIONAUTH_USER_ID_HEADER),
+ },
+ InternalHeaderConvention {
+ key_header: LEGACY_DSS_INTERNAL_API_KEY_HEADER,
+ user_id_header: LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+ organization_id_header: None,
+ fusion_user_id_header: None,
+ },
+];
+
/// Extracts and authorizes credentials for a required authenticated user.
///
-/// Credentials are read from the `macro-api-token` query parameter first,
-/// followed by a bearer header or access-token cookie. The authorization
-/// service is resolved from Axum state.
+/// Internal service credentials are checked first. User credentials are read
+/// from the `macro-api-token` query parameter, followed by a bearer header or
+/// access-token cookie. The authorization service is resolved from Axum state.
#[non_exhaustive]
pub struct MacroAuthorizationExtractor<Svc> {
/// The validated Macro user identifier.
pub macro_user_id: MacroUserIdStr<'static>,
/// The complete context returned by the authorization service.
pub user_context: UserContext,
+ /// True when the request authenticated with an internal service key rather than user credentials.
+ pub is_internal_access: bool,
_service: PhantomData<fn() -> Svc>,
}
@@ -50,6 +124,7 @@ impl<Svc> Clone for MacroAuthorizationExtractor<Svc> {
Self {
macro_user_id: self.macro_user_id.clone(),
user_context: self.user_context.clone(),
+ is_internal_access: self.is_internal_access,
_service: PhantomData,
}
}
@@ -57,20 +132,60 @@ impl<Svc> Clone for MacroAuthorizationExtractor<Svc> {
impl<S, Svc> FromRequestParts<S> for MacroAuthorizationExtractor<Svc>
where
- Arc<Svc>: FromRef<S>,
+ MacroAuthorizationState<Svc>: FromRef<S>,
Svc: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = MacroAuthorizationRejection;
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
- let Some(authorized_user) = authorize_request::<S, Svc>(parts, state).await? else {
+ let outcome = authorize_request::<S, Svc>(parts, state).await?;
+ let Some(authorized_user) = outcome.identity else {
return Err(rejection("unauthorized"));
};
Ok(Self {
macro_user_id: authorized_user.macro_user_id,
user_context: authorized_user.user_context,
+ is_internal_access: outcome.is_internal_access,
+ _service: PhantomData,
+ })
+ }
+}
+
+/// Authorizes an internal service request using its internal API key.
+///
+/// Both the standard and legacy DSS internal API key headers are accepted.
+/// Acting-user identity headers are forwarded to the authorization service so
+/// it can construct a user context, but only the internal API key is required.
+#[non_exhaustive]
+pub struct InternalMacroAuthorizationExtractor<Svc> {
+ _service: PhantomData<fn() -> Svc>,
+}
+
+impl<Svc> Clone for InternalMacroAuthorizationExtractor<Svc> {
+ fn clone(&self) -> Self {
+ Self {
+ _service: PhantomData,
+ }
+ }
+}
+
+impl<S, Svc> FromRequestParts<S> for InternalMacroAuthorizationExtractor<Svc>
+where
+ MacroAuthorizationState<Svc>: FromRef<S>,
+ Svc: MacroAuthorizationService,
+ S: Send + Sync + 'static,
+{
+ type Rejection = MacroAuthorizationRejection;
+
+ async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
+ let convention =
+ internal_header_convention(&parts.headers).ok_or_else(|| rejection("unauthorized"))?;
+
+ authorize_internal_request::<S, Svc>(parts, state, convention).await?;
+
+ Ok(Self {
_service: PhantomData,
})
}
@@ -86,6 +201,8 @@ pub struct OptionalMacroAuthorizationExtractor<Svc> {
pub macro_user_id: Option<MacroUserIdStr<'static>>,
/// The authorized context, or the default context for an anonymous request.
pub user_context: UserContext,
+ /// True when the request authenticated with an internal service key rather than user credentials.
+ pub is_internal_access: bool,
_service: PhantomData<fn() -> Svc>,
}
@@ -94,6 +211,7 @@ impl<Svc> Clone for OptionalMacroAuthorizationExtractor<Svc> {
Self {
macro_user_id: self.macro_user_id.clone(),
user_context: self.user_context.clone(),
+ is_internal_access: self.is_internal_access,
_service: PhantomData,
}
}
@@ -101,17 +219,19 @@ impl<Svc> Clone for OptionalMacroAuthorizationExtractor<Svc> {
impl<S, Svc> FromRequestParts<S> for OptionalMacroAuthorizationExtractor<Svc>
where
- Arc<Svc>: FromRef<S>,
+ MacroAuthorizationState<Svc>: FromRef<S>,
Svc: MacroAuthorizationService,
S: Send + Sync + 'static,
{
type Rejection = MacroAuthorizationRejection;
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
- let Some(authorized_user) = authorize_request::<S, Svc>(parts, state).await? else {
+ let outcome = authorize_request::<S, Svc>(parts, state).await?;
+ let Some(authorized_user) = outcome.identity else {
return Ok(Self {
macro_user_id: None,
user_context: UserContext::default(),
+ is_internal_access: outcome.is_internal_access,
_service: PhantomData,
});
};
@@ -119,6 +239,7 @@ where
Ok(Self {
macro_user_id: Some(authorized_user.macro_user_id),
user_context: authorized_user.user_context,
+ is_internal_access: outcome.is_internal_access,
_service: PhantomData,
})
}
@@ -127,21 +248,79 @@ where
async fn authorize_request<S, Svc>(
parts: &mut Parts,
state: &S,
-) -> Result<Option<AuthorizedUser>, MacroAuthorizationRejection>
+) -> Result<AuthorizationOutcome, MacroAuthorizationRejection>
where
- Arc<Svc>: FromRef<S>,
+ MacroAuthorizationState<Svc>: FromRef<S>,
Svc: MacroAuthorizationService,
S: Send + Sync + 'static,
{
+ if let Some(convention) = internal_header_convention(&parts.headers) {
+ return authorize_internal_request::<S, Svc>(parts, state, convention).await;
+ }
+
+ #[cfg(feature = "local_auth")]
+ if let Some(user_context) = local_user_context() {
+ return authorization_outcome(Some(user_context), false);
+ }
+
let Some(token) = extract_token(parts, state).await? else {
- return Ok(None);
+ return Ok(AuthorizationOutcome {
+ identity: None,
+ is_internal_access: false,
+ });
};
- let service = Arc::<Svc>::from_ref(state);
- let user_context = service
+ let authorization = MacroAuthorizationState::<Svc>::from_ref(state);
+ let user_context = authorization
+ .service
.authorize(&token)
.await
.map_err(authorization_rejection)?;
+
+ authorization_outcome(Some(user_context), false)
+}
+
+async fn authorize_internal_request<S, Svc>(
+ parts: &Parts,
+ state: &S,
+ convention: &InternalHeaderConvention,
+) -> Result<AuthorizationOutcome, MacroAuthorizationRejection>
+where
+ MacroAuthorizationState<Svc>: FromRef<S>,
+ Svc: MacroAuthorizationService,
+ S: Send + Sync + 'static,
+{
+ let provided_key = parts
+ .headers
+ .get(convention.key_header)
+ .and_then(|header| header.to_str().ok())
+ .ok_or_else(|| rejection("unauthorized"))?;
+ let claims = internal_identity_claims(&parts.headers, convention);
+ let authorization = MacroAuthorizationState::<Svc>::from_ref(state);
+ let user_context = authorization
+ .service
+ .authorize_internal(provided_key, claims)
+ .await
+ .map_err(internal_authorization_rejection)?;
+
+ authorization_outcome(user_context, true)
+}
+
+fn authorization_outcome(
+ user_context: Option<UserContext>,
+ is_internal_access: bool,
+) -> Result<AuthorizationOutcome, MacroAuthorizationRejection> {
+ let identity = user_context.map(authorized_user).transpose()?;
+
+ Ok(AuthorizationOutcome {
+ identity,
+ is_internal_access,
+ })
+}
+
+fn authorized_user(
+ user_context: UserContext,
+) -> Result<AuthorizedUser, MacroAuthorizationRejection> {
let macro_user_id = MacroUserIdStr::parse_from_str(&user_context.user_id)
.map(CowLike::into_owned)
.map_err(|error| {
@@ -149,10 +328,46 @@ where
rejection("invalid user id")
})?;
- Ok(Some(AuthorizedUser {
+ Ok(AuthorizedUser {
macro_user_id,
user_context,
- }))
+ })
+}
+
+fn internal_header_convention(headers: &HeaderMap) -> Option<&InternalHeaderConvention> {
+ INTERNAL_HEADER_CONVENTIONS
+ .iter()
+ .find(|convention| headers.contains_key(convention.key_header))
+}
+
+fn internal_identity_claims(
+ headers: &HeaderMap,
+ convention: &InternalHeaderConvention,
+) -> InternalIdentityClaims {
+ InternalIdentityClaims {
+ user_id: header_string(headers, Some(convention.user_id_header)),
+ fusion_user_id: header_string(headers, convention.fusion_user_id_header),
+ organization_id: header_string(headers, convention.organization_id_header)
+ .and_then(|organization_id| organization_id.parse().ok()),
+ }
+}
+
+fn header_string(headers: &HeaderMap, name: Option<&str>) -> Option<String> {
+ name.and_then(|name| headers.get(name))
+ .and_then(|header| header.to_str().ok())
+ .map(str::to_owned)
+}
+
+#[cfg(feature = "local_auth")]
+fn local_user_context() -> Option<UserContext> {
+ Some(UserContext {
+ user_id: LocalUserId::new()?.to_string(),
+ fusion_user_id: LocalFusionUserId::new()
+ .map(|fusion_user_id| fusion_user_id.to_string())
+ .unwrap_or_else(|| "set me!".to_string()),
+ organization_id: Some(1),
+ permissions: None,
+ })
}
async fn extract_token<S>(
@@ -189,6 +404,13 @@ fn authorization_rejection(error: Report<MacroAuthorizationError>) -> MacroAutho
rejection(message)
}
+fn internal_authorization_rejection(
+ error: Report<MacroAuthorizationError>,
+) -> MacroAuthorizationRejection {
+ tracing::error!(error=?error.current_context(), "internal authorization failed");
+ rejection("unauthorized")
+}
+
fn rejection(message: &'static str) -> MacroAuthorizationRejection {
(
StatusCode::UNAUTHORIZED,
diff --git a/crates/macro_authorization/src/inbound/axum/test.rs b/crates/macro_authorization/src/inbound/axum/test.rs
index ab42c54ede..9c4a02ccf3 100644
--- a/crates/macro_authorization/src/inbound/axum/test.rs
+++ b/crates/macro_authorization/src/inbound/axum/test.rs
@@ -4,7 +4,7 @@ use ::axum::{
Json, Router,
body::Body,
extract::FromRef,
- http::{Request, StatusCode},
+ http::{HeaderValue, Request, StatusCode},
routing::get,
};
use http_body_util::BodyExt;
@@ -13,21 +13,34 @@ use serde_json::{Value, json};
use tower::ServiceExt;
use super::*;
+use crate::InternalIdentityClaims;
const VALID_USER_ID: &str = "macro|[email protected]";
const COOKIE_USER_ID: &str = "macro|[email protected]";
const QUERY_USER_ID: &str = "macro|[email protected]";
const BEARER_USER_ID: &str = "macro|[email protected]";
const OPTIONAL_USER_ID: &str = "macro|[email protected]";
+const STANDARD_INTERNAL_USER_ID: &str = "macro|[email protected]";
+const LEGACY_INTERNAL_USER_ID: &str = "macro|[email protected]";
+const VALID_INTERNAL_KEY: &str = "valid-internal-key";
const ACCESS_TOKEN_COOKIE: &str = "macro-access-token";
+#[derive(Clone, Debug, Eq, PartialEq)]
+enum AuthorizationCall {
+ Jwt(String),
+ Internal {
+ provided_key: String,
+ claims: InternalIdentityClaims,
+ },
+}
+
#[derive(Clone, Default)]
struct FakeAuthorizationService {
- calls: Arc<Mutex<Vec<String>>>,
+ calls: Arc<Mutex<Vec<AuthorizationCall>>>,
}
impl FakeAuthorizationService {
- fn calls(&self) -> Vec<String> {
+ fn calls(&self) -> Vec<AuthorizationCall> {
self.calls.lock().expect("calls lock poisoned").clone()
}
}
@@ -37,7 +50,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {
self.calls
.lock()
.expect("calls lock poisoned")
- .push(jwt.to_string());
+ .push(AuthorizationCall::Jwt(jwt.to_string()));
match jwt {
"valid" => Ok(user_context(VALID_USER_ID, None)),
@@ -52,6 +65,35 @@ impl MacroAuthorizationService for FakeAuthorizationService {
_ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),
}
}
+
+ async fn authorize_internal(
+ &self,
+ provided_key: &str,
+ claims: InternalIdentityClaims,
+ ) -> Result<Option<UserContext>, Report<MacroAuthorizationError>> {
+ self.calls
+ .lock()
+ .expect("calls lock poisoned")
+ .push(AuthorizationCall::Internal {
+ provided_key: provided_key.to_string(),
+ claims: claims.clone(),
+ });
+
+ if provided_key != VALID_INTERNAL_KEY {
+ return Err(Report::new(MacroAuthorizationError::InvalidCredentials));
+ }
+
+ let Some(user_id) = claims.user_id else {
+ return Ok(None);
+ };
+
+ Ok(Some(UserContext {
+ user_id,
+ fusion_user_id: claims.fusion_user_id.unwrap_or_default(),
+ permissions: None,
+ organization_id: claims.organization_id,
+ }))
+ }
}
fn user_context(user_id: &str, organization_id: Option<i32>) -> UserContext {
@@ -65,11 +107,11 @@ fn user_context(user_id: &str, organization_id: Option<i32>) -> UserContext {
#[derive(Clone)]
struct TestState {
- authorization: Arc<FakeAuthorizationService>,
+ authorization: MacroAuthorizationState<FakeAuthorizationService>,
_unrelated_state: &'static str,
}
-impl FromRef<TestState> for Arc<FakeAuthorizationService> {
+impl FromRef<TestState> for MacroAuthorizationState<FakeAuthorizationService> {
fn from_ref(state: &TestState) -> Self {
state.authorization.clone()
}
@@ -78,30 +120,44 @@ impl FromRef<TestState> for Arc<FakeAuthorizationService> {
async fn required_handler(
extractor: MacroAuthorizationExtractor<FakeAuthorizationService>,
) -> Json<Value> {
+ let extractor = extractor.clone();
+
Json(json!({
"macro_user_id": extractor.macro_user_id.to_string(),
"user_context": extractor.user_context,
+ "is_internal_access": extractor.is_internal_access,
}))
}
async fn optional_handler(
extractor: OptionalMacroAuthorizationExtractor<FakeAuthorizationService>,
) -> Json<Value> {
+ let extractor = extractor.clone();
+
Json(json!({
"macro_user_id": extractor.macro_user_id.map(|id| id.to_string()),
"user_context": extractor.user_context,
+ "is_internal_access": extractor.is_internal_access,
}))
}
+async fn internal_handler(
+ extractor: InternalMacroAuthorizationExtractor<FakeAuthorizationService>,
+) -> Json<Value> {
+ let _extractor = extractor.clone();
+ Json(json!({ "authorized": true }))
+}
+
fn test_router() -> (Router, FakeAuthorizationService) {
let service = FakeAuthorizationService::default();
let state = TestState {
- authorization: Arc::new(service.clone()),
+ authorization: MacroAuthorizationState::new(Arc::new(service.clone())),
_unrelated_state: "composite state",
};
let router = Router::new()
.route("/required", get(required_handler))
.route("/optional", get(optional_handler))
+ .route("/internal", get(internal_handler))
.with_state(state);
(router, service)
@@ -127,13 +183,129 @@ fn empty_body(request: ::axum::http::request::Builder) -> Request<Body> {
fn assert_clone_without_service_clone<T: Clone>() {}
#[test]
-fn extractors_are_clone_without_requiring_service_clone() {
+fn state_and_extractors_are_clone_without_requiring_service_clone() {
struct NotClone;
+ assert_clone_without_service_clone::<MacroAuthorizationState<NotClone>>();
+ assert_clone_without_service_clone::<InternalMacroAuthorizationExtractor<NotClone>>();
assert_clone_without_service_clone::<MacroAuthorizationExtractor<NotClone>>();
assert_clone_without_service_clone::<OptionalMacroAuthorizationExtractor<NotClone>>();
}
+#[allow(deprecated)]
+#[tokio::test]
+async fn internal_accepts_standard_and_legacy_api_keys_without_identity_headers() {
+ let (router, service) = test_router();
+
+ for header in [INTERNAL_API_KEY_HEADER, LEGACY_DSS_INTERNAL_API_KEY_HEADER] {
+ let request = empty_body(request("/internal").header(header, VALID_INTERNAL_KEY));
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body, json!({ "authorized": true }));
+ }
+
+ assert_eq!(
+ service.calls(),
+ [
+ AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ },
+ AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ },
+ ]
+ );
+}
+
+#[tokio::test]
+async fn internal_forwards_identity_headers_to_create_user_context() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/internal")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(INTERNAL_MACRO_ORGANIZATION_ID_HEADER, "42")
+ .header(INTERNAL_FUSIONAUTH_USER_ID_HEADER, "fusion-user"),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body, json!({ "authorized": true }));
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims {
+ user_id: Some(STANDARD_INTERNAL_USER_ID.to_string()),
+ fusion_user_id: Some("fusion-user".to_string()),
+ organization_id: Some(42),
+ },
+ }]
+ );
+}
+
+#[tokio::test]
+async fn internal_rejects_missing_key_and_does_not_fall_back_to_jwt() {
+ let (router, service) = test_router();
+
+ for request in [
+ empty_body(request("/internal")),
+ empty_body(request("/internal").header("authorization", "Bearer valid")),
+ ] {
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ }
+
+ assert!(service.calls().is_empty());
+}
+
+#[tokio::test]
+async fn internal_rejects_invalid_api_key() {
+ let (router, service) = test_router();
+ let request = empty_body(request("/internal").header(INTERNAL_API_KEY_HEADER, "invalid"));
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: "invalid".to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn internal_standard_key_takes_precedence_over_legacy_key() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/internal")
+ .header(INTERNAL_API_KEY_HEADER, "invalid-standard-key")
+ .header(LEGACY_DSS_INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: "invalid-standard-key".to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
#[tokio::test]
async fn required_extracts_valid_bearer_and_preserves_organization() {
let (router, service) = test_router();
@@ -144,7 +316,11 @@ async fn required_extracts_valid_bearer_and_preserves_organization() {
assert_eq!(status, StatusCode::OK);
assert_eq!(body["macro_user_id"], VALID_USER_ID);
assert_eq!(body["user_context"]["organization_id"], 42);
- assert_eq!(service.calls(), ["organization"]);
+ assert_eq!(body["is_internal_access"], false);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("organization".to_string())]
+ );
}
#[tokio::test]
@@ -157,7 +333,11 @@ async fn required_extracts_valid_cookie() {
assert_eq!(status, StatusCode::OK);
assert_eq!(body["macro_user_id"], COOKIE_USER_ID);
- assert_eq!(service.calls(), ["cookie"]);
+ assert_eq!(body["is_internal_access"], false);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("cookie".to_string())]
+ );
}
#[tokio::test]
@@ -173,7 +353,10 @@ async fn query_token_takes_precedence_over_bearer_and_cookie() {
assert_eq!(status, StatusCode::OK);
assert_eq!(body["macro_user_id"], QUERY_USER_ID);
- assert_eq!(service.calls(), ["query"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("query".to_string())]
+ );
}
#[tokio::test]
@@ -189,7 +372,10 @@ async fn bearer_token_takes_precedence_over_cookie() {
assert_eq!(status, StatusCode::OK);
assert_eq!(body["macro_user_id"], BEARER_USER_ID);
- assert_eq!(service.calls(), ["bearer"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("bearer".to_string())]
+ );
}
#[tokio::test]
@@ -220,7 +406,14 @@ async fn malformed_query_falls_back_to_other_or_absent_credentials() {
assert_eq!(status, StatusCode::OK);
assert_eq!(body["macro_user_id"], Value::Null);
assert_eq!(body["user_context"]["user_id"], "");
- assert_eq!(service.calls(), ["bearer", "cookie"]);
+ assert_eq!(body["is_internal_access"], false);
+ assert_eq!(
+ service.calls(),
+ [
+ AuthorizationCall::Jwt("bearer".to_string()),
+ AuthorizationCall::Jwt("cookie".to_string()),
+ ]
+ );
}
#[tokio::test]
@@ -246,6 +439,7 @@ async fn optional_returns_default_context_for_missing_credentials() {
assert_eq!(body["user_context"]["fusion_user_id"], "");
assert_eq!(body["user_context"]["organization_id"], Value::Null);
assert_eq!(body["user_context"]["permissions"], Value::Null);
+ assert_eq!(body["is_internal_access"], false);
assert!(service.calls().is_empty());
}
@@ -258,7 +452,10 @@ async fn required_rejects_invalid_credentials() {
assert_eq!(status, StatusCode::UNAUTHORIZED);
assert_eq!(body, json!({ "message": "unauthorized" }));
- assert_eq!(service.calls(), ["invalid"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("invalid".to_string())]
+ );
}
#[tokio::test]
@@ -270,7 +467,10 @@ async fn optional_rejects_supplied_invalid_credentials() {
assert_eq!(status, StatusCode::UNAUTHORIZED);
assert_eq!(body, json!({ "message": "unauthorized" }));
- assert_eq!(service.calls(), ["invalid"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("invalid".to_string())]
+ );
}
#[tokio::test]
@@ -285,7 +485,13 @@ async fn required_and_optional_reject_expired_credentials() {
assert_eq!(body, json!({ "message": "jwt expired" }));
}
- assert_eq!(service.calls(), ["expired", "expired"]);
+ assert_eq!(
+ service.calls(),
+ [
+ AuthorizationCall::Jwt("expired".to_string()),
+ AuthorizationCall::Jwt("expired".to_string()),
+ ]
+ );
}
#[tokio::test]
@@ -297,7 +503,10 @@ async fn required_rejects_malformed_user_id() {
assert_eq!(status, StatusCode::UNAUTHORIZED);
assert_eq!(body, json!({ "message": "invalid user id" }));
- assert_eq!(service.calls(), ["malformed-user"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("malformed-user".to_string())]
+ );
}
#[tokio::test]
@@ -309,7 +518,10 @@ async fn optional_rejects_empty_user_id_from_authorized_context() {
assert_eq!(status, StatusCode::UNAUTHORIZED);
assert_eq!(body, json!({ "message": "invalid user id" }));
- assert_eq!(service.calls(), ["empty-user"]);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("empty-user".to_string())]
+ );
}
#[tokio::test]
@@ -323,5 +535,259 @@ async fn optional_returns_authenticated_output() {
assert_eq!(body["macro_user_id"], OPTIONAL_USER_ID);
assert_eq!(body["user_context"]["user_id"], OPTIONAL_USER_ID);
assert_eq!(body["user_context"]["fusion_user_id"], "fusion-user-id");
- assert_eq!(service.calls(), ["optional"]);
+ assert_eq!(body["is_internal_access"], false);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Jwt("optional".to_string())]
+ );
+}
+
+#[tokio::test]
+async fn standard_internal_headers_authorize_matching_claims() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/required")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(INTERNAL_MACRO_ORGANIZATION_ID_HEADER, "42")
+ .header(INTERNAL_FUSIONAUTH_USER_ID_HEADER, "standard-fusion-id")
+ .header("authorization", "Bearer invalid"),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], STANDARD_INTERNAL_USER_ID);
+ assert_eq!(body["user_context"]["fusion_user_id"], "standard-fusion-id");
+ assert_eq!(body["user_context"]["organization_id"], 42);
+ assert_eq!(body["is_internal_access"], true);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims {
+ user_id: Some(STANDARD_INTERNAL_USER_ID.to_string()),
+ fusion_user_id: Some("standard-fusion-id".to_string()),
+ organization_id: Some(42),
+ },
+ }]
+ );
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn legacy_dss_headers_authorize_matching_claims() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/required")
+ .header(LEGACY_DSS_INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+ LEGACY_INTERNAL_USER_ID,
+ ),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], LEGACY_INTERNAL_USER_ID);
+ assert_eq!(body["user_context"]["fusion_user_id"], "");
+ assert_eq!(body["user_context"]["organization_id"], Value::Null);
+ assert_eq!(body["is_internal_access"], true);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims {
+ user_id: Some(LEGACY_INTERNAL_USER_ID.to_string()),
+ ..InternalIdentityClaims::default()
+ },
+ }]
+ );
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn internal_identity_headers_are_not_mixed_between_conventions() {
+ let (router, service) = test_router();
+
+ let standard_request = empty_body(
+ request("/optional")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+ LEGACY_INTERNAL_USER_ID,
+ ),
+ );
+ let (status, body) = send(&router, standard_request).await;
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], Value::Null);
+ assert_eq!(body["is_internal_access"], true);
+
+ let legacy_request = empty_body(
+ request("/optional")
+ .header(LEGACY_DSS_INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(INTERNAL_MACRO_ORGANIZATION_ID_HEADER, "42")
+ .header(INTERNAL_FUSIONAUTH_USER_ID_HEADER, "standard-fusion-id"),
+ );
+ let (status, body) = send(&router, legacy_request).await;
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], Value::Null);
+ assert_eq!(body["is_internal_access"], true);
+
+ assert_eq!(
+ service.calls(),
+ [
+ AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ },
+ AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ },
+ ]
+ );
+}
+
+#[allow(deprecated)]
+#[tokio::test]
+async fn standard_convention_takes_precedence_when_both_keys_are_present() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/required")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(LEGACY_DSS_INTERNAL_API_KEY_HEADER, "invalid-legacy-key")
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER,
+ LEGACY_INTERNAL_USER_ID,
+ ),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], STANDARD_INTERNAL_USER_ID);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims {
+ user_id: Some(STANDARD_INTERNAL_USER_ID.to_string()),
+ ..InternalIdentityClaims::default()
+ },
+ }]
+ );
+}
+
+#[tokio::test]
+async fn invalid_internal_key_rejects_without_jwt_fallback() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/required")
+ .header(INTERNAL_API_KEY_HEADER, "invalid-internal-key")
+ .header("authorization", "Bearer valid"),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: "invalid-internal-key".to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
+#[tokio::test]
+async fn malformed_internal_key_rejects_without_jwt_fallback() {
+ let (router, service) = test_router();
+ let malformed_key = HeaderValue::from_bytes(b"\xff").unwrap();
+ let request = empty_body(
+ request("/required")
+ .header(INTERNAL_API_KEY_HEADER, malformed_key)
+ .header("authorization", "Bearer valid"),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert!(service.calls().is_empty());
+}
+
+#[tokio::test]
+async fn identityless_internal_request_is_rejected_by_required_extractor() {
+ let (router, service) = test_router();
+ let request =
+ empty_body(request("/required").header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY));
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::UNAUTHORIZED);
+ assert_eq!(body, json!({ "message": "unauthorized" }));
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
+#[tokio::test]
+async fn identityless_internal_request_is_preserved_by_optional_extractor() {
+ let (router, service) = test_router();
+ let request =
+ empty_body(request("/optional").header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY));
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], Value::Null);
+ assert_eq!(body["user_context"]["user_id"], "");
+ assert_eq!(body["user_context"]["fusion_user_id"], "");
+ assert_eq!(body["user_context"]["organization_id"], Value::Null);
+ assert_eq!(body["user_context"]["permissions"], Value::Null);
+ assert_eq!(body["is_internal_access"], true);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims::default(),
+ }]
+ );
+}
+
+#[tokio::test]
+async fn malformed_internal_organization_is_ignored() {
+ let (router, service) = test_router();
+ let request = empty_body(
+ request("/required")
+ .header(INTERNAL_API_KEY_HEADER, VALID_INTERNAL_KEY)
+ .header(INTERNAL_MACRO_USER_ID_HEADER, STANDARD_INTERNAL_USER_ID)
+ .header(INTERNAL_MACRO_ORGANIZATION_ID_HEADER, "not-an-integer"),
+ );
+
+ let (status, body) = send(&router, request).await;
+
+ assert_eq!(status, StatusCode::OK);
+ assert_eq!(body["macro_user_id"], STANDARD_INTERNAL_USER_ID);
+ assert_eq!(body["user_context"]["organization_id"], Value::Null);
+ assert_eq!(body["is_internal_access"], true);
+ assert_eq!(
+ service.calls(),
+ [AuthorizationCall::Internal {
+ provided_key: VALID_INTERNAL_KEY.to_string(),
+ claims: InternalIdentityClaims {
+ user_id: Some(STANDARD_INTERNAL_USER_ID.to_string()),
+ ..InternalIdentityClaims::default()
+ },
+ }]
+ );
}
diff --git a/crates/macro_authorization/src/lib.rs b/crates/macro_authorization/src/lib.rs
index 5a253afb57..3b69807bd2 100644
--- a/crates/macro_authorization/src/lib.rs
+++ b/crates/macro_authorization/src/lib.rs
@@ -13,14 +13,21 @@ pub mod inbound;
pub mod outbound;
pub use domain::{
- models::{MacroAuthorizationError, ValidatedIdentity},
+ models::{
+ InternalAuthConfig, InternalIdentityClaims, MacroAuthorizationError, ValidatedIdentity,
+ },
ports::{JwtValidator, MacroAuthorizationService},
service::MacroAuthorizationServiceImpl,
};
-/// Service-backed Axum authorization extractors and their rejection type.
+/// Service-backed Axum authorization extractors, state, headers, and rejection type.
+#[allow(deprecated)]
#[cfg(feature = "axum")]
pub use inbound::{
- MacroAuthorizationExtractor, MacroAuthorizationRejection, OptionalMacroAuthorizationExtractor,
+ INTERNAL_API_KEY_HEADER, INTERNAL_FUSIONAUTH_USER_ID_HEADER,
+ INTERNAL_MACRO_ORGANIZATION_ID_HEADER, INTERNAL_MACRO_USER_ID_HEADER,
+ InternalMacroAuthorizationExtractor, LEGACY_DSS_INTERNAL_API_KEY_HEADER,
+ LEGACY_DSS_INTERNAL_MACRO_USER_ID_HEADER, MacroAuthorizationExtractor,
+ MacroAuthorizationRejection, MacroAuthorizationState, OptionalMacroAuthorizationExtractor,
};
/// JWT validator backed by the shared `macro_auth` implementation.
#[cfg(feature = "outbound")]
diff --git a/services/document_storage_service/Cargo.toml b/services/document_storage_service/Cargo.toml
index 0e2cab1746..f2fa30990b 100644
--- a/services/document_storage_service/Cargo.toml
+++ b/services/document_storage_service/Cargo.toml
@@ -20,16 +20,23 @@ path = "src/doppler_config.rs"
[features]
connection_gateway = []
-default = ["connection_gateway", "delete_document_worker", "graphql", "location_check"]
+default = [
+ "connection_gateway",
+ "delete_document_worker",
+ "graphql",
+ "location_check",
+]
delete_document_worker = []
graphql = ["dep:async-graphql", "dep:async-graphql-axum", "dep:complete_graph"]
local = ["local_auth"]
-local_auth = ["macro_middleware/local_auth"]
+local_auth = ["macro_authorization/local_auth", "macro_middleware/local_auth"]
location_check = []
[dependencies]
-anyhow = { workspace = true }
ai_tools = { path = "../../crates/ai_tools" }
+ai_usage = { path = "../../crates/ai_usage" }
+analytics_client = { path = "../../crates/analytics_client" }
+anyhow = { workspace = true }
async-graphql = { workspace = true, optional = true }
async-graphql-axum = { version = "7.0.17", optional = true }
aws-sdk-dynamodb = { workspace = true }
@@ -45,36 +52,45 @@ bytes = { workspace = true }
bzip2 = { workspace = true, default-features = false, features = [
"libbz2-rs-sys",
] }
-ai_usage = { path = "../../crates/ai_usage" }
-analytics_client = { path = "../../crates/analytics_client" }
cal = { path = "../../crates/cal", features = ["axum", "outbound"] }
call = { path = "../../crates/call" }
channel_bots = { path = "../../crates/channel_bots" }
-channels = { path = "../../crates/channels", features = ["inbound", "outbound"] }
+channels = { path = "../../crates/channels", features = [
+ "inbound",
+ "outbound",
+] }
chrono = { workspace = true }
clap = { workspace = true }
cloudfront_sign = { workspace = true }
comms_db_client = { path = "../../crates/comms_db_client" }
-contacts = { path = "../../crates/contacts" }
+complete_graph = { path = "../../crates/complete_graph", optional = true }
connection = { path = "../../crates/connection", default-features = false, features = [
"outbound",
] }
connection_gateway_client = { path = "../../crates/connection_gateway_client" }
+contacts = { path = "../../crates/contacts" }
cowlike = { path = "../../crates/cowlike" }
crm = { path = "../../crates/crm" }
document_sub_type = { path = "../../crates/document_sub_type" }
documents_hex = { path = "../../crates/documents", package = "documents" }
-embedding = { path = "../../crates/embedding" }
-task_dedup = { path = "../../crates/task_dedup" }
+doppler-config = { workspace = true }
dynamodb_client = { path = "../../crates/dynamodb_client" }
email = { path = "../../crates/email", features = ["outbound", "ports"] }
-entity_access = { path = "../../crates/entity_access", features = ["inbound", "schema"] }
+embedding = { path = "../../crates/embedding" }
+entity_access = { path = "../../crates/entity_access", features = [
+ "inbound",
+ "schema",
+] }
entity_access_management = { path = "../../crates/entity_access_management" }
-favorites = { path = "../../crates/favorites", features = ["inbound", "postgres"] }
-foreign_entity = { path = "../../crates/foreign_entity", features = ["inbound"] }
+favorites = { path = "../../crates/favorites", features = [
+ "inbound",
+ "postgres",
+] }
+foreign_entity = { path = "../../crates/foreign_entity", features = [
+ "inbound",
+] }
frecency = { path = "../../crates/frecency", features = ["postgres"] }
futures = { workspace = true }
-complete_graph = { path = "../../crates/complete_graph", optional = true }
github = { path = "../../crates/github", default-features = false, features = [
"axum",
"inbound",
@@ -89,24 +105,26 @@ lazy_static = { workspace = true }
lexical_client = { path = "../../crates/lexical_client" }
lexical_mention_extractor = { path = "../../crates/lexical_mention_extractor" }
macro_auth = { path = "../../crates/macro_auth" }
+macro_authorization = { path = "../../crates/macro_authorization" }
macro_aws_config = { path = "../../crates/macro_aws_config", features = ["s3"] }
macro_axum_utils = { path = "../../crates/macro_axum_utils" }
+macro_config = { path = "../../crates/macro_config" }
macro_cors = { path = "../../crates/macro_cors" }
macro_db_client = { path = "../../crates/macro_db_client" }
macro_entrypoint = { path = "../../crates/macro_entrypoint" }
macro_env = { path = "../../crates/macro_env" }
-macro_event_broker = { path = "../../crates/macro_event_broker" }
-macro_service_urls = { path = "../../crates/macro_service_urls" }
-macro_sync_service_jwt = { path = "../../crates/macro_sync_service_jwt" }
macro_env_var = { path = "../../crates/macro_env_var" }
-macro_queues = { path = "../../crates/macro_queues" }
+macro_event_broker = { path = "../../crates/macro_event_broker" }
macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [
"auth",
"cloud_storage",
"user_permissions",
] }
macro_project_utils = { path = "../../crates/macro_project_utils" }
+macro_queues = { path = "../../crates/macro_queues" }
+macro_service_urls = { path = "../../crates/macro_service_urls" }
macro_sha_count_client = { path = "../../crates/macro_sha_count_client" }
+macro_sync_service_jwt = { path = "../../crates/macro_sync_service_jwt" }
macro_tower_layers = { path = "../../crates/macro_tower_layers" }
macro_user_id = { path = "../../crates/macro_user_id" }
macro_uuid = { path = "../../crates/macro_uuid" }
@@ -114,11 +132,13 @@ mockall = { workspace = true }
model = { path = "../../crates/model" }
model-entity = { path = "../../crates/model-entity" }
model_notifications = { path = "../../crates/model_notifications" }
-model_user = { path = "../../crates/model_user", features = ["axum"] }
+model_user = { path = "../../crates/model_user" }
models_bulk_upload = { path = "../../crates/models_bulk_upload" }
models_dcs = { path = "../../crates/models_dcs" }
models_opensearch = { path = "../../crates/models_opensearch" }
-models_pagination = { path = "../../crates/models_pagination", features = ["axum"] }
+models_pagination = { path = "../../crates/models_pagination", features = [
+ "axum",
+] }
models_permissions = { path = "../../crates/models_permissions" }
models_properties = { path = "../../crates/models_properties" }
models_soup = { path = "../../crates/models_soup", features = ["schema"] }
@@ -126,8 +146,10 @@ notification = { path = "../../crates/notification" }
opensearch_client = { path = "../../crates/opensearch_client" }
properties = { path = "../../crates/properties" }
properties_service = { path = "../../crates/properties_service" }
+rate_limit = { path = "../../crates/rate_limit", default-features = false, features = [
+ "axum",
+] }
rayon = "1.10.0"
-rate_limit = { path = "../../crates/rate_limit", default-features = false, features = ["axum"] }
readonly_pool = { path = "../../crates/readonly_pool" }
redis = { workspace = true, features = [
"aio",
@@ -143,7 +165,11 @@ search_service = { path = "../../crates/search_service" }
secretsmanager_client = { path = "../../crates/secretsmanager_client" }
serde = { workspace = true }
serde_json = { workspace = true }
-soup = { path = "../../crates/soup", features = ["axum", "inbound", "outbound"] }
+soup = { path = "../../crates/soup", features = [
+ "axum",
+ "inbound",
+ "outbound",
+] }
sqlx = { workspace = true }
sqs_client = { path = "../../crates/sqs_client", default-features = false, features = [
"document",
@@ -151,8 +177,11 @@ sqs_client = { path = "../../crates/sqs_client", default-features = false, featu
] }
sqs_worker = { path = "../../crates/sqs_worker" }
sync_service_client = { path = "../../crates/sync_service_client" }
-sync_service_hex = { path = "../../crates/sync_service", package = "sync_service_hex", features = ["inbound"] }
+sync_service_hex = { path = "../../crates/sync_service", package = "sync_service_hex", features = [
+ "inbound",
+] }
system_properties = { path = "../../crates/system_properties" }
+task_dedup = { path = "../../crates/task_dedup" }
thiserror = { workspace = true }
tokio = { workspace = true }
tower = { workspace = true }
@@ -163,11 +192,13 @@ urlencoding = { workspace = true }
utoipa = { workspace = true, features = ["axum_extras"] }
utoipa-swagger-ui = { workspace = true, features = ["axum"] }
uuid = { workspace = true }
-zip = { workspace = true }
-webhook = { path = "../../crates/webhook", features = ["inbound", "outbound", "worker"] }
+webhook = { path = "../../crates/webhook", features = [
+ "inbound",
+ "outbound",
+ "worker",
+] }
workspace-hack = { version = "0.1", path = "../../crates/workspace-hack" }
-macro_config = { path = "../../crates/macro_config" }
-doppler-config = { workspace = true }
+zip = { workspace = true }
[dev-dependencies]
cool_asserts = "2"
diff --git a/services/document_storage_service/src/api/activity/get_recent_activity.rs b/services/document_storage_service/src/api/activity/get_recent_activity.rs
index 52ff04917b..767e0e9a3e 100644
--- a/services/document_storage_service/src/api/activity/get_recent_activity.rs
+++ b/services/document_storage_service/src/api/activity/get_recent_activity.rs
@@ -3,20 +3,19 @@
reason = "allow GetActivitiesResponse & UserActivitiesResponse and mark get_recent_activity_handler for utoipa"
)]
use axum::{
- Extension,
extract::{Query, State},
http::StatusCode,
response::IntoResponse,
};
use crate::{
- api::context::ApiContext,
+ api::context::{ApiContext, AuthorizationService},
model::response::activity::{GetActivitiesResponse, UserActivitiesResponse},
};
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
request::pagination::{Pagination, PaginationQueryParams},
response::{GenericErrorResponse, GenericResponse},
- user::UserContext,
};
/// Gets the users recent activities
@@ -34,11 +33,11 @@ use model::{
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, pagination_query), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, pagination_query), fields(user_id=?user.macro_user_id))]
#[deprecated]
pub async fn get_recent_activity_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Query(pagination_query): Query<PaginationQueryParams>,
) -> impl IntoResponse {
if let Some(limit) = pagination_query.limit
@@ -56,7 +55,7 @@ pub async fn get_recent_activity_handler(
let result = match macro_db_client::activity::get_recent_activities(
ctx.db.clone(),
- user_context.user_id.as_str(),
+ user.macro_user_id.as_ref(),
pagination.limit,
pagination.offset,
)
diff --git a/services/document_storage_service/src/api/activity/mod.rs b/services/document_storage_service/src/api/activity/mod.rs
index 45e7177b7e..0111acb892 100644
--- a/services/document_storage_service/src/api/activity/mod.rs
+++ b/services/document_storage_service/src/api/activity/mod.rs
@@ -1,6 +1,5 @@
use crate::api::context::ApiContext;
use axum::{Router, routing::get};
-use tower::ServiceBuilder;
pub(in crate::api) mod get_recent_activity;
@@ -8,8 +7,6 @@ pub fn router() -> Router<ApiContext> {
Router::new().route(
"/",
#[expect(deprecated, reason = "get_recent_activity_handler")]
- get(get_recent_activity::get_recent_activity_handler).layer(ServiceBuilder::new().layer(
- axum::middleware::from_fn(macro_middleware::auth::ensure_user_exists::handler),
- )),
+ get(get_recent_activity::get_recent_activity_handler),
)
}
diff --git a/services/document_storage_service/src/api/annotations/create_anchor.rs b/services/document_storage_service/src/api/annotations/create_anchor.rs
index f4efd04af0..d358aa39d1 100644
--- a/services/document_storage_service/src/api/annotations/create_anchor.rs
+++ b/services/document_storage_service/src/api/annotations/create_anchor.rs
@@ -1,6 +1,6 @@
use std::sync::Arc;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::service::conn_gateway::update_live_comment_state;
use axum::{
Json,
@@ -10,6 +10,7 @@ use axum::{
};
use connection_gateway_client::ConnectionGatewayClient;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::create_anchor::create_unthreaded_anchor;
use model::{
annotations::{
@@ -18,7 +19,6 @@ use model::{
},
document::DocumentBasic,
response::ErrorResponse,
- user::UserContext,
};
use models_permissions::share_permission::access_level::CommentAccessLevel;
use sqlx::PgPool;
@@ -48,10 +48,10 @@ pub struct Params {
)]
#[axum::debug_handler(state = crate::api::context::ApiContext)]
pub async fn create_anchor_handler(
- _access: DocumentAccessExtractor<CommentAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<CommentAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
State(connection_gateway_client): State<Arc<ConnectionGatewayClient>>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
Json(req): Json<CreateUnthreadedAnchorRequest>,
@@ -65,7 +65,7 @@ pub async fn create_anchor_handler(
)
.into_response());
}
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
let document_id = document_id.as_str();
match create_unthreaded_anchor(&db, user_id, document_id, req).await {
Ok(res) => {
diff --git a/services/document_storage_service/src/api/annotations/create_comment.rs b/services/document_storage_service/src/api/annotations/create_comment.rs
index ae9e8a3387..6955a62493 100644
--- a/services/document_storage_service/src/api/annotations/create_comment.rs
+++ b/services/document_storage_service/src/api/annotations/create_comment.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
use crate::{
api::annotations::{CommentNotifContext, compute_notification_recipients},
+ api::context::AuthorizationService,
service::conn_gateway::update_live_comment_state,
};
use axum::{
@@ -11,6 +12,7 @@ use axum::{
response::{IntoResponse, Response},
};
use connection_gateway_client::ConnectionGatewayClient;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::create_comment::create_document_comment;
use macro_user_id::user_id::MacroUserIdStr;
use model::{
@@ -20,7 +22,6 @@ use model::{
},
document::DocumentBasic,
response::ErrorResponse,
- user::UserContext,
};
use model_notifications::NotificationDocumentSubType;
use models_properties::service::property_value::PropertyValue;
@@ -59,11 +60,12 @@ pub async fn create_comment_handler(
State(properties_service): State<Arc<crate::api::context::PropertiesService>>,
State(db): State<PgPool>,
State(conn_gateway_client): State<Arc<ConnectionGatewayClient>>,
- Extension(UserContext { user_id, .. }): Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
Json(req): Json<CreateCommentRequest>,
) -> Result<Response, Response> {
+ let user_id = user.macro_user_id.to_string();
if document_context.deleted_at.is_some() {
return Err((
StatusCode::BAD_REQUEST,
diff --git a/services/document_storage_service/src/api/annotations/delete_anchor.rs b/services/document_storage_service/src/api/annotations/delete_anchor.rs
index 77af1a61ab..d830006702 100644
--- a/services/document_storage_service/src/api/annotations/delete_anchor.rs
+++ b/services/document_storage_service/src/api/annotations/delete_anchor.rs
@@ -1,13 +1,15 @@
use std::sync::Arc;
+use crate::api::context::AuthorizationService;
use crate::service::conn_gateway::update_live_comment_state;
use axum::{
Json,
- extract::{Extension, State},
+ extract::State,
http::StatusCode,
response::{IntoResponse, Response},
};
use connection_gateway_client::ConnectionGatewayClient;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::delete_anchor::delete_document_anchor;
use model::{
annotations::{
@@ -15,7 +17,6 @@ use model::{
delete::{DeleteUnthreadedAnchorRequest, DeleteUnthreadedAnchorResponse},
},
response::ErrorResponse,
- user::UserContext,
};
use sqlx::PgPool;
@@ -38,10 +39,10 @@ use super::comment_error_response;
pub async fn delete_anchor_handler(
State(db): State<PgPool>,
State(conn_gateway_client): State<Arc<ConnectionGatewayClient>>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Json(req): Json<DeleteUnthreadedAnchorRequest>,
) -> Result<Response, Response> {
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
match delete_document_anchor(&db, user_id, req).await {
Ok(res) => {
let response: DeleteUnthreadedAnchorResponse = res;
diff --git a/services/document_storage_service/src/api/annotations/delete_comment.rs b/services/document_storage_service/src/api/annotations/delete_comment.rs
index 8d2f7552e6..ac2fe4b9f8 100644
--- a/services/document_storage_service/src/api/annotations/delete_comment.rs
+++ b/services/document_storage_service/src/api/annotations/delete_comment.rs
@@ -1,14 +1,18 @@
use std::sync::Arc;
#[allow(unused_imports)]
-use crate::{api::context::ApiContext, service::conn_gateway::update_live_comment_state};
+use crate::{
+ api::context::{ApiContext, AuthorizationService},
+ service::conn_gateway::update_live_comment_state,
+};
use axum::{
Json,
- extract::{Extension, Path, State},
+ extract::{Path, State},
http::StatusCode,
response::{IntoResponse, Response},
};
use connection_gateway_client::ConnectionGatewayClient;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::delete_comment::delete_document_comment;
use model::{
annotations::{
@@ -16,7 +20,6 @@ use model::{
delete::{DeleteCommentRequest, DeleteCommentResponse},
},
response::ErrorResponse,
- user::UserContext,
};
use sqlx::PgPool;
@@ -46,11 +49,11 @@ pub struct Params {
pub async fn delete_comment_handler(
State(db): State<PgPool>,
State(conn_gateway_client): State<Arc<ConnectionGatewayClient>>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { comment_id }): Path<Params>,
Json(req): Json<DeleteCommentRequest>,
) -> Result<Response, Response> {
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
match delete_document_comment(&db, comment_id, user_id, req).await {
Ok(res) => {
let response: DeleteCommentResponse = res;
diff --git a/services/document_storage_service/src/api/annotations/edit_anchor.rs b/services/document_storage_service/src/api/annotations/edit_anchor.rs
index 9dcff1a568..3ddf3df23a 100644
--- a/services/document_storage_service/src/api/annotations/edit_anchor.rs
+++ b/services/document_storage_service/src/api/annotations/edit_anchor.rs
@@ -1,13 +1,15 @@
use std::sync::Arc;
+use crate::api::context::AuthorizationService;
use crate::service::conn_gateway::update_live_comment_state;
use axum::{
Json,
- extract::{Extension, State},
+ extract::State,
http::StatusCode,
response::{IntoResponse, Response},
};
use connection_gateway_client::ConnectionGatewayClient;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::edit_anchor::edit_document_anchor;
use model::{
annotations::{
@@ -15,7 +17,6 @@ use model::{
edit::{EditAnchorRequest, EditAnchorResponse},
},
response::ErrorResponse,
- user::UserContext,
};
use sqlx::PgPool;
@@ -37,10 +38,10 @@ use super::comment_error_response;
pub async fn edit_anchor_handler(
State(db): State<PgPool>,
State(conn_gateway_client): State<Arc<ConnectionGatewayClient>>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Json(req): Json<EditAnchorRequest>,
) -> Result<Response, Response> {
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
match edit_document_anchor(&db, user_id, req).await {
Ok(res) => {
let response: EditAnchorResponse = res;
diff --git a/services/document_storage_service/src/api/annotations/edit_comment.rs b/services/document_storage_service/src/api/annotations/edit_comment.rs
index 1f24fee246..a12cf76b17 100644
--- a/services/document_storage_service/src/api/annotations/edit_comment.rs
+++ b/services/document_storage_service/src/api/annotations/edit_comment.rs
@@ -1,15 +1,17 @@
use std::sync::Arc;
use crate::{
- api::annotations::CommentNotifContext, service::conn_gateway::update_live_comment_state,
+ api::annotations::CommentNotifContext, api::context::AuthorizationService,
+ service::conn_gateway::update_live_comment_state,
};
use axum::{
Json,
- extract::{Extension, Path, State},
+ extract::{Path, State},
http::StatusCode,
response::{IntoResponse, Response},
};
use connection_gateway_client::ConnectionGatewayClient;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::annotations::edit_comment::edit_document_comment;
use macro_user_id::user_id::MacroUserIdStr;
use model::{
@@ -18,7 +20,6 @@ use model::{
edit::{EditCommentRequest, EditCommentResponse},
},
response::ErrorResponse,
- user::UserContext,
};
use model_notifications::NotificationDocumentSubType;
use notification::domain::service::NotificationIngress;
@@ -50,10 +51,11 @@ pub async fn edit_comment_handler(
State(db): State<PgPool>,
State(notification_ingress_service): State<Arc<crate::api::context::NotificationIngressType>>,
State(conn_gateway_client): State<Arc<ConnectionGatewayClient>>,
- Extension(UserContext { user_id, .. }): Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { comment_id }): Path<Params>,
Json(req): Json<EditCommentRequest>,
) -> Result<Response, Response> {
+ let user_id = user.macro_user_id.to_string();
// TODO: check if the user has comment access to the document
match edit_document_comment(&db, comment_id, &user_id, &req).await {
Ok(res) => {
diff --git a/services/document_storage_service/src/api/annotations/get.rs b/services/document_storage_service/src/api/annotations/get.rs
index dcc9786a66..227b405d7c 100644
--- a/services/document_storage_service/src/api/annotations/get.rs
+++ b/services/document_storage_service/src/api/annotations/get.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::response::annotations::{AnchorResponse, ThreadResponse};
use axum::{
Json,
@@ -44,7 +44,7 @@ pub struct Params {
#[tracing::instrument(skip(_access, db))]
pub async fn get_document_comments_handler(
Path(Params { document_id }): Path<Params>,
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
) -> Result<Response, Response> {
match get_document_comments(&db, &document_id).await {
@@ -70,7 +70,7 @@ pub async fn get_document_comments_handler(
)]
#[tracing::instrument(skip(_access, db))]
pub async fn get_document_anchors_handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
Path(Params { document_id }): Path<Params>,
State(db): State<PgPool>,
document_context: Extension<DocumentBasic>,
diff --git a/services/document_storage_service/src/api/context.rs b/services/document_storage_service/src/api/context.rs
index a8828e4ecb..9db816a56e 100644
--- a/services/document_storage_service/src/api/context.rs
+++ b/services/document_storage_service/src/api/context.rs
@@ -69,6 +69,9 @@ use github::domain::service::GithubSyncServiceImpl;
use github::outbound::github_sync_client::GithubSyncClientImpl;
use github::outbound::pg_github_sync_repo::PgGithubSyncRepo;
use macro_auth::middleware::decode_jwt::JwtValidationArgs;
+use macro_authorization::{
+ MacroAuthJwtValidator, MacroAuthorizationServiceImpl, MacroAuthorizationState,
+};
use macro_env_var::env_var;
use macro_sha_count_client::Redis;
use notification::domain::service::SqsNotificationIngress;
@@ -247,8 +250,12 @@ pub(crate) type DocumentService = DocumentServiceImpl<
MacroEventBrokerService<KafkaEventPublisher>,
>;
+/// Type alias for the authorization service.
+pub(crate) type AuthorizationService = MacroAuthorizationServiceImpl<MacroAuthJwtValidator>;
+
/// Type alias for the documents router state.
-pub(crate) type DocumentsState = DocumentRouterState<DocumentService, EntityAccessService>;
+pub(crate) type DocumentsState =
+ DocumentRouterState<DocumentService, EntityAccessService, AuthorizationService>;
/// Type alias for the legacy channel list service.
pub(crate) type DssChannelListService =
@@ -386,6 +393,7 @@ pub(crate) struct ApiContext {
pub system_properties_service: Arc<SystemPropertiesService>,
pub properties_service: Arc<PropertiesService>,
pub opensearch_client: Arc<OpensearchClient>,
+ pub authorization_state: MacroAuthorizationState<AuthorizationService>,
pub jwt_validation_args: JwtValidationArgs,
pub config: Arc<Config>,
pub dss_auth_key: DocumentStorageServiceAuthKey,
diff --git a/services/document_storage_service/src/api/documents/delete_document.rs b/services/document_storage_service/src/api/documents/delete_document.rs
index 41ce0281ca..861808eb34 100644
--- a/services/document_storage_service/src/api/documents/delete_document.rs
+++ b/services/document_storage_service/src/api/documents/delete_document.rs
@@ -1,5 +1,5 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::api::util::count_occurrences;
use axum::Json;
use axum::extract::State;
@@ -8,11 +8,11 @@ use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
#[allow(unused_imports)]
use futures::stream::TryStreamExt;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::DocumentBasic;
use model::response::{
ErrorResponse, GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::OwnerAccessLevel;
use serde::Deserialize;
use sqs_client::search::{SearchQueueMessage, document::DocumentId};
@@ -38,11 +38,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(state, user, _access), fields(user_id=?user.macro_user_id))]
pub async fn permanently_delete_document_handler(
- _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService, AuthorizationService>,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
) -> Result<Response, Response> {
diff --git a/services/document_storage_service/src/api/documents/export_document.rs b/services/document_storage_service/src/api/documents/export_document.rs
index 6108f59960..3fe9befec1 100644
--- a/services/document_storage_service/src/api/documents/export_document.rs
+++ b/services/document_storage_service/src/api/documents/export_document.rs
@@ -4,7 +4,7 @@ use std::{
};
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
Extension, Json,
extract::{Path, State},
@@ -13,10 +13,10 @@ use axum::{
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
use futures::StreamExt;
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
document::{DocumentBasic, FileType, response::LocationResponseData},
response::{ErrorResponse, GenericErrorResponse},
- user::UserContext,
};
use s3_key::build_temp_docx_key;
@@ -61,12 +61,12 @@ pub struct ExportDocumentResponse {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(state, user, _access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
Path(Params { .. }): Path<Params>,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
) -> Result<Response, Response> {
tracing::info!("export document");
diff --git a/services/document_storage_service/src/api/documents/get_batch_preview.rs b/services/document_storage_service/src/api/documents/get_batch_preview.rs
index 68ff9d0432..a4faff1b2f 100644
--- a/services/document_storage_service/src/api/documents/get_batch_preview.rs
+++ b/services/document_storage_service/src/api/documents/get_batch_preview.rs
@@ -1,20 +1,20 @@
use std::collections::HashSet;
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use crate::model::{
request::documents::preview::GetBatchPreviewRequest,
response::documents::preview::GetBatchPreviewResponse,
};
use anyhow::Result;
+use axum::extract::Json;
use axum::extract::State;
use axum::response::{IntoResponse, Response};
-use axum::{Extension, extract::Json};
+use macro_authorization::OptionalMacroAuthorizationExtractor;
use model::document::{DocumentPreview, DocumentPreviewV2, WithDocumentId};
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use reqwest::StatusCode;
-#[tracing::instrument(skip(ctx, user_context, req), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, req), fields(user_id=?user.macro_user_id))]
#[utoipa::path(
tag = "document",
post,
@@ -28,7 +28,7 @@ use reqwest::StatusCode;
)]
pub async fn get_batch_preview_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: OptionalMacroAuthorizationExtractor<AuthorizationService>,
Json(req): Json<GetBatchPreviewRequest>,
) -> Result<(StatusCode, Json<GetBatchPreviewResponse>), Response> {
// Ensure the document ids are unique to prevent duplicate work
diff --git a/services/document_storage_service/src/api/documents/get_document_access_level.rs b/services/document_storage_service/src/api/documents/get_document_access_level.rs
index 09287dcf86..fb2e24b7ab 100644
--- a/services/document_storage_service/src/api/documents/get_document_access_level.rs
+++ b/services/document_storage_service/src/api/documents/get_document_access_level.rs
@@ -1,12 +1,11 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use crate::model::response::documents::get::GetDocumentUserAccessLevelResponse;
use axum::Json;
use axum::extract::State;
-use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
+use axum::{extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::domain::ports::EntityAccessService;
-use macro_user_id::user_id::MacroUserIdStr;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use model_entity::EntityType;
use models_permissions::share_permission::access_level::AccessLevel;
@@ -31,26 +30,19 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
- let user_id = match MacroUserIdStr::parse_from_str(&user_context.user_id) {
- Ok(user_id) => user_id,
- Err(e) => {
- tracing::error!(error=?e, "failed to parse user id");
- return GenericResponse::builder()
- .message("failed to get user access level")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
- };
-
let user_access_level: Option<AccessLevel> = match ctx
.entity_access_service
- .get_access_level(Some(&user_id), &document_id, EntityType::Document)
+ .get_access_level(
+ Some(&user.macro_user_id),
+ &document_id,
+ EntityType::Document,
+ )
.await
{
Ok(user_access_level) => user_access_level,
diff --git a/services/document_storage_service/src/api/documents/get_document_key.rs b/services/document_storage_service/src/api/documents/get_document_key.rs
index 3288eed8a4..d79393e579 100644
--- a/services/document_storage_service/src/api/documents/get_document_key.rs
+++ b/services/document_storage_service/src/api/documents/get_document_key.rs
@@ -1,14 +1,15 @@
use std::str::FromStr;
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::response::documents::get::{GetDocumentKeyResponse, GetDocumentKeyResponseData};
use axum::extract::State;
use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::FileType;
use model::response::GenericErrorResponse;
-use model::{document::DocumentBasic, response::GenericResponse, user::UserContext};
+use model::{document::DocumentBasic, response::GenericResponse};
use models_permissions::share_permission::access_level::ViewAccessLevel;
use s3_key::{build_cloud_storage_bucket_document_key, build_docx_to_pdf_converted_document_key};
@@ -33,11 +34,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, document_context, _access), fields(user_id=?user_context.user_id, file_type=?document_context.file_type))]
+#[tracing::instrument(skip(state, user, document_context, _access), fields(user_id=?user.macro_user_id, file_type=?document_context.file_type))]
pub async fn get_document_key_handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params {
document_id,
diff --git a/services/document_storage_service/src/api/documents/get_document_list.rs b/services/document_storage_service/src/api/documents/get_document_list.rs
index 91cc604e66..7272042bfa 100644
--- a/services/document_storage_service/src/api/documents/get_document_list.rs
+++ b/services/document_storage_service/src/api/documents/get_document_list.rs
@@ -1,7 +1,10 @@
-use crate::{api::context::ApiContext, model::response::documents::get::GetDocumentSearchResponse};
+use crate::{
+ api::context::{ApiContext, AuthorizationService},
+ model::response::documents::get::GetDocumentSearchResponse,
+};
use axum::extract::State;
-use axum::{Extension, http::StatusCode, response::IntoResponse};
-use model::user::UserContext;
+use axum::{http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
document::response::GetDocumentListResult,
response::{GenericErrorResponse, GenericResponse},
@@ -19,21 +22,21 @@ use model::{
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_document_list_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
let document_search_response_date: Vec<GetDocumentListResult> =
match macro_db_client::document::get_document_list(
ctx.db.clone(),
- user_context.user_id.as_str(),
+ user.macro_user_id.as_ref(),
)
.await
{
Ok(document_search_response_date) => document_search_response_date,
Err(e) => {
- tracing::error!(error=?e, user_id=?user_context.user_id, "unable to get document search");
+ tracing::error!(error=?e, user_id=?user.macro_user_id, "unable to get document search");
return GenericResponse::builder()
.message("unable to get document search")
.is_error(true)
diff --git a/services/document_storage_service/src/api/documents/get_document_permissions.rs b/services/document_storage_service/src/api/documents/get_document_permissions.rs
index 8c859bad86..7a9d96344c 100644
--- a/services/document_storage_service/src/api/documents/get_document_permissions.rs
+++ b/services/document_storage_service/src/api/documents/get_document_permissions.rs
@@ -1,4 +1,4 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::response::documents::get::GetDocumentPermissionsResponseDataV2;
use axum::{
Extension,
@@ -7,8 +7,8 @@ use axum::{
response::{IntoResponse, Json, Response},
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::GenericErrorResponse;
-use model::user::UserContext;
use model::version::ApiVersionEnum;
use models_permissions::share_permission::access_level::OwnerAccessLevel;
use sqlx::PgPool;
@@ -35,7 +35,7 @@ pub struct Params {
)]
#[allow(unused, reason = "used to generate OpenAPI documentation")]
pub(in crate::api) async fn get_document_permissions_handler_v2(
- _user_context: Extension<UserContext>,
+ _user: MacroAuthorizationExtractor<AuthorizationService>,
_api_version: Extension<ApiVersionEnum>,
Path(Params { document_id: _ }): Path<Params>,
) -> impl IntoResponse {
@@ -45,7 +45,7 @@ pub(in crate::api) async fn get_document_permissions_handler_v2(
/// Gets the current documents share permissions
#[tracing::instrument(skip(db, _access))]
pub async fn get_document_permissions_handler(
- _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
Path(Params { document_id }): Path<Params>,
) -> Result<Response, Response> {
diff --git a/services/document_storage_service/src/api/documents/get_document_processing_result.rs b/services/document_storage_service/src/api/documents/get_document_processing_result.rs
index 9df4c264c9..c630387966 100644
--- a/services/document_storage_service/src/api/documents/get_document_processing_result.rs
+++ b/services/document_storage_service/src/api/documents/get_document_processing_result.rs
@@ -1,13 +1,13 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
- Extension,
extract::{Path, State},
http::StatusCode,
response::IntoResponse,
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
+use model::response::GenericErrorResponse;
use model::response::GenericResponse;
-use model::{response::GenericErrorResponse, user::UserContext};
use models_permissions::share_permission::access_level::ViewAccessLevel;
use sqlx::PgPool;
@@ -34,11 +34,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user, _access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
let processing_result = match macro_db_client::document::get_document_process_content(
diff --git a/services/document_storage_service/src/api/documents/get_document_text.rs b/services/document_storage_service/src/api/documents/get_document_text.rs
index e4eda3ef52..c3da846d9b 100644
--- a/services/document_storage_service/src/api/documents/get_document_text.rs
+++ b/services/document_storage_service/src/api/documents/get_document_text.rs
@@ -1,4 +1,4 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
extract::{Path, State},
http::StatusCode,
@@ -36,7 +36,7 @@ pub struct Params {
)]
#[tracing::instrument(skip(db, _access))]
pub async fn handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
diff --git a/services/document_storage_service/src/api/documents/get_document_version.rs b/services/document_storage_service/src/api/documents/get_document_version.rs
index 6249f5418b..823cd0e8d3 100644
--- a/services/document_storage_service/src/api/documents/get_document_version.rs
+++ b/services/document_storage_service/src/api/documents/get_document_version.rs
@@ -1,13 +1,16 @@
-use crate::api::context::EntityAccessService;
-use axum::extract::State;
-use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
+use crate::api::context::{AuthorizationService, EntityAccessService};
+use axum::{
+ extract::{Path, State},
+ http::StatusCode,
+ response::IntoResponse,
+};
use entity_access::domain::models::EntityPermission;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::document::get_document_version;
use macro_db_client::user_document_view_location::get::get_user_document_view_location;
use model::document::response::{GetDocumentResponse, GetDocumentResponseData};
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::{AccessLevel, ViewAccessLevel};
use serde::Deserialize;
use sqlx::PgPool;
@@ -35,11 +38,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context, access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user, access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params {
document_id,
document_version_id,
@@ -64,7 +67,8 @@ pub async fn handler(
};
let view_location =
- match get_user_document_view_location(&db, &user_context.user_id, &document_id).await {
+ match get_user_document_view_location(&db, user.macro_user_id.as_ref(), &document_id).await
+ {
Ok(view_location) => view_location,
Err(e) => {
tracing::error!(error=?e, "error getting view location");
diff --git a/services/document_storage_service/src/api/documents/get_document_views.rs b/services/document_storage_service/src/api/documents/get_document_views.rs
index 543b04c6a2..e00ce80fc8 100644
--- a/services/document_storage_service/src/api/documents/get_document_views.rs
+++ b/services/document_storage_service/src/api/documents/get_document_views.rs
@@ -1,4 +1,4 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::response::user_views::UserViewsResponse;
use axum::{
Extension, Json,
@@ -7,7 +7,8 @@ use axum::{
response::{IntoResponse, Response},
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
-use model::{document::DocumentBasic, response::GenericErrorResponse, user::UserContext};
+use macro_authorization::MacroAuthorizationExtractor;
+use model::{document::DocumentBasic, response::GenericErrorResponse};
use models_permissions::share_permission::access_level::ViewAccessLevel;
use serde::Deserialize;
@@ -33,12 +34,12 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context, document_id, _access), fields(user_id=?user_context.user_id, document_id=?document_context.document_id, original_document_id=?document_id))]
+#[tracing::instrument(skip(db, user, document_id, _access), fields(user_id=?user.macro_user_id, document_id=?document_context.document_id, original_document_id=?document_id))]
pub async fn get_document_views_handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
Path(Params { document_id }): Path<Params>,
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
) -> Result<Response, Response> {
let users = macro_db_client::document::get_document_views(&db, &document_context.document_id)
diff --git a/services/document_storage_service/src/api/documents/get_full_pdf_modification_data.rs b/services/document_storage_service/src/api/documents/get_full_pdf_modification_data.rs
index 667fdaa0a5..de41124eac 100644
--- a/services/document_storage_service/src/api/documents/get_full_pdf_modification_data.rs
+++ b/services/document_storage_service/src/api/documents/get_full_pdf_modification_data.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::{
Extension,
@@ -8,13 +8,13 @@ use axum::{
http::StatusCode,
response::IntoResponse,
};
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::document::build_pdf_modification_data::{
get_complete_pdf_modification_data, get_pdf_modification_data_for_document,
};
use model::{
document::{DocumentBasic, FileType},
response::{GenericErrorResponse, GenericResponse},
- user::UserContext,
};
use serde::Deserialize;
@@ -39,10 +39,10 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, document_context), fields(user_id=?user_context.user_id, file_type=?document_context.file_type))]
+#[tracing::instrument(skip(ctx, user, document_context), fields(user_id=?user.macro_user_id, file_type=?document_context.file_type))]
pub async fn handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
diff --git a/services/document_storage_service/src/api/documents/get_user_documents.rs b/services/document_storage_service/src/api/documents/get_user_documents.rs
index 9d0afe75aa..12bbd7b0a2 100644
--- a/services/document_storage_service/src/api/documents/get_user_documents.rs
+++ b/services/document_storage_service/src/api/documents/get_user_documents.rs
@@ -1,16 +1,16 @@
+use crate::api::context::AuthorizationService;
use crate::model::{
request::documents::get_user_documents::{GetUserDocumentsParams, GetUserDocumentsQueryParams},
response::documents::get::{GetDocumentsResponse, UserDocumentsResponse},
};
use axum::{
- Extension,
extract::{Query, State},
http::StatusCode,
response::IntoResponse,
};
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::document::get_user_documents;
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use sqlx::PgPool;
/// Gets the users documents to populate their recent document list
@@ -30,11 +30,11 @@ use sqlx::PgPool;
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context, params), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user, params), fields(user_id=?user.macro_user_id))]
#[axum::debug_handler(state = crate::api::context::ApiContext)]
pub async fn get_user_documents_handler(
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Query(params): Query<GetUserDocumentsQueryParams>,
) -> impl IntoResponse {
if let Some(limit) = params.limit
@@ -54,7 +54,7 @@ pub async fn get_user_documents_handler(
let documents = match get_user_documents(
&db,
- user_context.user_id.as_str(),
+ user.macro_user_id.as_ref(),
query_params.limit,
query_params.offset,
query_params.file_type,
@@ -63,7 +63,7 @@ pub async fn get_user_documents_handler(
{
Ok(documents) => documents,
Err(e) => {
- tracing::error!(error=?e, user_id=?user_context.user_id, "failed to get user documents");
+ tracing::error!(error=?e, user_id=?user.macro_user_id, "failed to get user documents");
return GenericResponse::builder()
.message("failed to get documents")
.is_error(true)
diff --git a/services/document_storage_service/src/api/documents/initialize_how_to_guide.rs b/services/document_storage_service/src/api/documents/initialize_how_to_guide.rs
index c883bdb6d6..fdc6643b15 100644
--- a/services/document_storage_service/src/api/documents/initialize_how_to_guide.rs
+++ b/services/document_storage_service/src/api/documents/initialize_how_to_guide.rs
@@ -1,4 +1,4 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::{
extract::State,
response::{IntoResponse, Json, Response},
@@ -7,9 +7,9 @@ use documents_hex::domain::create::{
MarkdownSubtype, NewDocumentMetadata, NewMarkdownTextDocument,
};
use favorites::domain::ports::FavoritesService;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{ErrorResponse, GenericSuccessResponse};
use model_entity::EntityType;
-use model_user::axum_extractor::MacroUserExtractor;
use reqwest::StatusCode;
const HOW_TO_GUIDE_NAME: &str = "Macro how to guide";
@@ -21,7 +21,7 @@ const HOW_TO_GUIDE_TEMPLATE: &str = include_str!("./template/macro_how_to_guide.
#[tracing::instrument(skip(state, user_context), fields(user_id=?user_context.macro_user_id))]
pub async fn handler(
State(state): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
) -> Result<Response, Response> {
tracing::info!("initialize how to guide");
diff --git a/services/document_storage_service/src/api/documents/initialize_user_documents.rs b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
index 8c05ccc67f..4c96baf7d1 100644
--- a/services/document_storage_service/src/api/documents/initialize_user_documents.rs
+++ b/services/document_storage_service/src/api/documents/initialize_user_documents.rs
@@ -1,15 +1,15 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::{
extract::State,
response::{IntoResponse, Json, Response},
};
use futures::StreamExt;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_user_id::cowlike::CowLike;
use model::{
document::BasicDocument,
response::{ErrorResponse, GenericErrorResponse, GenericSuccessResponse},
};
-use model_user::axum_extractor::MacroUserExtractor;
use models_permissions::share_permission::SharePermissionV2;
use reqwest::StatusCode;
use s3_key::build_cloud_storage_bucket_document_key;
@@ -36,7 +36,7 @@ const CANVAS_TEMPLATE: &str = include_str!("./template/canvas_template.canvas");
#[tracing::instrument(skip(state, user_context), fields(user_id=?user_context.macro_user_id))]
pub async fn handler(
State(state): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
) -> Result<Response, Response> {
tracing::info!("initialize user documents");
let start_time = std::time::Instant::now();
diff --git a/services/document_storage_service/src/api/documents/job_processing_result.rs b/services/document_storage_service/src/api/documents/job_processing_result.rs
index de3a543e37..532167a77d 100644
--- a/services/document_storage_service/src/api/documents/job_processing_result.rs
+++ b/services/document_storage_service/src/api/documents/job_processing_result.rs
@@ -1,13 +1,14 @@
+use crate::api::context::AuthorizationService;
use crate::model::response::documents::get::GetDocumentProcessingResultResponse;
use axum::{
- Extension,
extract::{Path, State},
http::StatusCode,
response::IntoResponse,
};
+use macro_authorization::OptionalMacroAuthorizationExtractor;
use macro_db_client::document::get_document_process_content_from_job_id;
+use model::response::GenericErrorResponse;
use model::response::GenericResponse;
-use model::{response::GenericErrorResponse, user::UserContext};
use sqlx::PgPool;
#[derive(serde::Deserialize)]
@@ -32,10 +33,10 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user), fields(user_id=?user.macro_user_id))]
pub async fn job_processing_result_handler(
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: OptionalMacroAuthorizationExtractor<AuthorizationService>,
Path(Params {
document_id,
job_id,
diff --git a/services/document_storage_service/src/api/documents/list_documents_with_access.rs b/services/document_storage_service/src/api/documents/list_documents_with_access.rs
index fb73f64dd4..7e933c672b 100644
--- a/services/document_storage_service/src/api/documents/list_documents_with_access.rs
+++ b/services/document_storage_service/src/api/documents/list_documents_with_access.rs
@@ -1,13 +1,12 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::{
- Extension,
extract::{Query, State},
http::StatusCode,
response::{IntoResponse, Json},
};
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::list::{DocumentListFilters, ListDocumentsWithAccessResponse};
use model::response::GenericErrorResponse;
-use model::user::UserContext;
use models_permissions::share_permission::access_level::AccessLevel;
use schemars::JsonSchema;
use serde::Deserialize;
@@ -46,10 +45,10 @@ pub struct ListDocumentsWithAccessQuery {
(status = 500, body = GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn list_documents_with_access_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Query(query): Query<ListDocumentsWithAccessQuery>,
) -> impl IntoResponse {
let page_size = if query.page_size <= 0 || query.page_size > MAX_PAGE_SIZE {
@@ -94,7 +93,7 @@ pub async fn list_documents_with_access_handler(
let documents = match macro_db_client::document::list_documents_with_access(
&ctx.db,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
&filters,
min_access_level,
offset,
@@ -106,7 +105,7 @@ pub async fn list_documents_with_access_handler(
Err(e) => {
tracing::error!(
error=?e,
- user_id=?user_context.user_id,
+ user_id=?user.macro_user_id,
"unable to list documents with access"
);
return (
diff --git a/services/document_storage_service/src/api/documents/location.rs b/services/document_storage_service/src/api/documents/location.rs
index 9c72628336..49db4632e1 100644
--- a/services/document_storage_service/src/api/documents/location.rs
+++ b/services/document_storage_service/src/api/documents/location.rs
@@ -1,6 +1,7 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use rayon::prelude::*;
use std::{
@@ -20,7 +21,6 @@ use cloudfront_sign::{SignedOptions, get_signed_url};
use model::{
document::{DocumentBasic, FileType, FileTypeExt, response::LocationResponseData},
response::{GenericErrorResponse, GenericResponse, PresignedUrl},
- user::UserContext,
};
use s3_key::{build_cloud_storage_bucket_document_key, build_docx_to_pdf_converted_document_key};
@@ -49,11 +49,15 @@ static DOCUMENT_DOES_NOT_EXIST: &str = "document does not exist in s3";
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, document_context, _access_level), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(state, user, document_context, _access_level), fields(user_id=?user.macro_user_id))]
pub async fn get_location_handler(
- _access_level: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access_level: DocumentAccessExtractor<
+ ViewAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
params: Query<LocationQueryParams>,
diff --git a/services/document_storage_service/src/api/documents/mod.rs b/services/document_storage_service/src/api/documents/mod.rs
index 132643c4fa..0d6b49880b 100644
--- a/services/document_storage_service/src/api/documents/mod.rs
+++ b/services/document_storage_service/src/api/documents/mod.rs
@@ -46,33 +46,19 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
"/permissions_token",
permissions_token::router(state.clone()),
)
- .route(
- "/",
- get(get_user_documents::get_user_documents_handler).layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- )),
- )
+ .route("/", get(get_user_documents::get_user_documents_handler))
// NOTE: POST / (create_document) is now served by the documents hex crate router
// NOTE: POST /create_task is now served by the documents hex crate router
.route(
"/initialize_user_documents",
- post(initialize_user_documents::handler).layer(
- ServiceBuilder::new()
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
- .layer(axum::middleware::from_fn_with_state(
- state.clone(),
- middleware::ensure_user_is_onboarded::handler,
- )),
- ),
- )
- .route(
- "/list",
- get(get_document_list::get_document_list_handler).layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
+ post(initialize_user_documents::handler).layer(ServiceBuilder::new().layer(
+ axum::middleware::from_fn_with_state(
+ state.clone(),
+ middleware::ensure_user_is_onboarded::handler,
+ ),
)),
)
+ .route("/list", get(get_document_list::get_document_list_handler))
.route(
"/{document_id}/permissions",
get(get_document_permissions::get_document_permissions_handler)
diff --git a/services/document_storage_service/src/api/documents/permissions_token/create_permission_token.rs b/services/document_storage_service/src/api/documents/permissions_token/create_permission_token.rs
index 92ef88602c..072f3f5217 100644
--- a/services/document_storage_service/src/api/documents/permissions_token/create_permission_token.rs
+++ b/services/document_storage_service/src/api/documents/permissions_token/create_permission_token.rs
@@ -1,6 +1,6 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
- Extension, Json,
+ Json,
extract::{Path, State},
http::StatusCode,
response::{IntoResponse, Response},
@@ -8,7 +8,8 @@ use axum::{
use documents_hex::domain::permission_token::encode_permission_token;
use entity_access::domain::models::EntityPermission;
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
-use model::{response::ErrorResponse, user::UserContext};
+use macro_authorization::OptionalMacroAuthorizationExtractor;
+use model::response::ErrorResponse;
use models_permissions::share_permission::access_level::{AccessLevel, ViewAccessLevel};
use serde::Deserialize;
use utoipa::ToSchema;
@@ -42,18 +43,18 @@ pub struct DocumentPermissionsTokenResponse {
(status = 500, body=ErrorResponse),
)
)]
-#[tracing::instrument(skip(state, user_context, users_access_level), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(state, user, users_access_level), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
- users_access_level: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ user: OptionalMacroAuthorizationExtractor<AuthorizationService>,
+ users_access_level: DocumentAccessExtractor<
+ ViewAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
Path(Params { document_id }): Path<Params>,
) -> Result<Response, Response> {
- let user_id = if user_context.user_id.is_empty() {
- None
- } else {
- Some(user_context.user_id.clone())
- };
+ let user_id = user.macro_user_id.map(|user_id| user_id.to_string());
let access_level = match users_access_level.entity_access_receipt.entity_permission() {
EntityPermission::AccessLevel { access_level } => *access_level,
diff --git a/services/document_storage_service/src/api/documents/permissions_token/validate_permissions_token.rs b/services/document_storage_service/src/api/documents/permissions_token/validate_permissions_token.rs
index eecd2d64f2..05d59a2b3c 100644
--- a/services/document_storage_service/src/api/documents/permissions_token/validate_permissions_token.rs
+++ b/services/document_storage_service/src/api/documents/permissions_token/validate_permissions_token.rs
@@ -1,16 +1,18 @@
use std::sync::Arc;
use axum::{
- Extension, Json,
+ Json,
extract::{self, State},
http::StatusCode,
response::{IntoResponse, Response},
};
use jsonwebtoken::{Algorithm, DecodingKey, Validation};
+use macro_authorization::OptionalMacroAuthorizationExtractor;
use macro_sync_service_jwt::ISSUER;
-use model::{document::DocumentPermissionsToken, response::ErrorResponse, user::UserContext};
+use model::{document::DocumentPermissionsToken, response::ErrorResponse};
use utoipa::ToSchema;
+use crate::api::context::AuthorizationService;
use crate::config::Config;
#[derive(Debug, serde::Serialize, serde::Deserialize, ToSchema)]
@@ -32,10 +34,10 @@ pub struct DocumentPermissionsTokenRequest {
(status = 500, body=ErrorResponse),
)
)]
-#[tracing::instrument(skip(config_context, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(config_context, user), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(config_context): State<Arc<Config>>,
- user_context: Extension<UserContext>,
+ user: OptionalMacroAuthorizationExtractor<AuthorizationService>,
extract::Json(DocumentPermissionsTokenRequest { token }): extract::Json<
DocumentPermissionsTokenRequest,
>,
@@ -45,11 +47,7 @@ pub async fn handler(
validation.set_issuer(&[ISSUER]);
- let user_id = if user_context.user_id.is_empty() {
- None
- } else {
- Some(user_context.user_id.clone())
- };
+ let user_id = user.macro_user_id.map(|user_id| user_id.to_string());
// Attempt to decode the token.
let decoded_jwt: DocumentPermissionsToken = match jsonwebtoken::decode::<DocumentPermissionsToken>(
diff --git a/services/document_storage_service/src/api/documents/pre_save.rs b/services/document_storage_service/src/api/documents/pre_save.rs
index 3489a41a3c..053baa3cbf 100644
--- a/services/document_storage_service/src/api/documents/pre_save.rs
+++ b/services/document_storage_service/src/api/documents/pre_save.rs
@@ -14,11 +14,12 @@ use axum::{
response::IntoResponse,
};
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
#[allow(unused_imports)]
use futures::stream::StreamExt;
-use model::{response::GenericErrorResponse, user::UserContext};
+use macro_authorization::MacroAuthorizationExtractor;
+use model::response::GenericErrorResponse;
use model::{
document::{ContentType, DocumentBasic, FileType},
@@ -49,13 +50,13 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
),
)]
-#[tracing::instrument(skip(state, document_context, user_context, req, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(state, document_context, user, req, _access), fields(user_id=?user.macro_user_id))]
#[allow(deprecated, reason = "we just want deprecated to show up in utoipa")]
#[deprecated(note = "we no longer support editing docx files as they are now converted to pdf.")]
pub async fn presave_document_handler(
- _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService, AuthorizationService>,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
Json(req): Json<PreSaveDocumentRequest>,
diff --git a/services/document_storage_service/src/api/documents/revert_delete_document.rs b/services/document_storage_service/src/api/documents/revert_delete_document.rs
index 71973ad623..d37255868a 100644
--- a/services/document_storage_service/src/api/documents/revert_delete_document.rs
+++ b/services/document_storage_service/src/api/documents/revert_delete_document.rs
@@ -1,14 +1,14 @@
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::extract::State;
use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
#[allow(unused_imports)]
use futures::stream::TryStreamExt;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::DocumentBasic;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::OwnerAccessLevel;
use serde::Deserialize;
use sqlx::PgPool;
@@ -34,11 +34,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context, document_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user, document_context, _access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<OwnerAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
diff --git a/services/document_storage_service/src/api/documents/save_document/save_document_handler.rs b/services/document_storage_service/src/api/documents/save_document/save_document_handler.rs
index 655200f247..b030028f83 100644
--- a/services/document_storage_service/src/api/documents/save_document/save_document_handler.rs
+++ b/services/document_storage_service/src/api/documents/save_document/save_document_handler.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::{
api::{context::ApiContext, documents::utils},
model::{
@@ -16,11 +16,11 @@ use axum::{
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::response::DocumentResponseMetadata;
use model::{
document::{DocumentBasic, FileType, FileTypeExt},
response::{ErrorResponse, GenericErrorResponse, GenericResponse},
- user::UserContext,
};
use models_permissions::share_permission::access_level::EditAccessLevel;
@@ -48,11 +48,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, document_context, _access, project), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, document_context, _access, project), fields(user_id=?user.macro_user_id))]
pub async fn save_document_handler(
- _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
project: ProjectBodyAccessLevelExtractor<
diff --git a/services/document_storage_service/src/api/documents/simple_save.rs b/services/document_storage_service/src/api/documents/simple_save.rs
index 3377f6009e..ff4ebb4c91 100644
--- a/services/document_storage_service/src/api/documents/simple_save.rs
+++ b/services/document_storage_service/src/api/documents/simple_save.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::{
api::{context::ApiContext, documents::utils},
model::response::documents::save::{SaveDocumentResponse, SaveDocumentResponseData},
@@ -13,11 +13,11 @@ use axum::{
response::IntoResponse,
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document::response::DocumentResponseMetadata;
use model::{
document::{DocumentBasic, FileType, FileTypeExt},
response::{GenericErrorResponse, GenericResponse},
- user::UserContext,
};
use models_permissions::share_permission::access_level::EditAccessLevel;
use s3_key::build_cloud_storage_bucket_document_key;
@@ -46,11 +46,11 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(_access, state, user_context, document_context, multipart), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(_access, state, user, document_context, multipart), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<EditAccessLevel, EntityAccessService, AuthorizationService>,
State(state): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
document_context: Extension<DocumentBasic>,
Path(Params { document_id }): Path<Params>,
mut multipart: Multipart,
diff --git a/services/document_storage_service/src/api/graphql_soup.rs b/services/document_storage_service/src/api/graphql_soup.rs
index 2986ffe1db..d1fb07f2e0 100644
--- a/services/document_storage_service/src/api/graphql_soup.rs
+++ b/services/document_storage_service/src/api/graphql_soup.rs
@@ -1,4 +1,4 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use async_graphql::{ServerError, http::GraphiQLSource};
use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
use axum::{
@@ -9,7 +9,7 @@ use axum::{
};
use axum_extra::extract::Cached;
use complete_graph::GraphqlSoupRequestParts;
-use model_user::axum_extractor::OptionalMacroUserExtractor;
+use macro_authorization::OptionalMacroAuthorizationExtractor;
pub(crate) fn router() -> Router<ApiContext> {
Router::new().route("/soup/graphql", get(graphiql).post(handler))
@@ -25,7 +25,11 @@ async fn handler(State(state): State<ApiContext>, req: Request) -> Response {
// Authentication stays eager: it gates execution for non-introspection
// queries and primes the `Cached` entry that resolvers extract lazily.
let auth =
- match Cached::<OptionalMacroUserExtractor>::from_request_parts(&mut parts, &state).await {
+ match Cached::<OptionalMacroAuthorizationExtractor<AuthorizationService>>::from_request_parts(
+ &mut parts, &state,
+ )
+ .await
+ {
Ok(Cached(auth)) => auth,
Err(err) => return err.into_response(),
};
diff --git a/services/document_storage_service/src/api/history/delete_history.rs b/services/document_storage_service/src/api/history/delete_history.rs
index ce2d3a393b..19791ac835 100644
--- a/services/document_storage_service/src/api/history/delete_history.rs
+++ b/services/document_storage_service/src/api/history/delete_history.rs
@@ -1,10 +1,10 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::extract::State;
-use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
+use axum::{extract::Path, http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
#[derive(serde::Deserialize)]
pub struct Params {
@@ -26,21 +26,21 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn delete_history_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { item_type, item_id }): Path<Params>,
) -> impl IntoResponse {
if let Err(e) = macro_db_client::history::delete_user_history(
&ctx.db,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
item_id.as_str(),
item_type.as_str(),
)
.await
{
- tracing::error!(error=?e, user_id=?user_context.user_id, "unable to delete history");
+ tracing::error!(error=?e, user_id=?user.macro_user_id, "unable to delete history");
return GenericResponse::builder()
.message("unable to delete history")
.is_error(true)
diff --git a/services/document_storage_service/src/api/history/get_history.rs b/services/document_storage_service/src/api/history/get_history.rs
index 8f0aafee8b..1690d879cf 100644
--- a/services/document_storage_service/src/api/history/get_history.rs
+++ b/services/document_storage_service/src/api/history/get_history.rs
@@ -1,9 +1,9 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use crate::model::response::history::GetUserHistoryResponse;
use axum::extract::State;
use axum::{Extension, http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use model::version::ApiVersionEnum;
/// Gets the users history
@@ -16,25 +16,29 @@ use model::version::ApiVersionEnum;
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_history_handler(
State(ctx): State<ApiContext>,
api_version: Extension<ApiVersionEnum>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
tracing::info!("get_history_handler");
- let history =
- match macro_db_client::history::get_user_history(&ctx.db, &user_context.user_id).await {
- Ok(history) => history,
- Err(e) => {
- tracing::error!(error=?e, user_id=?user_context.user_id, "unable to get history");
- return GenericResponse::builder()
- .message("unable to get history")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
- };
+ let history = match macro_db_client::history::get_user_history(
+ &ctx.db,
+ user.macro_user_id.as_ref(),
+ )
+ .await
+ {
+ Ok(history) => history,
+ Err(e) => {
+ tracing::error!(error=?e, user_id=?user.macro_user_id, "unable to get history");
+ return GenericResponse::builder()
+ .message("unable to get history")
+ .is_error(true)
+ .send(StatusCode::INTERNAL_SERVER_ERROR);
+ }
+ };
GenericResponse::builder()
.data(&history)
diff --git a/services/document_storage_service/src/api/history/mod.rs b/services/document_storage_service/src/api/history/mod.rs
index 1506af3fe4..9e40905a4d 100644
--- a/services/document_storage_service/src/api/history/mod.rs
+++ b/services/document_storage_service/src/api/history/mod.rs
@@ -19,7 +19,4 @@ pub fn router() -> Router<ApiContext> {
"/{item_type}/{item_id}",
delete(delete_history::delete_history_handler),
)
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
}
diff --git a/services/document_storage_service/src/api/history/upsert_history.rs b/services/document_storage_service/src/api/history/upsert_history.rs
index 1928eeec8d..66029918e3 100644
--- a/services/document_storage_service/src/api/history/upsert_history.rs
+++ b/services/document_storage_service/src/api/history/upsert_history.rs
@@ -1,14 +1,13 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::extract::State;
-use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
+use axum::{extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::domain::models::EntityPermission;
use entity_access::inbound::axum_extractors::HistoryAccessExtractor;
-use macro_user_id::user_id::MacroUserIdStr;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::{AccessLevel, ViewAccessLevel};
#[derive(serde::Deserialize)]
@@ -33,11 +32,15 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, history_access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, history_access), fields(user_id=?user.macro_user_id))]
pub async fn upsert_history_handler(
- history_access: HistoryAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ history_access: HistoryAccessExtractor<
+ ViewAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { item_type, item_id }): Path<Params>,
) -> impl IntoResponse {
let access_level = match history_access.entity_access_receipt.entity_permission() {
@@ -80,24 +83,13 @@ pub async fn upsert_history_handler(
}
}
- let user_id = user_context.user_id.as_str();
-
- // If a user id is present in the UserContext, add the item to the user's history
- if !user_id.is_empty()
- && let Err(e) = {
- match MacroUserIdStr::parse_from_str(&user_context.user_id) {
- Ok(id) => {
- macro_db_client::history::upsert_user_history(
- &mut transaction,
- id,
- item_id.as_str(),
- item_type.as_str(),
- )
- .await
- }
- Err(e) => Err(anyhow::Error::from(e)),
- }
- }
+ if let Err(e) = macro_db_client::history::upsert_user_history(
+ &mut transaction,
+ user.macro_user_id.clone(),
+ item_id.as_str(),
+ item_type.as_str(),
+ )
+ .await
{
tracing::error!(error=?e, "unable to upsert history");
return GenericResponse::builder()
@@ -107,26 +99,19 @@ pub async fn upsert_history_handler(
}
// If the item is a document, track the document view
- if item_type == "document" {
- let user_id_option = if user_id.is_empty() {
- None
- } else {
- Some(user_id)
- };
-
- if let Err(e) = macro_db_client::document::track_document::track_document(
+ if item_type == "document"
+ && let Err(e) = macro_db_client::document::track_document::track_document(
&mut transaction,
item_id.as_str(),
- user_id_option,
+ Some(user.macro_user_id.as_ref()),
)
.await
- {
- tracing::error!(error=?e, "unable to track document view");
- return GenericResponse::builder()
- .message("unable to track document view")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
+ {
+ tracing::error!(error=?e, "unable to track document view");
+ return GenericResponse::builder()
+ .message("unable to track document view")
+ .is_error(true)
+ .send(StatusCode::INTERNAL_SERVER_ERROR);
}
if let Err(e) = transaction.commit().await {
diff --git a/services/document_storage_service/src/api/instructions/create_instructions.rs b/services/document_storage_service/src/api/instructions/create_instructions.rs
index ddc8d9ed3b..b123037fe8 100644
--- a/services/document_storage_service/src/api/instructions/create_instructions.rs
+++ b/services/document_storage_service/src/api/instructions/create_instructions.rs
@@ -1,16 +1,17 @@
use crate::{
- api::context::ApiContext, model::response::instructions::CreateInstructionsDocumentResponse,
+ api::context::{ApiContext, AuthorizationService},
+ model::response::instructions::CreateInstructionsDocumentResponse,
};
use axum::{Json, extract::State};
use documents_hex::domain::create::{NewDocumentMetadata, NewMarkdownTextDocument};
use documents_hex::domain::models::DocumentError;
use documents_hex::domain::ports::create::DocumentCreationService as _;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::instructions::create::{
CreateInstructionsError, insert_instructions_document,
};
use macro_db_client::instructions::get::get_instructions_document;
use model::response::GenericErrorResponse;
-use model_user::axum_extractor::MacroUserExtractor;
use models_dcs::constants::INSTRUCTIONS_FILE_NAME;
/// Creates an instructions document for the current user
@@ -27,7 +28,7 @@ use models_dcs::constants::INSTRUCTIONS_FILE_NAME;
#[tracing::instrument(skip(ctx, user_context), fields(user_id=%user_context.macro_user_id))]
pub async fn create_instructions_handler(
State(ctx): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
) -> Result<Json<CreateInstructionsDocumentResponse>, DocumentError> {
let user_id = user_context.macro_user_id;
diff --git a/services/document_storage_service/src/api/instructions/get_instructions.rs b/services/document_storage_service/src/api/instructions/get_instructions.rs
index 62a11d7b2d..6aa0b26a56 100644
--- a/services/document_storage_service/src/api/instructions/get_instructions.rs
+++ b/services/document_storage_service/src/api/instructions/get_instructions.rs
@@ -1,12 +1,11 @@
use crate::{
- api::context::ApiContext, model::response::instructions::GetInstructionsDocumentResponse,
+ api::context::{ApiContext, AuthorizationService},
+ model::response::instructions::GetInstructionsDocumentResponse,
};
use axum::{Json, extract::State, http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use macro_user_id::cowlike::CowLike;
-use model::{
- response::{GenericErrorResponse, GenericResponse},
- user::axum_extractor::MacroUserExtractor,
-};
+use model::response::{GenericErrorResponse, GenericResponse};
/// Gets the instructions document for the current user
#[utoipa::path(
@@ -22,7 +21,7 @@ use model::{
#[tracing::instrument(skip(ctx, user_context), fields(user_id=%user_context.macro_user_id))]
pub async fn get_instructions_handler(
State(ctx): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
match macro_db_client::instructions::get::get_instructions_document(
&ctx.db,
diff --git a/services/document_storage_service/src/api/instructions/mod.rs b/services/document_storage_service/src/api/instructions/mod.rs
index b5f3c8f7ab..0911ab1f4f 100644
--- a/services/document_storage_service/src/api/instructions/mod.rs
+++ b/services/document_storage_service/src/api/instructions/mod.rs
@@ -12,7 +12,4 @@ pub fn router() -> Router<ApiContext> {
Router::new()
.route("/", post(create_instructions::create_instructions_handler))
.route("/", get(get_instructions::get_instructions_handler))
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
}
diff --git a/services/document_storage_service/src/api/internal/mod.rs b/services/document_storage_service/src/api/internal/mod.rs
index 3e2b145f00..5fc7e06005 100644
--- a/services/document_storage_service/src/api/internal/mod.rs
+++ b/services/document_storage_service/src/api/internal/mod.rs
@@ -1,5 +1,5 @@
use super::{
- context::{ApiContext, EntityAccessService},
+ context::{ApiContext, AuthorizationService, EntityAccessService},
documents::{export_document, get_document_version},
history::upsert_history,
projects::upload_folder,
@@ -22,9 +22,8 @@ use axum::{
Router,
routing::{delete, get, post, put},
};
-use macro_middleware::{
- auth::ensure_user_exists,
- cloud_storage::{document::ensure_document_exists, thread::ensure_thread_exists},
+use macro_middleware::cloud_storage::{
+ document::ensure_document_exists, thread::ensure_thread_exists,
};
mod associate_github_installations;
@@ -35,9 +34,6 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
let ensure_document_exists_middleware =
axum::middleware::from_fn_with_state(state.clone(), ensure_document_exists::handler);
- let ensure_user_exists_middleware =
- axum::middleware::from_fn_with_state(state.clone(), ensure_user_exists::handler);
-
Router::new()
// User routes
.route(
@@ -51,9 +47,9 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
documents_hex::inbound::axum_router::get_document::get_document_handler::<
DocumentService,
EntityAccessService,
+ AuthorizationService,
>,
- )
- .layer(ensure_document_exists_middleware.clone()),
+ ),
)
.route(
"/documents/{document_id}/basic",
@@ -62,20 +58,19 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
)
.route(
"/documents/{document_id}/export",
- get(export_document::handler).layer(ensure_document_exists_middleware.clone()),
+ get(export_document::handler),
)
.route(
"/documents/{document_id}/text",
- get(get_document_text::handler).layer(ensure_document_exists_middleware.clone()),
+ get(get_document_text::handler),
)
.route(
"/documents/{document_id}/full_pdf_modification_data",
- get(get_full_pdf_modification_data::handler)
- .layer(ensure_document_exists_middleware.clone()),
+ get(get_full_pdf_modification_data::handler),
)
.route(
"/documents/{document_id}/location",
- get(location::get_location_handler).layer(ensure_document_exists_middleware.clone()),
+ get(location::get_location_handler),
)
.route(
"/documents/{document_id}/location_v3",
@@ -83,9 +78,9 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
documents_hex::inbound::axum_router::get_location::get_location_v3_handler::<
DocumentService,
EntityAccessService,
+ AuthorizationService,
>,
- )
- .layer(ensure_document_exists_middleware.clone()),
+ ),
)
.route(
"/documents/{document_id}/permissions",
@@ -101,12 +96,13 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
documents_hex::inbound::axum_router::create_document::create_document_handler::<
DocumentService,
EntityAccessService,
+ AuthorizationService,
>,
),
)
.route(
"/documents/initialize_how_to_guide",
- post(initialize_how_to_guide::handler).layer(ensure_user_exists_middleware.clone()),
+ post(initialize_how_to_guide::handler),
)
.route(
"/documents/list_with_access",
@@ -114,8 +110,7 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
)
.route(
"/documents/{document_id}",
- put(save_document::save_document_handler)
- .layer(ensure_document_exists_middleware.clone()),
+ put(save_document::save_document_handler),
)
.route(
"/documents/{document_id}/{document_version_id}",
@@ -123,8 +118,7 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
)
.route(
"/documents/{document_id}/{document_version_id}/key",
- get(get_document_key::get_document_key_handler)
- .layer(ensure_document_exists_middleware.clone()),
+ get(get_document_key::get_document_key_handler),
)
.route(
"/documents/{document_id}/update",
@@ -136,6 +130,7 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
documents_hex::inbound::axum_router::put_snapshot::put_snapshot_handler::<
DocumentService,
EntityAccessService,
+ AuthorizationService,
>,
),
)
@@ -143,13 +138,11 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
// History routes
.route(
"/history/{item_type}/{item_id}",
- post(upsert_history::upsert_history_handler)
- .layer(ensure_user_exists_middleware.clone()),
+ post(upsert_history::upsert_history_handler),
)
.route(
"/history/{item_type}/{item_id}",
- delete(delete_history::delete_history_handler)
- .layer(ensure_user_exists_middleware.clone()),
+ delete(delete_history::delete_history_handler),
)
.route(
"/threads/{thread_id}/access_level",
@@ -160,8 +153,7 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
)
.route(
"/users/populate_items",
- post(populate_items::populate_items_handler)
- .layer(ensure_user_exists_middleware.clone()),
+ post(populate_items::populate_items_handler),
)
// Project routes
.route(
@@ -172,14 +164,8 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
"/projects/mark_uploaded",
post(upload_folder::mark_uploaded_handler),
)
- .route(
- "/item_ids",
- get(get_item_ids::get_item_ids_handler).layer(ensure_user_exists_middleware.clone()),
- )
- .route(
- "/validate_item_ids",
- post(validate_item_ids::handler).layer(ensure_user_exists_middleware),
- )
+ .route("/item_ids", get(get_item_ids::get_item_ids_handler))
+ .route("/validate_item_ids", post(validate_item_ids::handler))
// Github routes
.route(
"/github/installations/{github_user_id}/associate",
diff --git a/services/document_storage_service/src/api/items/get_item_ids.rs b/services/document_storage_service/src/api/items/get_item_ids.rs
index 08e5457838..a9c65cc7d0 100644
--- a/services/document_storage_service/src/api/items/get_item_ids.rs
+++ b/services/document_storage_service/src/api/items/get_item_ids.rs
@@ -1,10 +1,10 @@
use crate::api::MACRO_INTERNAL_USER_ID;
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
+use axum::Json;
use axum::extract::{Query, State};
use axum::http::StatusCode;
-use axum::{Extension, Json};
+use macro_authorization::MacroAuthorizationExtractor;
use model::document_storage_service_internal::GetItemIDsResponse;
-use model::user::UserContext;
#[derive(serde::Deserialize)]
pub struct Params {
@@ -13,10 +13,10 @@ pub struct Params {
}
/// Gets the ids of the items the user has access to
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_item_ids_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Query(Params {
item_type,
exclude_owned,
@@ -24,7 +24,7 @@ pub async fn get_item_ids_handler(
) -> Result<(StatusCode, Json<GetItemIDsResponse>), (StatusCode, String)> {
tracing::info!("get_item_ids");
- let user_id = user_context.user_id.clone();
+ let user_id = user.user_context.user_id.clone();
if matches!(user_id.as_str(), "" | MACRO_INTERNAL_USER_ID) {
return Err((
diff --git a/services/document_storage_service/src/api/items/validate_item_ids.rs b/services/document_storage_service/src/api/items/validate_item_ids.rs
index 2ffd3726f8..1e4ce7173b 100644
--- a/services/document_storage_service/src/api/items/validate_item_ids.rs
+++ b/services/document_storage_service/src/api/items/validate_item_ids.rs
@@ -1,21 +1,20 @@
use crate::api::MACRO_INTERNAL_USER_ID;
-use crate::api::context::ApiContext;
-use axum::Extension;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::extract::{Json, State};
use axum::http::StatusCode;
+use macro_authorization::MacroAuthorizationExtractor;
use model::document_storage_service_internal::{ValidateItemIDsRequest, ValidateItemIDsResponse};
-use model::user::UserContext;
/// Validates the user has access to the provided list of item ids
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Json(req): Json<ValidateItemIDsRequest>,
) -> Result<(StatusCode, Json<ValidateItemIDsResponse>), (StatusCode, String)> {
tracing::info!("validate_item_ids");
- let user_id = user_context.user_id.clone();
+ let user_id = user.user_context.user_id.clone();
if matches!(user_id.as_str(), "" | MACRO_INTERNAL_USER_ID) {
return Err((
diff --git a/services/document_storage_service/src/api/middleware/check_user_document_count.rs b/services/document_storage_service/src/api/middleware/check_user_document_count.rs
deleted file mode 100644
index c40fdd0fa9..0000000000
--- a/services/document_storage_service/src/api/middleware/check_user_document_count.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::sync::Arc;
-
-use axum::{
- Extension,
- body::Body,
- extract::{Request, State},
- http::StatusCode,
- middleware::Next,
- response::Response,
-};
-use http_body_util::BodyExt;
-use sqlx::{Pool, Postgres};
-
-use crate::{
- api::{
- MACRO_READ_PROFESSIONAL_PERMISSION_ID, context::ApiContext,
- middleware::error_handler::error_handler,
- },
- config::Config,
-};
-use model::folder::UploadFolderRequest;
-use model::user::UserContext;
-
-/// Checks if the user has hit/exceeded their document limit for a folder upload
-#[tracing::instrument(skip(ctx, user_context, config_context, req, next), fields(user_id=?user_context.user_id))]
-pub(in crate::api) async fn handler_upload_folder(
- State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
- State(config_context): State<Arc<Config>>,
- req: Request,
- next: Next,
-) -> Result<Response, Response> {
- match user_context.permissions.as_ref() {
- None => Err(error_handler(
- "could not get user permissions",
- StatusCode::INTERNAL_SERVER_ERROR,
- )),
- Some(permissions) => {
- if permissions.contains(&String::from(MACRO_READ_PROFESSIONAL_PERMISSION_ID)) {
- tracing::trace!("user is a professional, skipping document count check");
- return Ok(next.run(req).await);
- }
-
- let (parts, body) = req.into_parts();
- let bytes = match body.collect().await {
- Ok(bytes) => bytes.to_bytes(),
- Err(err) => {
- tracing::error!(error=?err, "failed to collect body");
- return Err(error_handler(
- "error occurred",
- StatusCode::INTERNAL_SERVER_ERROR,
- ));
- }
- };
-
- let parsed_body = match serde_json::from_slice::<UploadFolderRequest>(&bytes) {
- Ok(result) => result,
- Err(err) => {
- tracing::error!(error=?err, "failed to parse body");
- return Err(error_handler(
- "unable to parse body for folder upload",
- StatusCode::INTERNAL_SERVER_ERROR,
- ));
- }
- };
-
- let new_item_count: u64 = match parsed_body.content.len().try_into() {
- Ok(count) => count,
- Err(_) => {
- return Err(error_handler(
- "unable to convert folder item count to i64",
- StatusCode::INTERNAL_SERVER_ERROR,
- ));
- }
- };
-
- if let Err((status_code, msg)) = check_document_count_for_folder_upload(
- ctx.db.clone(),
- &user_context.user_id,
- new_item_count,
- config_context.document_limit,
- )
- .await
- {
- return Err(error_handler(msg.as_str(), status_code));
- }
-
- let request = Request::from_parts(parts, Body::from(bytes));
- Ok(next.run(request).await)
- }
- }
-}
-
-#[tracing::instrument(skip(db))]
-async fn check_document_count_for_folder_upload(
- db: Pool<Postgres>,
- user_id: &str,
- new_item_count: u64,
- document_limit: u64,
-) -> Result<(), (StatusCode, String)> {
- let document_count =
- match macro_db_client::user::count::count_user_items(&db, user_id, false).await {
- Ok(document_count) => document_count as u64,
- Err(e) => {
- tracing::error!(error=?e, "unable to get user document count");
- return Err((
- StatusCode::INTERNAL_SERVER_ERROR,
- "unable to get user document count".to_string(),
- ));
- }
- };
-
- if document_count + new_item_count >= document_limit {
- return Err((
- StatusCode::FORBIDDEN,
- "user document count exceeds document limit".to_string(),
- ));
- }
-
- Ok(())
-}
diff --git a/services/document_storage_service/src/api/middleware/ensure_user_is_onboarded.rs b/services/document_storage_service/src/api/middleware/ensure_user_is_onboarded.rs
index 16f34e5650..11ad4c0432 100644
--- a/services/document_storage_service/src/api/middleware/ensure_user_is_onboarded.rs
+++ b/services/document_storage_service/src/api/middleware/ensure_user_is_onboarded.rs
@@ -1,21 +1,21 @@
+use crate::api::context::AuthorizationService;
use axum::{
- Extension,
extract::{Request, State},
http::StatusCode,
middleware::Next,
response::Response,
};
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::user::onboarding_status::get_onboarding_status;
-use model::user::UserContext;
use sqlx::PgPool;
pub async fn handler(
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
req: Request,
next: Next,
) -> Result<Response, (StatusCode, String)> {
- let is_onboarded = get_onboarding_status(&db, user_context.user_id.as_str())
+ let is_onboarded = get_onboarding_status(&db, user.macro_user_id.as_ref())
.await
.map_err(|e| {
(
diff --git a/services/document_storage_service/src/api/middleware/error_handler.rs b/services/document_storage_service/src/api/middleware/error_handler.rs
deleted file mode 100644
index 2fd33d4faf..0000000000
--- a/services/document_storage_service/src/api/middleware/error_handler.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use axum::{
- body::Body,
- http::{Response, StatusCode},
-};
-
-use model::response::GenericResponse;
-
-/// Generic wrapper for error responses in middleware
-pub(in crate::api::middleware) fn error_handler(
- message: &str,
- status_code: StatusCode,
-) -> Response<Body> {
- GenericResponse::builder()
- .is_error(true)
- .message(message)
- .send(status_code)
-}
diff --git a/services/document_storage_service/src/api/middleware/mod.rs b/services/document_storage_service/src/api/middleware/mod.rs
index 36a69464b4..ed197de4f1 100644
--- a/services/document_storage_service/src/api/middleware/mod.rs
+++ b/services/document_storage_service/src/api/middleware/mod.rs
@@ -1,4 +1,2 @@
-pub mod check_user_document_count;
pub mod ensure_user_is_onboarded;
-mod error_handler;
pub mod internal_access;
diff --git a/services/document_storage_service/src/api/mod.rs b/services/document_storage_service/src/api/mod.rs
index f5f1a4d4a8..dc8adda9e3 100644
--- a/services/document_storage_service/src/api/mod.rs
+++ b/services/document_storage_service/src/api/mod.rs
@@ -5,7 +5,6 @@ use axum::extract::FromRef;
use axum::extract::Request;
use axum::http::Method;
use axum::middleware::Next;
-use context::InternalFlag;
use github::inbound::github_sync_router::GithubSyncRouterState;
use macro_axum_utils::compose_layers;
use macro_tower_layers::MacroRequestIdAndTracingLayer;
@@ -55,8 +54,6 @@ pub static MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY: &str =
pub static MACRO_INTERNAL_USER_ID_HEADER_KEY: &str = "x-document-storage-service-user-id";
pub const MACRO_INTERNAL_USER_ID: &str = "macro|[email protected]";
-// permission based constants
-pub static MACRO_READ_PROFESSIONAL_PERMISSION_ID: &str = "read:professional_features";
pub async fn setup_and_serve(state: ApiContext) -> anyhow::Result<()> {
let app = api_router(state.clone())
@@ -247,6 +244,7 @@ fn api_router(state: ApiContext) -> Router {
crm::inbound::axum_router::crm_router(state.crm_state.clone()),
)
.layer(
+ // NOTE: this will still be needed until we add in `MacroAuthorizationExtractor` support for all crates
ServiceBuilder::new()
.layer(axum::middleware::from_fn(
macro_middleware::auth::initialize_user_context::handler,
@@ -287,32 +285,11 @@ fn api_router(state: ApiContext) -> Router {
))
.layer(axum::middleware::from_fn(
macro_middleware::connection_drop_prevention_handler,
- ))
- .layer(axum::middleware::from_fn(
- |mut req: Request, next: Next| async move {
- req.extensions_mut().insert(InternalFlag { internal: true });
- next.run(req).await
- },
)),
),
)
- .nest(
- "/recents",
- recents::router().layer(axum::middleware::from_fn_with_state(
- state.clone(),
- macro_middleware::auth::decode_jwt::handler, // The user has to exist for all recents calls
- )),
- )
- .nest(
- "/saved_views",
- saved_views::router().layer(compose_layers![
- axum::middleware::from_fn(macro_middleware::auth::initialize_user_context::handler),
- axum::middleware::from_fn_with_state(
- state.clone(),
- macro_middleware::auth::attach_user::handler
- ),
- ]),
- )
+ .nest("/recents", recents::router())
+ .nest("/saved_views", saved_views::router())
.with_state(state);
Router::new()
.nest("/{version}", internal_router.clone())
diff --git a/services/document_storage_service/src/api/pins/add_pin.rs b/services/document_storage_service/src/api/pins/add_pin.rs
index 9b40e1caa1..85e81e5e7c 100644
--- a/services/document_storage_service/src/api/pins/add_pin.rs
+++ b/services/document_storage_service/src/api/pins/add_pin.rs
@@ -1,19 +1,18 @@
use crate::{
- api::context::{ApiContext, EntityAccessService},
+ api::context::{ApiContext, AuthorizationService, EntityAccessService},
model::request::pins::AddPinRequest,
};
use axum::{
- Extension,
extract::{Path, State},
http::StatusCode,
response::IntoResponse,
};
use entity_access::inbound::axum_extractors::PinAccessLevelExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use serde::Deserialize;
@@ -37,19 +36,24 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, pin_type, inner), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, pin_type, inner), fields(user_id=?user.macro_user_id))]
#[axum::debug_handler(state = ApiContext)]
pub async fn add_pin_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { pinned_item_id }): Path<Params>,
PinAccessLevelExtractor {
pin_type, inner, ..
- }: PinAccessLevelExtractor<ViewAccessLevel, EntityAccessService, AddPinRequest>,
+ }: PinAccessLevelExtractor<
+ ViewAccessLevel,
+ EntityAccessService,
+ AddPinRequest,
+ AuthorizationService,
+ >,
) -> impl IntoResponse {
match macro_db_client::pins::upsert_pin(
ctx.db.clone(),
- user_context.user_id.as_str(),
+ user.macro_user_id.as_ref(),
pinned_item_id.as_str(),
pin_type.pin_type.as_str(),
inner.pin_index,
@@ -58,7 +62,7 @@ pub async fn add_pin_handler(
{
Ok(_) => (),
Err(err) => {
- tracing::error!(error=?err, user_id=?user_context.user_id, "failed to add pin");
+ tracing::error!(error=?err, user_id=?user.macro_user_id, "failed to add pin");
return GenericResponse::builder()
.message("failed to add pin")
.is_error(true)
diff --git a/services/document_storage_service/src/api/pins/get_pins.rs b/services/document_storage_service/src/api/pins/get_pins.rs
index f2b0a1a835..cf767e7488 100644
--- a/services/document_storage_service/src/api/pins/get_pins.rs
+++ b/services/document_storage_service/src/api/pins/get_pins.rs
@@ -1,9 +1,12 @@
use crate::model::response::pin::GetPinsResponse;
-use crate::{api::context::ApiContext, model::response::pin::UserPinsResponse};
+use crate::{
+ api::context::{ApiContext, AuthorizationService},
+ model::response::pin::UserPinsResponse,
+};
use axum::extract::State;
-use axum::{Extension, http::StatusCode, response::IntoResponse};
+use axum::{http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
/// Gets the users pinned items
#[utoipa::path(
@@ -15,17 +18,17 @@ use model::user::UserContext;
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_pins_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
- let pins = match macro_db_client::pins::get_pins(ctx.db.clone(), user_context.user_id.as_str())
+ let pins = match macro_db_client::pins::get_pins(ctx.db.clone(), user.macro_user_id.as_ref())
.await
{
Ok(pins) => pins,
Err(err) => {
- tracing::error!(error=?err, user_id=?user_context.user_id, "failed to get users pinned items");
+ tracing::error!(error=?err, user_id=?user.macro_user_id, "failed to get users pinned items");
return GenericResponse::builder()
.message("failed to get pins")
.is_error(true)
diff --git a/services/document_storage_service/src/api/pins/mod.rs b/services/document_storage_service/src/api/pins/mod.rs
index 4eafb6a898..19607e68cd 100644
--- a/services/document_storage_service/src/api/pins/mod.rs
+++ b/services/document_storage_service/src/api/pins/mod.rs
@@ -16,7 +16,4 @@ pub fn router() -> Router<ApiContext> {
.route("/{pinned_item_id}", post(add_pin::add_pin_handler))
.route("/{pinned_item_id}", delete(remove_pin::remove_pin_handler))
.route("/", patch(reorder_pins::reorder_pins_handler))
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
}
diff --git a/services/document_storage_service/src/api/pins/remove_pin.rs b/services/document_storage_service/src/api/pins/remove_pin.rs
index 3bc1be3314..bbc99c3721 100644
--- a/services/document_storage_service/src/api/pins/remove_pin.rs
+++ b/services/document_storage_service/src/api/pins/remove_pin.rs
@@ -1,14 +1,16 @@
-use crate::{api::context::ApiContext, model::request::pins::PinRequest};
+use crate::{
+ api::context::{ApiContext, AuthorizationService},
+ model::request::pins::PinRequest,
+};
use axum::{
- Extension,
extract::{Json, Path, State},
http::StatusCode,
response::IntoResponse,
};
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use serde::Deserialize;
#[derive(Deserialize)]
@@ -30,16 +32,16 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn remove_pin_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { pinned_item_id }): Path<Params>,
Json(req): Json<PinRequest>,
) -> impl IntoResponse {
match macro_db_client::pins::remove_pin(
ctx.db.clone(),
- user_context.user_id.as_str(),
+ user.macro_user_id.as_ref(),
pinned_item_id.as_str(),
req.pin_type.as_str(),
)
@@ -47,7 +49,7 @@ pub async fn remove_pin_handler(
{
Ok(_) => (),
Err(err) => {
- tracing::error!(error=?err, user_id=?user_context.user_id, "failed to add pin");
+ tracing::error!(error=?err, user_id=?user.macro_user_id, "failed to add pin");
return GenericResponse::builder()
.message("failed to add pin")
.is_error(true)
diff --git a/services/document_storage_service/src/api/pins/reorder_pins.rs b/services/document_storage_service/src/api/pins/reorder_pins.rs
index 77d31cc941..284dcd3ae3 100644
--- a/services/document_storage_service/src/api/pins/reorder_pins.rs
+++ b/services/document_storage_service/src/api/pins/reorder_pins.rs
@@ -1,11 +1,10 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::{
- Extension,
extract::{self, State},
http::StatusCode,
response::IntoResponse,
};
-use model::user::UserContext;
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
pin::request::ReorderPinRequest,
response::{GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse},
@@ -22,18 +21,18 @@ use model::{
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, req), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, req), fields(user_id=?user.macro_user_id))]
pub async fn reorder_pins_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
extract::Json(req): extract::Json<Vec<ReorderPinRequest>>,
) -> impl IntoResponse {
- match macro_db_client::pins::reorder_pins(ctx.db.clone(), user_context.user_id.as_str(), req)
+ match macro_db_client::pins::reorder_pins(ctx.db.clone(), user.macro_user_id.as_ref(), req)
.await
{
Ok(_) => (),
Err(err) => {
- tracing::error!(error=?err, user_id=?user_context.user_id, "failed to reorder pins");
+ tracing::error!(error=?err, user_id=?user.macro_user_id, "failed to reorder pins");
return GenericResponse::builder()
.message("failed to reorder pins")
.is_error(true)
diff --git a/services/document_storage_service/src/api/projects/create_project.rs b/services/document_storage_service/src/api/projects/create_project.rs
index 7d04653fa5..b1f4ea4cba 100644
--- a/services/document_storage_service/src/api/projects/create_project.rs
+++ b/services/document_storage_service/src/api/projects/create_project.rs
@@ -1,5 +1,5 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
extract::State,
http::StatusCode,
@@ -7,10 +7,10 @@ use axum::{
};
use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractor;
use entity_access_management::domain::ports::EntityAccessManagementService;
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
project::{Project, request::CreateProjectRequest, response::CreateProjectResponse},
response::{GenericErrorResponse, GenericResponse},
- user::axum_extractor::MacroUserExtractor,
};
use model_entity::EntityType;
use models_permissions::share_permission::SharePermissionV2;
@@ -34,7 +34,7 @@ use unicode_segmentation::UnicodeSegmentation;
#[tracing::instrument(skip(ctx, user_context, project), fields(user_id=?user_context.macro_user_id))]
pub async fn create_project_handler(
State(ctx): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
project: ProjectBodyAccessLevelExtractor<
EditAccessLevel,
CreateProjectRequest,
@@ -65,7 +65,7 @@ pub async fn create_project_handler(
async fn create_project_v2(
ctx: ApiContext,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
req: CreateProjectRequest,
) -> Result<Project, (StatusCode, String)> {
if req.name.graphemes(true).count() > 100 {
diff --git a/services/document_storage_service/src/api/projects/delete_project.rs b/services/document_storage_service/src/api/projects/delete_project.rs
index 86c4722dbd..98599c9c6a 100644
--- a/services/document_storage_service/src/api/projects/delete_project.rs
+++ b/services/document_storage_service/src/api/projects/delete_project.rs
@@ -1,6 +1,6 @@
use crate::api::{context::ApiContext, util::count_occurrences};
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
Extension,
extract::{Path, State},
@@ -8,13 +8,13 @@ use axum::{
response::{IntoResponse, Response},
};
use entity_access::inbound::axum_extractors::ProjectAccessLevelExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::{
project::BasicProject,
response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
TypedSuccessResponse,
},
- user::UserContext,
};
use models_permissions::share_permission::access_level::OwnerAccessLevel;
use sqs_client::search::{
@@ -54,11 +54,15 @@ pub type ProjectDeleteResponse = TypedSuccessResponse<ProjectDeleteResponseData>
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, id, _access), fields(user_id=?user_context.user_id, project_id=?id))]
+#[tracing::instrument(skip(ctx, user, id, _access), fields(user_id=?user.macro_user_id, project_id=?id))]
pub async fn delete_project_handler(
- _access: ProjectAccessLevelExtractor<OwnerAccessLevel, EntityAccessService>,
+ _access: ProjectAccessLevelExtractor<
+ OwnerAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
project: Extension<BasicProject>,
) -> impl IntoResponse {
@@ -112,7 +116,7 @@ pub async fn delete_project_handler(
macro_project_utils::ProjectModifiedArgs {
project_id: None,
old_project_id: Some(parent_id),
- user_id: user_context.user_id.clone(),
+ user_id: user.macro_user_id.to_string(),
},
)
.await;
@@ -143,11 +147,15 @@ pub async fn delete_project_handler(
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, _access), fields(user_id=?user.macro_user_id))]
pub async fn permanently_delete_project_handler(
- _access: ProjectAccessLevelExtractor<OwnerAccessLevel, EntityAccessService>,
+ _access: ProjectAccessLevelExtractor<
+ OwnerAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
) -> Result<Response, Response> {
tracing::info!("permanently_delete_project");
diff --git a/services/document_storage_service/src/api/projects/edit_project.rs b/services/document_storage_service/src/api/projects/edit_project.rs
index f101c219bb..6d95e0640e 100644
--- a/services/document_storage_service/src/api/projects/edit_project.rs
+++ b/services/document_storage_service/src/api/projects/edit_project.rs
@@ -1,5 +1,5 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use anyhow::Context;
use axum::{
Extension,
@@ -12,6 +12,7 @@ use entity_access::inbound::axum_extractors::{
ProjectAccessLevelExtractor, ProjectBodyAccessLevelExtractor,
};
use entity_access_management::domain::ports::EntityAccessManagementService;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{GenericErrorResponse, SuccessResponse};
use model::{project::BasicProject, response::GenericSuccessResponse};
use model::{project::request::PatchProjectRequestV2, response::ErrorResponse, user::UserContext};
@@ -40,7 +41,7 @@ pub struct Params {
)]
#[allow(unused, reason = "used to generate OpenAPI documentation")]
pub async fn edit_project_handler_v2(
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
Json(req): Json<PatchProjectRequestV2>,
) -> impl IntoResponse {
@@ -48,11 +49,11 @@ pub async fn edit_project_handler_v2(
}
/// Edits a project.
-#[tracing::instrument(skip(ctx, user_context, project, id, access), fields(user_id=?user_context.user_id, project_id=?id))]
+#[tracing::instrument(skip(ctx, user, project, id, access), fields(user_id=?user.macro_user_id, project_id=?id))]
pub async fn edit_project_handler(
- access: ProjectAccessLevelExtractor<EditAccessLevel, EntityAccessService>,
+ access: ProjectAccessLevelExtractor<EditAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
project_context: Extension<BasicProject>,
Path(Params { id }): Path<Params>,
project: ProjectBodyAccessLevelExtractor<
@@ -78,19 +79,26 @@ pub async fn edit_project_handler(
_ => AccessLevel::Edit,
};
- edit_project_v2(&ctx, user_context, project_context, access_level, id, req)
- .await
- .map_err(|(status_code, message)| {
- tracing::error!(error=?message, "unable to create project");
- (
- status_code,
- Json(GenericErrorResponse {
- error: true,
- message,
- }),
- )
- .into_response()
- })?;
+ edit_project_v2(
+ &ctx,
+ user.user_context,
+ project_context,
+ access_level,
+ id,
+ req,
+ )
+ .await
+ .map_err(|(status_code, message)| {
+ tracing::error!(error=?message, "unable to create project");
+ (
+ status_code,
+ Json(GenericErrorResponse {
+ error: true,
+ message,
+ }),
+ )
+ .into_response()
+ })?;
return Ok((
StatusCode::OK,
@@ -104,7 +112,7 @@ pub async fn edit_project_handler(
async fn edit_project_v2(
ctx: &ApiContext,
- user_context: Extension<UserContext>,
+ user_context: UserContext,
project_context: Extension<BasicProject>,
users_access_level: AccessLevel,
id: String,
diff --git a/services/document_storage_service/src/api/projects/get_batch_preview.rs b/services/document_storage_service/src/api/projects/get_batch_preview.rs
index 0fb4ad1696..c0046bda7f 100644
--- a/services/document_storage_service/src/api/projects/get_batch_preview.rs
+++ b/services/document_storage_service/src/api/projects/get_batch_preview.rs
@@ -1,23 +1,22 @@
use std::collections::HashSet;
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use anyhow::Result;
use axum::{
- Extension,
extract::{Json, State},
response::{IntoResponse, Response},
};
+use macro_authorization::OptionalMacroAuthorizationExtractor;
use model::{
project::{
ProjectPreview, ProjectPreviewData, ProjectPreviewV2, WithProjectId,
request::GetBatchProjectPreviewRequest, response::GetBatchProjectPreviewResponse,
},
response::{GenericErrorResponse, GenericResponse},
- user::UserContext,
};
use reqwest::StatusCode;
-#[tracing::instrument(skip(ctx, user_context, req), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, req), fields(user_id=?user.macro_user_id))]
#[utoipa::path(
tag = "project",
post,
@@ -31,7 +30,7 @@ use reqwest::StatusCode;
)]
pub async fn get_batch_preview_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: OptionalMacroAuthorizationExtractor<AuthorizationService>,
Json(req): Json<GetBatchProjectPreviewRequest>,
) -> Result<(StatusCode, Json<GetBatchProjectPreviewResponse>), Response> {
// Ensure the project ids are unique to prevent duplicate work
diff --git a/services/document_storage_service/src/api/projects/get_project.rs b/services/document_storage_service/src/api/projects/get_project.rs
index a5eeadbf16..c7f3e35273 100644
--- a/services/document_storage_service/src/api/projects/get_project.rs
+++ b/services/document_storage_service/src/api/projects/get_project.rs
@@ -1,18 +1,17 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::Json;
use axum::extract::State;
use axum::response::Response;
-use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
+use axum::{extract::Path, http::StatusCode, response::IntoResponse};
use entity_access::domain::models::EntityPermission;
use entity_access::inbound::axum_extractors::ProjectAccessLevelExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::project::response::{
GetProjectContentResponse, GetProjectResponse, GetProjectResponseData,
};
use model::response::{ErrorResponse, GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
-use model::user::axum_extractor::MacroUserExtractor;
use models_permissions::share_permission::access_level::AccessLevel;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use sqlx::PgPool;
@@ -39,9 +38,9 @@ pub struct Params {
)]
#[tracing::instrument(skip(db, user_context, id, access), fields(user_id=?user_context.macro_user_id, project_id=?id))]
pub async fn get_project_content_handler(
- access: ProjectAccessLevelExtractor<ViewAccessLevel, EntityAccessService>,
+ access: ProjectAccessLevelExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(db): State<PgPool>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
) -> Result<Response, Response> {
let access_level = match access.entity_access_receipt.entity_permission() {
@@ -84,11 +83,11 @@ pub async fn get_project_content_handler(
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, id, access), fields(user_id=?user_context.user_id, project_id=?id))]
+#[tracing::instrument(skip(ctx, user, id, access), fields(user_id=?user.macro_user_id, project_id=?id))]
pub async fn get_project_handler(
- access: ProjectAccessLevelExtractor<ViewAccessLevel, EntityAccessService>,
+ access: ProjectAccessLevelExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
) -> Result<Response, Response> {
let project_metadata =
diff --git a/services/document_storage_service/src/api/projects/get_projects.rs b/services/document_storage_service/src/api/projects/get_projects.rs
index b848d8d63f..fda7e9a7bc 100644
--- a/services/document_storage_service/src/api/projects/get_projects.rs
+++ b/services/document_storage_service/src/api/projects/get_projects.rs
@@ -1,13 +1,13 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::extract::State;
use futures::stream::{FuturesUnordered, StreamExt};
-use axum::{Extension, http::StatusCode, response::IntoResponse};
+use axum::{http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::project::PendingProject;
use model::project::response::GetProjectsResponse;
use model::response::{GenericErrorResponse, GenericResponse, TypedSuccessResponse};
-use model::user::UserContext;
use models_bulk_upload::ProjectDocumentStatus;
type PendingProjectsResponse = TypedSuccessResponse<Vec<PendingProject>>;
@@ -23,27 +23,25 @@ type PendingProjectsResponse = TypedSuccessResponse<Vec<PendingProject>>;
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_projects_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
tracing::trace!("get_projects_handler");
- let projects = match macro_db_client::projects::get_projects(
- ctx.db.clone(),
- &user_context.user_id,
- )
- .await
- {
- Ok(projects) => projects,
- Err(e) => {
- tracing::error!(error=?e, "error getting projects");
- return GenericResponse::builder()
- .message("unable to get projects")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
- };
+ let projects =
+ match macro_db_client::projects::get_projects(ctx.db.clone(), user.macro_user_id.as_ref())
+ .await
+ {
+ Ok(projects) => projects,
+ Err(e) => {
+ tracing::error!(error=?e, "error getting projects");
+ return GenericResponse::builder()
+ .message("unable to get projects")
+ .is_error(true)
+ .send(StatusCode::INTERNAL_SERVER_ERROR);
+ }
+ };
GenericResponse::builder()
.data(&projects)
@@ -61,15 +59,15 @@ pub async fn get_projects_handler(
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_pending_projects_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
tracing::trace!("get_pending_projects_handler");
let projects = match macro_db_client::projects::get_pending_root_projects(
ctx.db.clone(),
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
)
.await
{
diff --git a/services/document_storage_service/src/api/projects/mod.rs b/services/document_storage_service/src/api/projects/mod.rs
index 76b48359bb..1ee5dfd133 100644
--- a/services/document_storage_service/src/api/projects/mod.rs
+++ b/services/document_storage_service/src/api/projects/mod.rs
@@ -1,10 +1,9 @@
-use super::{context::ApiContext, middleware};
+use super::context::ApiContext;
use axum::{
Router,
routing::{delete, get, patch, post, put},
};
use macro_middleware::cloud_storage::project::ensure_project_exists;
-use tower::ServiceBuilder;
pub(in crate::api) mod create_project;
pub(in crate::api) mod delete_project;
@@ -20,18 +19,8 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
let ensure_project_exists_middleware =
axum::middleware::from_fn_with_state(state.clone(), ensure_project_exists::handler);
Router::new()
- .route(
- "/",
- get(get_projects::get_projects_handler).layer(ServiceBuilder::new().layer(
- axum::middleware::from_fn(macro_middleware::auth::ensure_user_exists::handler),
- )),
- )
- .route(
- "/pending",
- get(get_projects::get_pending_projects_handler).layer(ServiceBuilder::new().layer(
- axum::middleware::from_fn(macro_middleware::auth::ensure_user_exists::handler),
- )),
- )
+ .route("/", get(get_projects::get_projects_handler))
+ .route("/pending", get(get_projects::get_pending_projects_handler))
.route(
"/{id}/permissions",
get(project_permission::get_project_permissions_handler)
@@ -47,44 +36,11 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {
get(get_project::get_project_content_handler)
.layer(ensure_project_exists_middleware.clone()),
)
- .route(
- "/",
- post(create_project::create_project_handler).layer(ServiceBuilder::new().layer(
- axum::middleware::from_fn(macro_middleware::auth::ensure_user_exists::handler),
- )),
- )
- .route(
- "/upload",
- post(upload_folder::upload_folder_handler).layer(
- ServiceBuilder::new()
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
- .layer(axum::middleware::from_fn_with_state(
- state.clone(),
- macro_middleware::user_permissions::attach_user_permissions::handler,
- ))
- .layer(axum::middleware::from_fn_with_state(
- state.clone(),
- middleware::check_user_document_count::handler_upload_folder,
- )),
- ),
- )
+ .route("/", post(create_project::create_project_handler))
+ .route("/upload", post(upload_folder::upload_folder_handler))
.route(
"/upload_extract",
- post(upload_folder::upload_extract_folder_handler).layer(
- ServiceBuilder::new()
- .layer(axum::middleware::from_fn(
- macro_middleware::auth::ensure_user_exists::handler,
- ))
- .layer(axum::middleware::from_fn_with_state(
- state,
- macro_middleware::user_permissions::attach_user_permissions::handler,
- )), // TODO: get item count from front end and/or handle during the extract step
- // .layer(axum::middleware::from_fn(
- // middleware::check_user_document_count::handler_upload_folder,
- // )),
- ),
+ post(upload_folder::upload_extract_folder_handler),
)
.route(
"/{id}",
diff --git a/services/document_storage_service/src/api/projects/project_permission.rs b/services/document_storage_service/src/api/projects/project_permission.rs
index 8698d10513..7a93cf0309 100644
--- a/services/document_storage_service/src/api/projects/project_permission.rs
+++ b/services/document_storage_service/src/api/projects/project_permission.rs
@@ -1,18 +1,16 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::extract::State;
use axum::response::Response;
use axum::{
- Extension,
extract::Path,
http::StatusCode,
response::{IntoResponse, Json},
};
use entity_access::domain::ports::EntityAccessService as EntityAccessServiceTrait;
use entity_access::inbound::axum_extractors::ProjectAccessLevelExtractor;
-use macro_user_id::user_id::MacroUserIdStr;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::GenericErrorResponse;
-use model::user::UserContext;
use model_entity::EntityType;
use models_permissions::share_permission::SharePermissionV2;
use models_permissions::share_permission::access_level::{AccessLevel, OwnerAccessLevel};
@@ -38,11 +36,15 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, id, _access), fields(user_id=?user_context.user_id, project_id=?id))]
+#[tracing::instrument(skip(ctx, user, id, _access), fields(user_id=?user.macro_user_id, project_id=?id))]
pub async fn get_project_permissions_handler(
State(ctx): State<ApiContext>,
- _access: ProjectAccessLevelExtractor<OwnerAccessLevel, EntityAccessService>,
- user_context: Extension<UserContext>,
+ _access: ProjectAccessLevelExtractor<
+ OwnerAccessLevel,
+ EntityAccessService,
+ AuthorizationService,
+ >,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
) -> Result<Response, Response> {
get_project_permission_v2(&ctx.db, &id).await
@@ -87,30 +89,15 @@ async fn get_project_permission_v2(
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn get_project_access_level_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
) -> impl IntoResponse {
- let user_id = match MacroUserIdStr::parse_from_str(&user_context.user_id) {
- Ok(user_id) => user_id,
- Err(e) => {
- tracing::error!(error=?e, "failed to parse user id");
- return (
- StatusCode::INTERNAL_SERVER_ERROR,
- Json(GenericErrorResponse {
- error: true,
- message: "failed to get user access level".to_string(),
- }),
- )
- .into_response();
- }
- };
-
let user_access_level: Option<AccessLevel> = match ctx
.entity_access_service
- .get_access_level(Some(&user_id), &id, EntityType::Project)
+ .get_access_level(Some(&user.macro_user_id), &id, EntityType::Project)
.await
{
Ok(user_access_level) => user_access_level,
diff --git a/services/document_storage_service/src/api/projects/revert_delete_project.rs b/services/document_storage_service/src/api/projects/revert_delete_project.rs
index a9e2912096..49a6ad0b0e 100644
--- a/services/document_storage_service/src/api/projects/revert_delete_project.rs
+++ b/services/document_storage_service/src/api/projects/revert_delete_project.rs
@@ -1,13 +1,13 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
use axum::extract::State;
use axum::{Extension, extract::Path, http::StatusCode, response::IntoResponse};
#[allow(unused_imports)]
use futures::stream::TryStreamExt;
+use macro_authorization::MacroAuthorizationExtractor;
use model::project::BasicProject;
use model::response::{
GenericErrorResponse, GenericResponse, GenericSuccessResponse, SuccessResponse,
};
-use model::user::UserContext;
use sqs_client::search::{SearchQueueMessage, project::UpsertProject};
#[derive(serde::Deserialize)]
@@ -31,10 +31,10 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, project_context, id), fields(user_id=?user_context.user_id, project_id=?id))]
+#[tracing::instrument(skip(ctx, user, project_context, id), fields(user_id=?user.macro_user_id, project_id=?id))]
pub async fn handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { id }): Path<Params>,
project_context: Extension<BasicProject>,
) -> impl IntoResponse {
diff --git a/services/document_storage_service/src/api/projects/upload_folder.rs b/services/document_storage_service/src/api/projects/upload_folder.rs
index 973ecaebf7..e6be059488 100644
--- a/services/document_storage_service/src/api/projects/upload_folder.rs
+++ b/services/document_storage_service/src/api/projects/upload_folder.rs
@@ -1,5 +1,5 @@
use crate::{
- api::context::{ApiContext, InternalFlag},
+ api::context::{ApiContext, AuthorizationService, InternalFlag},
service::{self},
};
use anyhow::Context;
@@ -9,6 +9,7 @@ use axum::{
http::StatusCode,
response::IntoResponse,
};
+use macro_authorization::MacroAuthorizationExtractor;
use macro_user_id::user_id::MacroUserIdStr;
use model::{
document::{ContentType, DocumentMetadata, FileType},
@@ -17,7 +18,6 @@ use model::{
UploadFolderResponseData, UploadFolderWithIdsResponse,
},
response::{GenericErrorResponse, GenericResponse, PresignedUrl, TypedSuccessResponse},
- user::{UserContext, axum_extractor::MacroUserExtractor},
};
use models_bulk_upload::{
MarkProjectUploadedRequest, MarkProjectUploadedResponse, S3ObjectInfo,
@@ -47,13 +47,13 @@ type UploadFolderResponse = TypedSuccessResponse<UploadFolderResponseData>;
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, req), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, req), fields(user_id=?user.macro_user_id))]
pub async fn upload_extract_folder_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
extract::Json(req): extract::Json<UploadExtractFolderRequest>,
) -> impl IntoResponse {
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
let name = req.name.as_deref();
// use local request id for local development
@@ -121,7 +121,7 @@ pub async fn upload_extract_folder_handler(
#[tracing::instrument(skip(ctx, user_context, req), fields(user_id=%user_context.macro_user_id))]
pub async fn upload_folder_handler(
State(ctx): State<ApiContext>,
- user_context: MacroUserExtractor,
+ user_context: MacroAuthorizationExtractor<AuthorizationService>,
internal_context: Option<Extension<InternalFlag>>,
extract::Json(req): extract::Json<UploadFolderRequest>,
) -> impl IntoResponse {
@@ -372,13 +372,13 @@ async fn build_documents(
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context))]
+#[tracing::instrument(skip(ctx, user))]
pub async fn mark_uploaded_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
extract::Json(req): extract::Json<MarkProjectUploadedRequest>,
) -> impl IntoResponse {
- let user_id = user_context.user_id.as_str();
+ let user_id = user.macro_user_id.as_ref();
let root_project_id = req.project_id;
match macro_db_client::projects::upload_folder::mark_projects_uploaded(
diff --git a/services/document_storage_service/src/api/recents/recently_deleted.rs b/services/document_storage_service/src/api/recents/recently_deleted.rs
index acd6add6f9..a015f10a2f 100644
--- a/services/document_storage_service/src/api/recents/recently_deleted.rs
+++ b/services/document_storage_service/src/api/recents/recently_deleted.rs
@@ -1,8 +1,9 @@
+use crate::api::context::AuthorizationService;
use axum::extract::State;
-use axum::{Extension, http::StatusCode, response::IntoResponse};
+use axum::{http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
use model::item::Item;
use model::response::{GenericErrorResponse, GenericResponse, TypedSuccessResponse};
-use model::user::UserContext;
use sqlx::PgPool;
use utoipa::ToSchema;
@@ -27,26 +28,28 @@ pub type RecentlyDeletedResponse = TypedSuccessResponse<RecentlyDeletedResponseD
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(db, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(db, user), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(db): State<PgPool>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> impl IntoResponse {
tracing::info!("recently_deleted");
- let items =
- match macro_db_client::recents::deleted::get_recently_deleted(&db, &user_context.user_id)
- .await
- {
- Ok(result) => result,
- Err(e) => {
- tracing::error!(error=?e, "error getting recently deleted items");
- return GenericResponse::builder()
- .message("error getting recently deleted items")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
- };
+ let items = match macro_db_client::recents::deleted::get_recently_deleted(
+ &db,
+ user.macro_user_id.as_ref(),
+ )
+ .await
+ {
+ Ok(result) => result,
+ Err(e) => {
+ tracing::error!(error=?e, "error getting recently deleted items");
+ return GenericResponse::builder()
+ .message("error getting recently deleted items")
+ .is_error(true)
+ .send(StatusCode::INTERNAL_SERVER_ERROR);
+ }
+ };
let data = RecentlyDeletedResponseData { items };
diff --git a/services/document_storage_service/src/api/saved_views.rs b/services/document_storage_service/src/api/saved_views.rs
index 881bbafffa..d8c6ada854 100644
--- a/services/document_storage_service/src/api/saved_views.rs
+++ b/services/document_storage_service/src/api/saved_views.rs
@@ -4,7 +4,8 @@ use axum::http::StatusCode;
use axum::http::request::Parts;
use axum::response::{IntoResponse, Response};
use axum::routing::{delete, patch, post};
-use axum::{Extension, Router, routing::get};
+use axum::{Router, routing::get};
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationState};
use model::response::ErrorResponse;
use model::user::UserContext;
use saved_views::{ExcludedDefaultViewStorage, PgViewStorage, ViewStorage};
@@ -18,6 +19,7 @@ use utoipa::ToSchema;
use uuid::Uuid;
use crate::api::ApiContext;
+use crate::api::context::AuthorizationService;
pub fn router() -> Router<ApiContext> {
Router::new()
@@ -118,21 +120,20 @@ struct SavedViewOwner(pub UserContext);
impl<S> FromRequestParts<S> for SavedViewOwner
where
- S: Send + Sync,
+ S: Send + Sync + 'static,
PgPool: FromRef<S>,
+ MacroAuthorizationState<AuthorizationService>: FromRef<S>,
{
type Rejection = SavedViewErr;
- //HACK: to be replaced once @seanaye's extractor pr is merged
- //until then, we are left with using these extension extractors
#[tracing::instrument(skip(parts, state), err)]
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
let db = PgPool::from_ref(state);
- let user_context = Extension::<UserContext>::from_request_parts(parts, state)
- .await
- .map(|Extension(ctx)| ctx)
- .map_err(|_| SavedViewErr::BadRequest("Missing user context"))?;
+ let user =
+ MacroAuthorizationExtractor::<AuthorizationService>::from_request_parts(parts, state)
+ .await
+ .map_err(|_| SavedViewErr::Unauthorized)?;
let saved_view_id = Path::<SavedViewParams>::from_request_parts(parts, state)
.await
@@ -142,11 +143,11 @@ where
authorize_view_access(
&PgViewStorage::new(db),
saved_view_id,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
)
.await?;
- Ok(SavedViewOwner(user_context))
+ Ok(SavedViewOwner(user.user_context))
}
}
@@ -160,22 +161,22 @@ where
(status = 500, body=ErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id), err)]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id), err)]
async fn get_views_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
) -> Result<(StatusCode, Json<ViewsResponse>), SavedViewErr> {
let pg_view_storage = PgViewStorage::new(ctx.db.clone());
let (views, excluded_default_views) = try_join!(
async {
pg_view_storage
- .get_views_for_user(&user_context.user_id)
+ .get_views_for_user(user.macro_user_id.as_ref())
.await
},
async {
pg_view_storage
- .get_excluded_default_views_for_user(&user_context.user_id)
+ .get_excluded_default_views_for_user(user.macro_user_id.as_ref())
.await
}
)?;
@@ -201,13 +202,13 @@ async fn get_views_handler(
)]
async fn create_view_handler(
ctx: State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Json(create_view_request): Json<CreateViewRequest>,
) -> Result<(StatusCode, Json<View>), SavedViewErr> {
let pg_view_storage = PgViewStorage::new(ctx.db.clone());
let new_view = View::new(
- user_context.user_id.clone(),
+ user.macro_user_id.to_string(),
create_view_request.name,
create_view_request.config,
);
@@ -285,10 +286,10 @@ async fn patch_view_handler(
(status = 500, body=ErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx), fields(user_id=?user_context.user_id), err)]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id), err)]
pub async fn exclude_default_view_handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Json(ExcludeDefaultViewRequest {
default_view_id: id,
}): Json<ExcludeDefaultViewRequest>,
@@ -297,7 +298,7 @@ pub async fn exclude_default_view_handler(
pg_view_storage
.create_excluded_default_view(ExcludedDefaultView::new(
- user_context.user_id.clone(),
+ user.macro_user_id.to_string(),
id.to_string(),
))
.await?;
diff --git a/services/document_storage_service/src/api/threads/edit_thread.rs b/services/document_storage_service/src/api/threads/edit_thread.rs
index 84da5b8dc1..003bfbca99 100644
--- a/services/document_storage_service/src/api/threads/edit_thread.rs
+++ b/services/document_storage_service/src/api/threads/edit_thread.rs
@@ -1,5 +1,5 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::extract::State;
use axum::http::StatusCode;
use axum::response::{IntoResponse, Response};
@@ -7,12 +7,12 @@ use axum::{Extension, Json, extract};
use entity_access::domain::models::EntityPermission;
use entity_access::inbound::axum_extractors::ProjectBodyAccessLevelExtractor;
use entity_access::inbound::axum_extractors::ThreadAccessLevelExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use macro_db_client::share_permission::edit::edit_thread_permission;
use model::response::{
ErrorResponse, GenericErrorResponse, GenericSuccessResponse, SuccessResponse,
};
use model::thread::EmailThreadPermission;
-use model::user::UserContext;
use models_permissions::share_permission::access_level::{
AccessLevel, EditAccessLevel, OwnerAccessLevel,
};
@@ -48,11 +48,11 @@ pub struct PatchThreadRequestV2 {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, project, thread_access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, project, thread_access), fields(user_id=?user.macro_user_id))]
pub async fn edit_thread_handler(
thread_access: ThreadAccessLevelExtractor<OwnerAccessLevel, EntityAccessService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
thread_context: Extension<EmailThreadPermission>,
extract::Path(ThreadParams { thread_id }): extract::Path<ThreadParams>,
project: ProjectBodyAccessLevelExtractor<
diff --git a/services/document_storage_service/src/api/threads/get_thread_access_level.rs b/services/document_storage_service/src/api/threads/get_thread_access_level.rs
index bd0775019e..16c5ae3487 100644
--- a/services/document_storage_service/src/api/threads/get_thread_access_level.rs
+++ b/services/document_storage_service/src/api/threads/get_thread_access_level.rs
@@ -1,13 +1,12 @@
-use crate::api::context::ApiContext;
+use crate::api::context::{ApiContext, AuthorizationService};
+use axum::Json;
use axum::extract::{Path, State};
use axum::http::StatusCode;
use axum::response::IntoResponse;
-use axum::{Extension, Json};
use entity_access::domain::ports::EntityAccessService;
-use macro_user_id::user_id::MacroUserIdStr;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::GenericResponse;
use model::thread::response::GetThreadUserAccessLevelResponse;
-use model::user::UserContext;
use model_entity::EntityType;
use models_permissions::share_permission::access_level::AccessLevel;
@@ -15,26 +14,19 @@ use models_permissions::share_permission::access_level::AccessLevel;
pub struct Params {
pub thread_id: String,
}
-#[tracing::instrument(skip(ctx, user_context), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user), fields(user_id=?user.macro_user_id))]
pub async fn handler(
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { thread_id }): Path<Params>,
) -> impl IntoResponse {
- let user_id = match MacroUserIdStr::parse_from_str(&user_context.user_id) {
- Ok(user_id) => user_id,
- Err(e) => {
- tracing::error!(error=?e, "failed to parse user id");
- return GenericResponse::builder()
- .message("failed to get user access level")
- .is_error(true)
- .send(StatusCode::INTERNAL_SERVER_ERROR);
- }
- };
-
let user_access_level: Option<AccessLevel> = match ctx
.entity_access_service
- .get_access_level(Some(&user_id), &thread_id, EntityType::EmailThread)
+ .get_access_level(
+ Some(&user.macro_user_id),
+ &thread_id,
+ EntityType::EmailThread,
+ )
.await
{
Ok(user_access_level) => user_access_level,
diff --git a/services/document_storage_service/src/api/user/populate_items.rs b/services/document_storage_service/src/api/user/populate_items.rs
index f684b60f2c..0995a0dcb9 100644
--- a/services/document_storage_service/src/api/user/populate_items.rs
+++ b/services/document_storage_service/src/api/user/populate_items.rs
@@ -1,8 +1,7 @@
-use axum::{Extension, http::StatusCode, response::IntoResponse};
-use model::{
- response::{GenericErrorResponse, GenericResponse, GenericSuccessResponse},
- user::UserContext,
-};
+use crate::api::context::AuthorizationService;
+use axum::{http::StatusCode, response::IntoResponse};
+use macro_authorization::MacroAuthorizationExtractor;
+use model::response::{GenericErrorResponse, GenericResponse, GenericSuccessResponse};
/// Populates the users items
#[utoipa::path(
@@ -19,8 +18,10 @@ use model::{
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(user_context), fields(user_id=?user_context.user_id))]
-pub async fn populate_items_handler(user_context: Extension<UserContext>) -> impl IntoResponse {
+#[tracing::instrument(skip(user), fields(user_id=?user.macro_user_id))]
+pub async fn populate_items_handler(
+ user: MacroAuthorizationExtractor<AuthorizationService>,
+) -> impl IntoResponse {
let response_data = GenericSuccessResponse { success: true };
GenericResponse::builder()
diff --git a/services/document_storage_service/src/api/user_document_view_location/delete_user_document_view_location.rs b/services/document_storage_service/src/api/user_document_view_location/delete_user_document_view_location.rs
index c84056adb5..6e5d1819c1 100644
--- a/services/document_storage_service/src/api/user_document_view_location/delete_user_document_view_location.rs
+++ b/services/document_storage_service/src/api/user_document_view_location/delete_user_document_view_location.rs
@@ -1,14 +1,13 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use axum::{
- Extension,
extract::{Path, State},
http::StatusCode,
response::{IntoResponse, Json},
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{EmptyResponse, GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::ViewAccessLevel;
#[derive(serde::Deserialize)]
@@ -29,16 +28,16 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, _document), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, _document), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _document: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _document: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
match macro_db_client::user_document_view_location::delete::delete_user_document_view_location(
&ctx.db,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
&document_id,
)
.await
diff --git a/services/document_storage_service/src/api/user_document_view_location/get_user_document_view_location.rs b/services/document_storage_service/src/api/user_document_view_location/get_user_document_view_location.rs
index ccaae974f6..9c5c8bd9a4 100644
--- a/services/document_storage_service/src/api/user_document_view_location/get_user_document_view_location.rs
+++ b/services/document_storage_service/src/api/user_document_view_location/get_user_document_view_location.rs
@@ -1,15 +1,14 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::response::documents::user_document_view_location::UserDocumentViewLocationResponse;
use axum::{
- Extension,
extract::{Path, State},
http::StatusCode,
response::{IntoResponse, Json},
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::ViewAccessLevel;
use serde::Deserialize;
@@ -33,16 +32,16 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, _access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { document_id }): Path<Params>,
) -> impl IntoResponse {
match macro_db_client::user_document_view_location::get::get_user_document_view_location(
&ctx.db,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
&document_id,
)
.await
diff --git a/services/document_storage_service/src/api/user_document_view_location/upsert_user_document_view_location.rs b/services/document_storage_service/src/api/user_document_view_location/upsert_user_document_view_location.rs
index 9c7c02eafb..e420a11f8b 100644
--- a/services/document_storage_service/src/api/user_document_view_location/upsert_user_document_view_location.rs
+++ b/services/document_storage_service/src/api/user_document_view_location/upsert_user_document_view_location.rs
@@ -1,15 +1,14 @@
use crate::api::context::ApiContext;
-use crate::api::context::EntityAccessService;
+use crate::api::context::{AuthorizationService, EntityAccessService};
use crate::model::request::documents::user_document_view_location::UpsertUserDocumentViewLocationRequest;
-use axum::extract::{Path, State};
use axum::{
- Extension, extract,
+ extract::{self, Path, State},
http::StatusCode,
response::{IntoResponse, Json},
};
use entity_access::inbound::axum_extractors::DocumentAccessExtractor;
+use macro_authorization::MacroAuthorizationExtractor;
use model::response::{EmptyResponse, GenericErrorResponse, GenericResponse};
-use model::user::UserContext;
use models_permissions::share_permission::access_level::ViewAccessLevel;
#[derive(serde::Deserialize)]
@@ -31,18 +30,18 @@ pub struct Params {
(status = 500, body=GenericErrorResponse),
)
)]
-#[tracing::instrument(skip(ctx, user_context, req, _access), fields(user_id=?user_context.user_id))]
+#[tracing::instrument(skip(ctx, user, req, _access), fields(user_id=?user.macro_user_id))]
pub async fn handler(
- _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService>,
+ _access: DocumentAccessExtractor<ViewAccessLevel, EntityAccessService, AuthorizationService>,
State(ctx): State<ApiContext>,
- user_context: Extension<UserContext>,
+ user: MacroAuthorizationExtractor<AuthorizationService>,
Path(Params { document_id }): Path<Params>,
extract::Json(req): extract::Json<UpsertUserDocumentViewLocationRequest>,
) -> impl IntoResponse {
if let Err(e) =
macro_db_client::user_document_view_location::upsert::upsert_user_document_view_location(
&ctx.db,
- &user_context.user_id,
+ user.macro_user_id.as_ref(),
&document_id,
&req.location,
)
diff --git a/services/document_storage_service/src/main.rs b/services/document_storage_service/src/main.rs
index 067a4091d9..edf7725630 100644
--- a/services/document_storage_service/src/main.rs
+++ b/services/document_storage_service/src/main.rs
@@ -1,6 +1,11 @@
#![recursion_limit = "256"]
use crate::{
- api::context::{ApiContext, DocumentStorageServiceAuthKey, TaskPropertiesAdapter},
+ api::{
+ MACRO_INTERNAL_USER_ID,
+ context::{
+ ApiContext, AuthorizationService, DocumentStorageServiceAuthKey, TaskPropertiesAdapter,
+ },
+ },
config::{
CalEventTypeContentNamesKey, CalWebhookSecretKey, MetaAccessToken, MetaPixelId,
MetaTestEventCode,
@@ -72,6 +77,7 @@ use github::outbound::github_sync_client::GithubSyncClientImpl;
use github::outbound::pg_github_sync_repo::PgGithubSyncRepo;
use lexical_client::LexicalClient;
use macro_auth::middleware::decode_jwt::JwtValidationArgs;
+use macro_authorization::{InternalAuthConfig, MacroAuthJwtValidator, MacroAuthorizationState};
use macro_entrypoint::MacroEntrypoint;
use macro_env_var::maybe_env_vars;
use macro_event_broker::{KafkaEventPublisher, MacroEventBrokerService};
@@ -241,6 +247,13 @@ async fn main() -> anyhow::Result<()> {
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.clone()),
+ InternalAuthConfig {
+ api_key: dss_auth_key.as_ref().to_string(),
+ default_user_id: Some(MACRO_INTERNAL_USER_ID.to_string()),
+ },
+ )));
// Initialize OpenSearch client
let opensearch_client = OpensearchClient::new(
@@ -831,6 +844,7 @@ async fn main() -> anyhow::Result<()> {
system_properties_service: system_properties_service.clone(),
properties_service: properties_service.clone(),
opensearch_client: Arc::new(opensearch_client),
+ authorization_state: authorization_state.clone(),
jwt_validation_args,
dss_auth_key,
// Shared frecency storage and legacy channel list routes.
@@ -840,6 +854,7 @@ async fn main() -> anyhow::Result<()> {
documents_state: DocumentRouterState {
service: document_service.clone(),
access_service: entity_access_service.clone(),
+ authorization_state: authorization_state.clone(),
pool: db.clone(),
task_dedup_service,
lexical_client: lexical_client.clone(),