diff --git a/src/handlers/http/users/filters.rs b/src/handlers/http/users/filters.rs index 378e80df3..1b7a65f9a 100644 --- a/src/handlers/http/users/filters.rs +++ b/src/handlers/http/users/filters.rs @@ -21,7 +21,7 @@ use crate::{ parseable::PARSEABLE, storage::{object_storage::filter_path, ObjectStorageError}, users::filters::{Filter, CURRENT_FILTER_VERSION, FILTERS}, - utils::{actix::extract_session_key_from_req, get_hash, get_user_from_request}, + utils::{get_hash, get_user_from_request}, }; use actix_web::{ http::header::ContentType, @@ -33,10 +33,8 @@ use chrono::Utc; use http::StatusCode; use serde_json::Error as SerdeError; -pub async fn list(req: HttpRequest) -> Result { - let key = - extract_session_key_from_req(&req).map_err(|e| FiltersError::Custom(e.to_string()))?; - let filters = FILTERS.list_filters(&key).await; +pub async fn list() -> Result { + let filters = FILTERS.list_filters().await; Ok((web::Json(filters), StatusCode::OK)) } diff --git a/src/prism/home/mod.rs b/src/prism/home/mod.rs index 39bd5c4e3..1f86bf515 100644 --- a/src/prism/home/mod.rs +++ b/src/prism/home/mod.rs @@ -104,7 +104,7 @@ pub async fn generate_home_response(key: &SessionKey) -> Result Result, Prism Ok(dashboard_titles) } -async fn get_filter_titles(key: &SessionKey) -> Result, PrismHomeError> { +async fn get_filter_titles() -> Result, PrismHomeError> { let filter_titles = FILTERS - .list_filters(key) + .list_filters() .await .iter() .map(|filter| TitleAndId { diff --git a/src/users/filters.rs b/src/users/filters.rs index 59a06dff0..324e4e11a 100644 --- a/src/users/filters.rs +++ b/src/users/filters.rs @@ -23,8 +23,8 @@ use tokio::sync::RwLock; use super::TimeFilter; use crate::{ - alerts::alerts_utils::user_auth_for_query, migration::to_bytes, parseable::PARSEABLE, - rbac::map::SessionKey, storage::object_storage::filter_path, utils::get_hash, + migration::to_bytes, parseable::PARSEABLE, storage::object_storage::filter_path, + utils::get_hash, }; pub static FILTERS: Lazy = Lazy::new(Filters::default); @@ -152,23 +152,8 @@ impl Filters { .cloned() } - pub async fn list_filters(&self, key: &SessionKey) -> Vec { - let read = self.0.read().await; - - let mut filters = Vec::new(); - - for f in read.iter() { - let query = if let Some(q) = &f.query.filter_query { - q - } else { - continue; - }; - - if (user_auth_for_query(key, query).await).is_ok() { - filters.push(f.clone()) - } - } - filters + pub async fn list_filters(&self) -> Vec { + self.0.read().await.iter().cloned().collect() } }