From b21aa0eece37879056a99f31c24c854bdd5d25ba Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 19 Aug 2024 17:57:35 +0200
Subject: [PATCH] Fix sql regex to work like ownership validation

---
 Cargo.lock           |  1 +
 Cargo.toml           |  3 +++
 src/server/common.rs | 29 +++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e921e0..d5e3f10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1077,6 +1077,7 @@ dependencies = [
  "prettytable",
  "rand",
  "ratatui",
+ "regex",
  "sd-notify",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 4517c66..faa78e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,3 +49,6 @@ codegen-units = 1
 
 [build-dependencies]
 anyhow = "1.0.82"
+
+[dev-dependencies]
+regex = "1.10.6"
diff --git a/src/server/common.rs b/src/server/common.rs
index c42187a..454dcbe 100644
--- a/src/server/common.rs
+++ b/src/server/common.rs
@@ -5,9 +5,9 @@ use sqlx::prelude::*;
 /// that belong to the user or any of the user's groups.
 pub fn create_user_group_matching_regex(user: &UnixUser) -> String {
     if user.groups.is_empty() {
-        format!("{}(_.+)?", user.username)
+        format!("{}_.+", user.username)
     } else {
-        format!("({}|{})(_.+)?", user.username, user.groups.join("|"))
+        format!("({}|{})_.+", user.username, user.groups.join("|"))
     }
 }
 
@@ -24,3 +24,28 @@ pub fn try_get_with_binary_fallback(
             .map(|v| String::from_utf8_lossy(&v).to_string())
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use regex::Regex;
+
+    #[test]
+    fn test_create_user_group_matching_regex() {
+        let user = UnixUser {
+            username: "user".to_owned(),
+            groups: vec!["group1".to_owned(), "group2".to_owned()],
+        };
+
+        let regex = create_user_group_matching_regex(&user);
+        let re = Regex::new(&regex).unwrap();
+
+        assert!(re.is_match("user_something"));
+        assert!(re.is_match("group1_something"));
+        assert!(re.is_match("group2_something"));
+
+        assert!(!re.is_match("other_something"));
+        assert!(!re.is_match("user"));
+        assert!(!re.is_match("usersomething"));
+    }
+}
\ No newline at end of file