Skip to content

fix: middleware for multi-tenant #1719

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
nikhilsinhaparseable merged 1 commit into from
Jul 9, 2026
+9 −5
Merged

fix: middleware for multi-tenant #1719

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/handlers/http/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ where
let tenant_id = req
.headers()
.get(TENANT_ID)
.or_else(|| req.headers().get("intra-cluster-tenant"))
.and_then(|v| v.to_str().ok())
.filter(|tenant| !tenant.eq(&DEFAULT_TENANT))
.map(String::from);

// an optional error to track the presence of CORRECT tenant header in case of ingestion
Expand All @@ -186,10 +188,12 @@ where
permissions,
&user.tenant,
);
req.headers_mut().insert(
HeaderName::from_static(TENANT_ID),
HeaderValue::from_str(tenant).unwrap(),
);
if PARSEABLE.options.is_multi_tenant() {
req.headers_mut().insert(
HeaderName::from_static(TENANT_ID),
HeaderValue::from_str(tenant).unwrap(),
);
}
req.extensions_mut().insert(session_key);
Some(session_id)
}
Expand Down Expand Up @@ -311,7 +315,7 @@ fn find_api_key_user(api_key_value: &str, tenant_id: &Option<String>) -> Option<
let tenant = if PARSEABLE.options.is_multi_tenant() {
tenant_id.as_deref()?
} else {
tenant_id.as_deref().unwrap_or(DEFAULT_TENANT)
DEFAULT_TENANT
};

let users_guard = users();
Expand Down
Loading