filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix live tracing in community and OSS versions

Browse Source
This commit is contained in:
Maurus Decimus
2026-05-01 09:19:25 +02:00
parent 6757dd241f
commit 8b7f7b091a
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
crates/http/src/api/mod.rs
View File

@@ -252,38 +252,45 @@ impl ManagementApi for Server {
) -> trc::Result<AccessToken> {
let params = UrlParams::new(req.uri().query());
if let Some(token) = params.get("token") {
// SPDX-SnippetBegin
// SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <hello@stalw.art>
// SPDX-License-Identifier: LicenseRef-SEL
#[cfg(feature = "enterprise")]
if self.core.is_enterprise_edition() {
let path = req.uri().path();
let (grant_type, permissions) = if path.starts_with("/api/live/tracing") {
(GrantType::LiveTracing, Permission::LiveTracing)
} else if path.starts_with("/api/live/metrics") {
(GrantType::LiveMetrics, Permission::LiveMetrics)
} else if path.starts_with("/api/live/delivery") {
(GrantType::LiveDelivery, Permission::LiveDeliveryTest)
} else {
return Err(trc::ResourceEvent::NotFound.into_err());
};
let path = req.uri().path();
let grant = if path.starts_with("/api/live/delivery") {
Some((GrantType::LiveDelivery, Permission::LiveDeliveryTest))
} else {
// SPDX-SnippetBegin
// SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <hello@stalw.art>
// SPDX-License-Identifier: LicenseRef-SEL
#[cfg(feature = "enterprise")]
{
if self.core.is_enterprise_edition() {
if path.starts_with("/api/live/tracing") {
Some((GrantType::LiveTracing, Permission::LiveTracing))
} else if path.starts_with("/api/live/metrics") {
Some((GrantType::LiveMetrics, Permission::LiveMetrics))
} else {
None
}
} else {
None
}
}
// SPDX-SnippetEnd
#[cfg(not(feature = "enterprise"))]
{
None
}
};
if let Some((grant_type, permission)) = grant {
self.validate_access_token(grant_type.into(), token)
.await
.map(|token_info| {
AccessToken::from_permissions(token_info.account_id, [permissions])
AccessToken::from_permissions(token_info.account_id, [permission])
})
} else {
self.authenticate_headers(req, session)
.await
.map(|(_, token)| token)
}
// SPDX-SnippetEnd
#[cfg(not(feature = "enterprise"))]
{
self.authenticate_headers(req, session)
.await
.map(|(_, token)| token)
}
} else {
self.authenticate_headers(req, session)
.await