From 20541bcb5d9f576ab89673f8aee6dd5b49fe1a0d Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 6 Feb 2026 15:49:52 +0000 Subject: [PATCH] all sqlx --- backend/windmill-triggers/src/flow_ext.rs | 22 ------------------- backend/windmill-triggers/src/lib.rs | 2 -- .../src/native_triggers/handler.rs | 9 ++++---- backend/windmill-triggers/src/script_ext.rs | 22 ------------------- 4 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 backend/windmill-triggers/src/flow_ext.rs delete mode 100644 backend/windmill-triggers/src/script_ext.rs diff --git a/backend/windmill-triggers/src/flow_ext.rs b/backend/windmill-triggers/src/flow_ext.rs deleted file mode 100644 index 03a8e98c7b..0000000000 --- a/backend/windmill-triggers/src/flow_ext.rs +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Author: Windmill Labs, Inc - * Copyright: Windmill Labs, Inc 2024 - * This file and its contents are licensed under the AGPLv3 License. - * Please see the included NOTICE for copyright information and - * LICENSE-AGPL for a copy of the license. - */ - -use windmill_api_auth::ApiAuthed; -use windmill_common::{error::Result, DB}; - -pub async fn require_is_writer(authed: &ApiAuthed, path: &str, w_id: &str, db: DB) -> Result<()> { - windmill_api_auth::permissions::require_is_writer( - authed, - path, - w_id, - db, - "SELECT extra_perms FROM flow WHERE path = $1 AND workspace_id = $2", - "flow", - ) - .await -} diff --git a/backend/windmill-triggers/src/lib.rs b/backend/windmill-triggers/src/lib.rs index 2ad75a5d0c..d88a5150d7 100644 --- a/backend/windmill-triggers/src/lib.rs +++ b/backend/windmill-triggers/src/lib.rs @@ -12,7 +12,5 @@ pub mod native_triggers; pub mod args_ext; pub mod capture_ext; -pub mod flow_ext; pub mod jobs_ext; pub mod resource_ext; -pub mod script_ext; diff --git a/backend/windmill-triggers/src/native_triggers/handler.rs b/backend/windmill-triggers/src/native_triggers/handler.rs index 185691df2b..2578e498d4 100644 --- a/backend/windmill-triggers/src/native_triggers/handler.rs +++ b/backend/windmill-triggers/src/native_triggers/handler.rs @@ -28,11 +28,12 @@ async fn require_is_writer_on_runnable( w_id: &str, db: DB, ) -> Result<()> { - if is_flow { - crate::flow_ext::require_is_writer(authed, path, w_id, db).await + let (query, kind) = if is_flow { + ("SELECT extra_perms FROM flow WHERE path = $1 AND workspace_id = $2", "flow") } else { - crate::script_ext::require_is_writer(authed, path, w_id, db).await - } + ("SELECT extra_perms FROM script WHERE path = $1 AND workspace_id = $2 ORDER BY created_at DESC LIMIT 1", "script") + }; + windmill_api_auth::permissions::require_is_writer(authed, path, w_id, db, query, kind).await } #[derive(Debug, Deserialize)] diff --git a/backend/windmill-triggers/src/script_ext.rs b/backend/windmill-triggers/src/script_ext.rs deleted file mode 100644 index 498b6f0365..0000000000 --- a/backend/windmill-triggers/src/script_ext.rs +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Author: Windmill Labs, Inc - * Copyright: Windmill Labs, Inc 2024 - * This file and its contents are licensed under the AGPLv3 License. - * Please see the included NOTICE for copyright information and - * LICENSE-AGPL for a copy of the license. - */ - -use windmill_api_auth::ApiAuthed; -use windmill_common::{error::Result, DB}; - -pub async fn require_is_writer(authed: &ApiAuthed, path: &str, w_id: &str, db: DB) -> Result<()> { - windmill_api_auth::permissions::require_is_writer( - authed, - path, - w_id, - db, - "SELECT extra_perms FROM script WHERE path = $1 AND workspace_id = $2 ORDER BY created_at DESC LIMIT 1", - "script", - ) - .await -}