Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

asset check for metric

This commit is contained in:
dal 2025-03-11 16:51:08 -06:00
parent 8c43ca0403
commit 878e36bbeb
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
2 changed files with 86 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/libs/database/src/enums.rs
View File

@ -240,7 +240,9 @@ pub enum AssetType {
Thread, Thread,
Collection, Collection,
Chat, Chat,
#[serde(alias = "metric")]
MetricFile, MetricFile,
#[serde(alias = "dashboard")]
DashboardFile, DashboardFile,
} }

146
api/src/routes/rest/routes/assets/get_asset_access.rs
View File

@ -8,17 +8,17 @@ use std::sync::Arc;
use uuid::Uuid; use uuid::Uuid;
use axum::extract::Path; use axum::extract::Path;
use middleware::AuthenticatedUser;
use axum::http::StatusCode; use axum::http::StatusCode;
use middleware::AuthenticatedUser;
use crate::routes::rest::ApiResponse;
use crate::utils::user::user_info::get_user_organization_id;
use database::enums::{AssetPermissionRole, AssetType, UserOrganizationRole}; use database::enums::{AssetPermissionRole, AssetType, UserOrganizationRole};
use database::pool::{get_pg_pool, PgPool}; use database::pool::{get_pg_pool, PgPool};
use database::schema::{ use database::schema::{
asset_permissions, collections_to_assets, dashboards, teams_to_users, threads_deprecated, asset_permissions, collections_to_assets, dashboards, metric_files, teams_to_users,
threads_to_dashboards, users_to_organizations, threads_deprecated, threads_to_dashboards, users_to_organizations,
}; };
use crate::routes::rest::ApiResponse;
use crate::utils::user::user_info::get_user_organization_id;
pub async fn get_asset_access( pub async fn get_asset_access(
Path((asset_type, asset_id)): Path<(AssetType, uuid::Uuid)>, Path((asset_type, asset_id)): Path<(AssetType, uuid::Uuid)>,
@ -55,76 +55,98 @@ async fn get_asset_access_handler(
let (asset_info, user_permission) = match asset_type { let (asset_info, user_permission) = match asset_type {
AssetType::Collection => { AssetType::Collection => {
return Err(anyhow!( return Err(anyhow!(
"Public access is not supported for collections yet" "Public access is not supported for collections yet"
)) ))
} }
AssetType::Dashboard => { AssetType::Dashboard => {
let mut conn = pg_pool.get().await?; let mut conn = pg_pool.get().await?;
let dashboard_info = dashboards::table let dashboard_info = dashboards::table
.select(( .select((
dashboards::id, dashboards::id,
dashboards::publicly_accessible, dashboards::publicly_accessible,
dashboards::password_secret_id.is_not_null(), dashboards::password_secret_id.is_not_null(),
dashboards::public_expiry_date, dashboards::public_expiry_date,
)) ))
.filter(dashboards::id.eq(&asset_id)) .filter(dashboards::id.eq(&asset_id))
.filter(dashboards::deleted_at.is_null()) .filter(dashboards::deleted_at.is_null())
.first::<(Uuid, bool, bool, Option<DateTime<Utc>>)>(&mut conn) .first::<(Uuid, bool, bool, Option<DateTime<Utc>>)>(&mut conn)
.await?; .await?;
let user_permission = { let user_permission = {
let pg_pool = pg_pool.clone(); let pg_pool = pg_pool.clone();
let user_id = user.id.clone(); let user_id = user.id.clone();
let asset_id = asset_id.clone(); let asset_id = asset_id.clone();
tokio::spawn(async move { tokio::spawn(async move {
get_user_dashboard_permission(&pg_pool, &user_id, &asset_id).await get_user_dashboard_permission(&pg_pool, &user_id, &asset_id).await
}) })
}; };
let user_permission = user_permission let user_permission = user_permission
.await .await
.map_err(|_| anyhow!("Failed to join task"))? // Changed to discard error details .map_err(|_| anyhow!("Failed to join task"))? // Changed to discard error details
.unwrap_or(None); // Use None for both error and no permission cases .unwrap_or(None); // Use None for both error and no permission cases
(dashboard_info, user_permission) (dashboard_info, user_permission)
} }
AssetType::Thread => { AssetType::Thread => {
let mut conn = pg_pool.get().await?; let mut conn = pg_pool.get().await?;
let thread_info = threads_deprecated::table let thread_info = threads_deprecated::table
.select(( .select((
threads_deprecated::id, threads_deprecated::id,
threads_deprecated::publicly_accessible, threads_deprecated::publicly_accessible,
threads_deprecated::password_secret_id.is_not_null(), threads_deprecated::password_secret_id.is_not_null(),
threads_deprecated::public_expiry_date, threads_deprecated::public_expiry_date,
)) ))
.filter(threads_deprecated::id.eq(&asset_id)) .filter(threads_deprecated::id.eq(&asset_id))
.filter(threads_deprecated::deleted_at.is_null()) .filter(threads_deprecated::deleted_at.is_null())
.first::<(Uuid, bool, bool, Option<DateTime<Utc>>)>(&mut conn) .first::<(Uuid, bool, bool, Option<DateTime<Utc>>)>(&mut conn)
.await?; .await?;
let user_permission = { let user_permission = {
let pg_pool = pg_pool.clone(); let pg_pool = pg_pool.clone();
let user_id = user.id.clone(); let user_id = user.id.clone();
let asset_id = asset_id.clone(); let asset_id = asset_id.clone();
tokio::spawn(async move { tokio::spawn(async move {
get_user_thread_permission(&pg_pool, &user_id, &asset_id).await get_user_thread_permission(&pg_pool, &user_id, &asset_id).await
}) })
}; };
let user_permission = user_permission let user_permission = user_permission
.await .await
.map_err(|_| anyhow!("Failed to join task"))? // Changed to discard error details .map_err(|_| anyhow!("Failed to join task"))? // Changed to discard error details
.unwrap_or(None); // Use None for both error and no permission cases .unwrap_or(None); // Use None for both error and no permission cases
(thread_info, user_permission) (thread_info, user_permission)
} }
AssetType::MetricFile => {
let mut conn = pg_pool.get().await?;
let metric_info = metric_files::table
.select((
metric_files::id,
metric_files::publicly_accessible,
metric_files::public_expiry_date,
))
.filter(metric_files::id.eq(&asset_id))
.filter(metric_files::deleted_at.is_null())
.first::<(Uuid, bool, Option<DateTime<Utc>>)>(&mut conn)
.await?;
let metric_info = (
metric_info.0,
metric_info.1,
false,
metric_info.2,
);
(metric_info, Some(AssetPermissionRole::Owner))
}
_ => { _ => {
return Err(anyhow!("Public access is not supported for chats yet")); return Err(anyhow!("Public access is not supported for chats yet"));
} }
}; };
let (id, public, password_required, public_expiry_date) = asset_info; let (id, public, password_required, public_expiry_date) = asset_info;