GQL: Datasets: auth checks

kamu-data · Dec 27, 2024 · 7bb6857 · 7bb6857
1 parent e5bfda0
commit 7bb6857
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 86 deletions.
diff --git a/src/adapter/graphql/src/mutations/flows_mut/flows_mut_utils.rs b/src/adapter/graphql/src/mutations/flows_mut/flows_mut_utils.rs
@@ -49,12 +49,14 @@ pub(crate) async fn check_if_flow_belongs_to_dataset(
                 return Ok(Some(FlowInDatasetError::NotFound(FlowNotFound { flow_id })))
             }
         },
-        Err(e) => match e {
-            fs::GetFlowError::NotFound(_) => {
-                return Ok(Some(FlowInDatasetError::NotFound(FlowNotFound { flow_id })))
+        Err(e) => {
+            return match e {
+                fs::GetFlowError::NotFound(_) => {
+                    Ok(Some(FlowInDatasetError::NotFound(FlowNotFound { flow_id })))
+                }
+                fs::GetFlowError::Internal(e) => Err(GqlError::Internal(e)),
             }
-            fs::GetFlowError::Internal(e) => return Err(GqlError::Internal(e)),
-        },
+        }
     }
 
     Ok(None)

diff --git a/src/adapter/graphql/src/queries/access_tokens/access_token.rs b/src/adapter/graphql/src/queries/access_tokens/access_token.rs
@@ -42,7 +42,7 @@ impl ViewAccessToken {
         self.token.created_at
     }
 
-    /// Date of token revokation
+    /// Date of token revocation
     async fn revoked_at(&self) -> Option<DateTime<Utc>> {
         self.token.revoked_at
     }

diff --git a/src/adapter/graphql/src/queries/accounts/account.rs b/src/adapter/graphql/src/queries/accounts/account.rs
@@ -90,7 +90,10 @@ impl Account {
         alias: &odf::DatasetAlias,
     ) -> Result<Option<Self>, InternalError> {
         if alias.is_multi_tenant() {
-            Ok(Self::from_account_name(ctx, alias.account_name.as_ref().unwrap().clone()).await?)
+            // Safety: In multi-tenant, we have a name.
+            let account_name = alias.account_name.as_ref().unwrap().clone();
+
+            Ok(Self::from_account_name(ctx, account_name).await?)
         } else {
             let current_account_subject = from_catalog_n!(ctx, CurrentAccountSubject);
 

diff --git a/src/adapter/graphql/src/queries/accounts/account_flow_runs.rs b/src/adapter/graphql/src/queries/accounts/account_flow_runs.rs
@@ -54,8 +54,8 @@ impl AccountFlowRuns {
                 by_flow_status: filters.by_status.map(Into::into),
                 by_dataset_ids: filters
                     .by_dataset_ids
-                    .iter()
-                    .map(|dataset_id| dataset_id.clone().into())
+                    .into_iter()
+                    .map(|dataset_id| dataset_id.into())
                     .collect::<HashSet<_>>(),
                 by_initiator: match filters.by_initiator {
                     Some(initiator_filter) => match initiator_filter {

diff --git a/src/adapter/graphql/src/queries/admin/admin.rs b/src/adapter/graphql/src/queries/admin/admin.rs
@@ -10,6 +10,8 @@
 use crate::prelude::*;
 use crate::AdminGuard;
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 pub struct Admin;
 
 #[Object]
@@ -20,3 +22,5 @@ impl Admin {
         Ok("OK".to_string())
     }
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/adapter/graphql/src/queries/datasets/dataset_endpoints.rs b/src/adapter/graphql/src/queries/datasets/dataset_endpoints.rs
@@ -15,6 +15,8 @@ use opendatafabric as odf;
 use crate::prelude::*;
 use crate::queries::*;
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 pub struct DatasetEndpoints<'a> {
     owner: &'a Account,
     dataset_handle: odf::DatasetHandle,
@@ -48,7 +50,7 @@ impl<'a> DatasetEndpoints<'a> {
         self.dataset_handle.alias.dataset_name.as_str()
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn web_link(&self) -> Result<LinkProtocolDesc> {
         let url = format!(
             "{}{}/{}",
@@ -60,7 +62,7 @@ impl<'a> DatasetEndpoints<'a> {
         Ok(LinkProtocolDesc { url })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn cli(&self) -> Result<CliProtocolDesc> {
         let url = format!(
             "odf+{}{}",
@@ -78,7 +80,7 @@ impl<'a> DatasetEndpoints<'a> {
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn rest(&self) -> Result<RestProtocolDesc> {
         let dataset_base_url = format!(
             "{}{}",
@@ -101,14 +103,14 @@ impl<'a> DatasetEndpoints<'a> {
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn flightsql(&self) -> Result<FlightSqlDesc> {
         Ok(FlightSqlDesc {
             url: self.config.protocols.base_url_flightsql.to_string(),
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn jdbc(&self) -> Result<JdbcDesc> {
         let mut url = self.config.protocols.base_url_flightsql.clone();
 
@@ -119,28 +121,28 @@ impl<'a> DatasetEndpoints<'a> {
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn postgresql(&self) -> Result<PostgreSqlDesl> {
         Ok(PostgreSqlDesl {
             url: "- coming soon -".to_string(),
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn kafka(&self) -> Result<KafkaProtocolDesc> {
         Ok(KafkaProtocolDesc {
             url: "- coming soon -".to_string(),
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn websocket(&self) -> Result<WebSocketProtocolDesc> {
         Ok(WebSocketProtocolDesc {
             url: "- coming soon -".to_string(),
         })
     }
 
-    #[allow(clippy::unused_async)]
+    #[expect(clippy::unused_async)]
     async fn odata(&self) -> Result<OdataProtocolDesc> {
         let mut url = format!("{}odata", self.config.protocols.base_url_rest);
         // to respect both kinds of workspaces: single-tenant & multi-tenant
@@ -168,3 +170,5 @@ impl<'a> DatasetEndpoints<'a> {
         })
     }
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/adapter/graphql/src/queries/datasets/dataset_env_var.rs b/src/adapter/graphql/src/queries/datasets/dataset_env_var.rs
@@ -36,7 +36,7 @@ impl ViewDatasetEnvVar {
         self.env_var.key.clone()
     }
 
-    /// Non sercret value of dataset environment variable
+    /// Non secret value of dataset environment variable
     #[allow(clippy::unused_async)]
     async fn value(&self) -> Option<String> {
         self.env_var.get_non_secret_value()

diff --git a/src/adapter/graphql/src/queries/datasets/dataset_env_vars.rs b/src/adapter/graphql/src/queries/datasets/dataset_env_vars.rs
@@ -35,8 +35,6 @@ impl DatasetEnvVars {
         ctx: &Context<'_>,
         dataset_env_var_id: DatasetEnvVarID,
     ) -> Result<String> {
-        utils::check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let dataset_env_var_service = from_catalog_n!(ctx, dyn DatasetEnvVarService);
         let dataset_env_var = dataset_env_var_service
             .get_dataset_env_var_by_id(&dataset_env_var_id)
@@ -57,8 +55,6 @@ impl DatasetEnvVars {
         page: Option<usize>,
         per_page: Option<usize>,
     ) -> Result<ViewDatasetEnvVarConnection> {
-        utils::check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let dataset_env_var_service = from_catalog_n!(ctx, dyn DatasetEnvVarService);
 
         let page = page.unwrap_or(0);

diff --git a/src/adapter/graphql/src/queries/datasets/dataset_flow_configs.rs b/src/adapter/graphql/src/queries/datasets/dataset_flow_configs.rs
@@ -11,7 +11,6 @@ use kamu_flow_system::{FlowConfigurationService, FlowKeyDataset};
 use opendatafabric as odf;
 
 use crate::prelude::*;
-use crate::utils::check_dataset_read_access;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -32,8 +31,6 @@ impl DatasetFlowConfigs {
         ctx: &Context<'_>,
         dataset_flow_type: DatasetFlowType,
     ) -> Result<Option<FlowConfiguration>> {
-        check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let flow_config_service = from_catalog_n!(ctx, dyn FlowConfigurationService);
         let maybe_flow_config = flow_config_service
             .find_configuration(
@@ -48,8 +45,6 @@ impl DatasetFlowConfigs {
 
     /// Checks if all configs of this dataset are disabled
     async fn all_paused(&self, ctx: &Context<'_>) -> Result<bool> {
-        check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let flow_config_service = from_catalog_n!(ctx, dyn FlowConfigurationService);
         for dataset_flow_type in kamu_flow_system::DatasetFlowType::all() {
             let maybe_flow_config = flow_config_service

diff --git a/src/adapter/graphql/src/queries/datasets/dataset_flow_runs.rs b/src/adapter/graphql/src/queries/datasets/dataset_flow_runs.rs
@@ -35,8 +35,6 @@ impl DatasetFlowRuns {
     }
 
     async fn get_flow(&self, ctx: &Context<'_>, flow_id: FlowID) -> Result<GetFlowResult> {
-        utils::check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         if let Some(error) =
             check_if_flow_belongs_to_dataset(ctx, flow_id, &self.dataset_handle).await?
         {
@@ -64,8 +62,6 @@ impl DatasetFlowRuns {
         per_page: Option<usize>,
         filters: Option<DatasetFlowFilters>,
     ) -> Result<FlowConnection> {
-        utils::check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let flow_query_service = from_catalog_n!(ctx, dyn fs::FlowQueryService);
 
         let page = page.unwrap_or(0);
@@ -122,8 +118,6 @@ impl DatasetFlowRuns {
     }
 
     async fn list_flow_initiators(&self, ctx: &Context<'_>) -> Result<AccountConnection> {
-        utils::check_dataset_read_access(ctx, &self.dataset_handle).await?;
-
         let flow_query_service = from_catalog_n!(ctx, dyn fs::FlowQueryService);
 
         let flow_initiator_ids: Vec<_> = flow_query_service