Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions src/handlers/http/users/dashboards.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::{
metastore::MetastoreError,
storage::ObjectStorageError,
users::dashboards::{DASHBOARDS, Dashboard, Tile, validate_dashboard_id},
utils::{get_hash, get_user_from_request},
utils::{get_hash, get_user_from_request, is_admin},
};
use actix_web::{
HttpRequest, HttpResponse, Responder,
Expand Down Expand Up @@ -104,8 +104,10 @@ pub async fn update_dashboard(
) -> Result<impl Responder, DashboardError> {
let user_id = get_hash(&get_user_from_request(&req)?);
let dashboard_id = validate_dashboard_id(dashboard_id.into_inner())?;
let is_admin = is_admin(&req).map_err(|e| DashboardError::Custom(e.to_string()))?;

let mut existing_dashboard = DASHBOARDS
.get_dashboard_by_user(dashboard_id, &user_id)
.get_dashboard_by_user(dashboard_id, &user_id, is_admin)
.await
.ok_or(DashboardError::Metadata(
"Dashboard does not exist or user is not authorized",
Expand Down Expand Up @@ -189,9 +191,13 @@ pub async fn delete_dashboard(
dashboard_id: Path<String>,
) -> Result<HttpResponse, DashboardError> {
let user_id = get_hash(&get_user_from_request(&req)?);
let is_admin = is_admin(&req).map_err(|e| DashboardError::Custom(e.to_string()))?;

let dashboard_id = validate_dashboard_id(dashboard_id.into_inner())?;

DASHBOARDS.delete_dashboard(&user_id, dashboard_id).await?;
DASHBOARDS
.delete_dashboard(&user_id, dashboard_id, is_admin)
.await?;

Ok(HttpResponse::Ok().finish())
}
Expand All @@ -207,9 +213,10 @@ pub async fn add_tile(

let user_id = get_hash(&get_user_from_request(&req)?);
let dashboard_id = validate_dashboard_id(dashboard_id.into_inner())?;
let is_admin = is_admin(&req).map_err(|e| DashboardError::Custom(e.to_string()))?;

let mut dashboard = DASHBOARDS
.get_dashboard_by_user(dashboard_id, &user_id)
.get_dashboard_by_user(dashboard_id, &user_id, is_admin)
.await
.ok_or(DashboardError::Unauthorized)?;

Expand Down
20 changes: 15 additions & 5 deletions src/handlers/http/users/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::{
parseable::PARSEABLE,
storage::ObjectStorageError,
users::filters::{CURRENT_FILTER_VERSION, FILTERS, Filter},
utils::{actix::extract_session_key_from_req, get_hash, get_user_from_request},
utils::{actix::extract_session_key_from_req, get_hash, get_user_from_request, is_admin},
};
use actix_web::{
HttpRequest, HttpResponse, Responder,
Expand All @@ -46,8 +46,11 @@ pub async fn get(
) -> Result<impl Responder, FiltersError> {
let user_id = get_user_from_request(&req)?;
let filter_id = filter_id.into_inner();

if let Some(filter) = FILTERS.get_filter(&filter_id, &get_hash(&user_id)).await {
let is_admin = is_admin(&req).map_err(|e| FiltersError::Custom(e.to_string()))?;
if let Some(filter) = FILTERS
.get_filter(&filter_id, &get_hash(&user_id), is_admin)
.await
{
return Ok((web::Json(filter), StatusCode::OK));
}

Expand Down Expand Up @@ -81,7 +84,13 @@ pub async fn update(
let mut user_id = get_user_from_request(&req)?;
user_id = get_hash(&user_id);
let filter_id = filter_id.into_inner();
if FILTERS.get_filter(&filter_id, &user_id).await.is_none() {
let is_admin = is_admin(&req).map_err(|e| FiltersError::Custom(e.to_string()))?;

if FILTERS
.get_filter(&filter_id, &user_id, is_admin)
.await
.is_none()
{
return Err(FiltersError::Metadata(
"Filter does not exist or user is not authorized",
));
Expand All @@ -103,8 +112,9 @@ pub async fn delete(
let mut user_id = get_user_from_request(&req)?;
user_id = get_hash(&user_id);
let filter_id = filter_id.into_inner();
let is_admin = is_admin(&req).map_err(|e| FiltersError::Custom(e.to_string()))?;
let filter = FILTERS
.get_filter(&filter_id, &user_id)
.get_filter(&filter_id, &user_id, is_admin)
.await
.ok_or(FiltersError::Metadata(
"Filter does not exist or user is not authorized",
Expand Down
9 changes: 6 additions & 3 deletions src/users/dashboards.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,10 @@ impl Dashboards {
&self,
user_id: &str,
dashboard_id: Ulid,
is_admin: bool,
) -> Result<(), DashboardError> {
let obj = self
.ensure_dashboard_ownership(dashboard_id, user_id)
.ensure_dashboard_ownership(dashboard_id, user_id, is_admin)
.await?;

{
Expand Down Expand Up @@ -335,6 +336,7 @@ impl Dashboards {
&self,
dashboard_id: Ulid,
user_id: &str,
is_admin: bool,
) -> Option<Dashboard> {
self.0
.read()
Expand All @@ -344,7 +346,7 @@ impl Dashboards {
d.dashboard_id
.as_ref()
.is_some_and(|id| *id == dashboard_id)
&& d.author == Some(user_id.to_string())
&& (d.author == Some(user_id.to_string()) || is_admin)
})
.cloned()
}
Expand Down Expand Up @@ -409,8 +411,9 @@ impl Dashboards {
&self,
dashboard_id: Ulid,
user_id: &str,
is_admin: bool,
) -> Result<Dashboard, DashboardError> {
self.get_dashboard_by_user(dashboard_id, user_id)
self.get_dashboard_by_user(dashboard_id, user_id, is_admin)
.await
.ok_or_else(|| {
DashboardError::Metadata(
Expand Down
10 changes: 8 additions & 2 deletions src/users/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,19 @@ impl Filters {
s.retain(|f| f.filter_id != Some(filter_id.to_string()));
}

pub async fn get_filter(&self, filter_id: &str, user_id: &str) -> Option<Filter> {
pub async fn get_filter(
&self,
filter_id: &str,
user_id: &str,
is_admin: bool,
) -> Option<Filter> {
self.0
.read()
.await
.iter()
.find(|f| {
f.filter_id == Some(filter_id.to_string()) && f.user_id == Some(user_id.to_string())
f.filter_id == Some(filter_id.to_string())
&& (f.user_id == Some(user_id.to_string()) || is_admin)
})
.cloned()
}
Expand Down
19 changes: 19 additions & 0 deletions src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,22 @@ pub async fn user_auth_for_datasets(

Ok(())
}

pub fn is_admin(req: &HttpRequest) -> Result<bool, anyhow::Error> {
let session_key =
extract_session_key_from_req(req).map_err(|e| anyhow::Error::msg(e.to_string()))?;

let permissions = Users.get_permissions(&session_key);

// Check if user has admin permissions (Action::All on All resources)
for permission in permissions.iter() {
match permission {
Permission::Resource(Action::All, ParseableResourceType::All) => {
return Ok(true);
}
_ => continue,
}
}

Ok(false)
}
Loading