rls

backend/src/routes/webdav/mod.rs

@@ -21,10 +21,11 @@ use crate::error::{AppError, AppResult};
 use crate::models::{Document, DocumentVersion, Folder, User};
 use crate::schema::{
     document_versions::dsl as document_versions_dsl, documents::dsl as documents_dsl,
-    folders::dsl as folders_dsl, tenants::dsl as tenant_dsl,
-    user_memberships::dsl as memberships_dsl, users::dsl as users_dsl,
+    folders::dsl as folders_dsl, user_memberships::dsl as memberships_dsl,
+    users::dsl as users_dsl,
 };
 use crate::state::AppState;
+use crate::tenants::{apply_tenant_guc, apply_user_guc, clear_user_guc};
 use crate::utils::{error::StorageResultExt, http::inline_content_disposition, time::to_http_date};
 
 const REALM: &str = "Papercrate WebDAV";
@@ -453,16 +454,19 @@ fn authenticate(state: &AppState, headers: &HeaderMap) -> Result<Option<WebDavCo
         }
     };
 
-    let tenant_row = memberships_dsl::user_memberships
-        .inner_join(tenant_dsl::tenants)
+    apply_user_guc(&mut conn, user.id)?;
+
+    let membership_exists = memberships_dsl::user_memberships
         .filter(memberships_dsl::user_id.eq(user.id))
         .filter(memberships_dsl::tenant_id.eq(token.tenant_id))
-        .select((tenant_dsl::id, tenant_dsl::name))
-        .first::<(Uuid, String)>(&mut conn)
+        .select(memberships_dsl::tenant_id)
+        .first::<Uuid>(&mut conn)
         .optional()?;
 
-    let (tenant_id, _name) = match tenant_row {
-        Some(row) => row,
+    clear_user_guc(&mut conn)?;
+
+    let tenant_id = match membership_exists {
+        Some(id) => id,
         None => {
             tracing::warn!(
                 %username,
@@ -473,6 +477,7 @@ fn authenticate(state: &AppState, headers: &HeaderMap) -> Result<Option<WebDavCo
         }
     };
 
+    apply_tenant_guc(&mut conn, tenant_id)?;
     touch_webdav_token(&mut conn, token.id)?;
 
     tracing::debug!(