Use configfilemanager to get the real command

.gitea/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build
+
+on:
+  push: {}
+
+defaults:
+  run:
+    shell: bash
+    working-directory: .
+
+jobs:
+  build:
+    runs-on: ubuntu
+    container:
+      image: node:20
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      
+      - name: Install tools
+        run: apt update && apt install -y build-essential
+
+      - name: Compile project
+        run: make
+
+      - name: Save build output
+        uses: actions/upload-artifact@v3
+        with:
+          name: ncsambawatcher
+          path: ./ncsambawatcher

.gitea/workflows/release.yml

@@ -0,0 +1,48 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - v.*
+
+defaults:
+  run:
+    shell: bash
+    working-directory: .
+
+jobs: 
+  release:
+    runs-on: ubuntu
+    needs: build
+    container:
+      image: node:20
+    steps:
+      - name: Install build tools
+        run: apt update && apt install -y zip
+      
+      - name: Download compiled binary
+        uses: actions/download-artifact@v3
+        with:
+          name: ncsambawatcher
+
+      - name: Copy files
+        run: |
+          mkdir build
+          cp ncsambawatcher build/ncsambawatcher
+          cp configs/ncsambawatcher.config.default build/ncsambawatcher.config
+          cp init.sh config/init.sh 
+
+      - name: Create release zip
+        run: |
+          cd build
+          zip ../ncsambawatcher.zip ./*
+
+      - name: Publish release
+        uses: actions/create-release@v1
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
+          files: |
+            ncsambawatcher.zip

.gitignore

@@ -89,4 +89,6 @@ dkms.conf
 settings.json
 watch.c
 ncwatchfile
-ncsambawatcher
+ncsambawatcher
+
+obj/

Makefile

@@ -1,2 +1,31 @@
-all:
-	g++ -lrt -std=c++17 src/main.cpp src/usermanager.cpp -o ncsambawatcher
+# Compiler and flags
+CXX := g++
+CXXFLAGS := -std=c++17 -Wall -Wextra -O2
+
+# Directories
+SRC_DIR := src
+OBJ_DIR := obj
+BUILD_DIR := .
+TARGET := $(BUILD_DIR)/ncsambawatcher
+
+# Create list of source and object files
+SRCS := $(wildcard $(SRC_DIR)/*.cpp)
+OBJS := $(SRCS:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)
+
+# Default target
+all: $(TARGET)
+
+# Link object files into final binary
+$(TARGET): $(OBJS)
+	$(CXX) $(CXXFLAGS) -o $@ $^
+
+# Compile .cpp to .o into obj/
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
+	@mkdir -p $(OBJ_DIR)
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+# Clean build artifacts
+clean:
+	rm -f $(OBJ_DIR)/*.o $(TARGET)
+
+.PHONY: all clean

configs/ncsambawatcher.config.default

@@ -0,0 +1 @@
+NEXTCLOUD_CONTAINER_NAME=nextcloud

configs/smb.24.04.conf

@@ -1,5 +1,4 @@
 [global]
-
    vfs objects = full_audit
    full_audit:prefix = %u|%I|%m|%S
    full_audit:success = mkdirat unlinkat renameat write
@@ -7,12 +6,43 @@
    full_audit:facility = local5
    full_audit:priority = NOTICE
 
-# Put this line only for the groupfolder's share
-[Some gorupfolder share]
+# Example usershare
+[<username>] #CHANGEME
+   path = /path/to/nextcloud/data/<username>/files/ #CHANGEME
+   valid users = <username> #CHANGEME
+   force user = www-data
+   force group = www-data
+   create mask = 0755
+   force create mode = 0755
+   directory mask = 0755
+   force directory mode = 0755
+   guest ok = no
+   public = no
+   writable = yes
+   browsable = yes
+   hide dot files = no
+   inherit owner = yes
+   hide unreadable = no
 
-   full_audit:prefix = %u|%I|%m|__groupfolders/<group-folders-id>
+# Example groupfolder share
+[Sharename]
+   path = /path/to/nextcloud/data/__groupfolders/<groupfolder-id> #CHANGEME
+   valid users = usernames #CHANGEME
+   force user = www-data
+   force group = www-data
+   create mask = 0755
+   force create mode = 0755
+   directory mask = 0755
+   force directory mode = 0755
+   guest ok = no
+   public = no
+   writable = yes
+   browsable = yes
+   hide dot files = no
+   inherit owner = yes
+   hide unreadable = no
+   full_audit:prefix = %u|%I|%m|__groupfolders/<groupfolder-id> #CHANGEME
 
-# To disable logs for a specific share
-[A share]
-
-    vfs objects = 
+# To disable logs for a specific share, add this line to that share
+[Sharename]
+   vfs objects = 

src/configfilemanager.h

@@ -0,0 +1,48 @@
+#ifndef _CONFIGFILEMANAGER_H
+#define _CONFIGFILEMANAGER_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iostream>
+#include "definitions.h"
+
+class configfilemanager{
+private:
+    std::map<std::string, std::string> configs;
+
+public:
+    configfilemanager(std::string filepath = "./ncsambawatcher.config")
+    {
+        std::ifstream is(filepath);
+        std::string tmp;
+        while(std::getline(is, tmp))
+        {
+            if (tmp.at(0) == '#') // ignore comments
+                continue;
+            
+            std::vector<std::string> splited = splitString(tmp, '=');
+            if (splited.size() != 2)
+            {
+                std::cerr << "Invalid line: " << tmp << std::endl;
+                continue;
+            }
+
+            configs.insert(std::make_pair(splited.at(0), splited.at(1)));           
+        }
+    }
+
+    std::string at(const std::string &config)
+    {
+        return configs.at(config);
+    }
+
+    std::string at(const char* config)
+    {
+        return at(std::string(config));
+    }
+
+};
+
+#endif // _CONFIGFILEMANAGER_H

src/definitions.h

@@ -5,7 +5,9 @@
 
 #define USER_LOG_LOCATION 3
 
-#define SCAN_CMD_USR "docker exec --user www-data nextcloud /var/www/html/occ files:scan --path="
-#define SCAN_CMD_GRP "docker exec --user www-data nextcloud /var/www/html/occ groupfolder:scan "
+#define SCAN_CMD_USR "docker exec --user www-data %1% /var/www/html/occ files:scan --path="
+#define SCAN_CMD_GRP "docker exec --user www-data %1% /var/www/html/occ groupfolder:scan "
+
+std::vector<std::string> splitString(const std::string& input, char delimiter);
 
 #endif // _LOCATIONS_H

src/main.cpp

@@ -10,11 +10,27 @@
 #include <mutex>
 #include <condition_variable>
 #include <cstdio>
+#include "definitions.h"
 #include "usermanager.h"
+#include "configfilemanager.h"
 
 userManager manager;
 std::condition_variable cv;
 std::mutex mtx;
+configfilemanager cfm;
+
+std::vector<std::string> splitString(const std::string& str, char delimiter = '|')
+{
+    std::vector<std::string> ret;
+    std::stringstream ss(str);
+    std::string token;
+
+    while (std::getline(ss, token, delimiter)) {
+        ret.push_back(token);
+    }
+
+    return ret;
+}
 
 void readingThreadFunc()
 {
@@ -68,7 +84,7 @@ void scannerThreadFunc()
             }
             else if (child == 0) // child
             {
-                std::string cmd = userManager::getScanCommandFromUser(user);
+                std::string cmd = userManager::getScanCommandFromUser(user, cfm);
                 execl("/bin/sh", "sh", "-c", cmd.c_str(), static_cast<char *>(nullptr));
                 std::cerr << "Scan failed" << std::endl;
                 _exit(EXIT_FAILURE);

src/usermanager.cpp

@@ -1,24 +1,27 @@
 #include "usermanager.h"
 
-std::vector<std::string> splitString(const std::string& str, char delimiter = '|')
-{
-    std::vector<std::string> ret;
-    std::stringstream ss(str);
-    std::string token;
-
-    while (std::getline(ss, token, delimiter)) {
-        ret.push_back(token);
-    }
-
-    return ret;
-}
-
-std::string userManager::getScanCommandFromUser(const std::string &user)
+std::string userManager::getScanCommandFromUser(const std::string &user, configfilemanager &cfm)
 {
+    std::string contname = cfm.at("NEXTCLOUD_CONTAINER_NAME");
+    std::string baseCommand;
+    std::string userCommand;
+    
     if (user.find("__groupfolder") != std::string::npos)
     {
-        return std::string(SCAN_CMD_GRP) + splitString(user, '/').back();
+        baseCommand = SCAN_CMD_GRP;
+        userCommand = splitString(user, '/').back();
+    }
+    else
+    {
+        baseCommand = SCAN_CMD_USR;
+        userCommand = user;
     }
 
-    return std::string(SCAN_CMD_USR) + user;
+    size_t pos = 0;
+    while ((pos = baseCommand.find("%1%", pos)) != std::string::npos) {
+        baseCommand.replace(pos, contname.length(), contname);
+        pos += contname.length(); // Move past the replacement
+    }
+
+    return baseCommand + userCommand;
 }

src/usermanager.h

@@ -8,8 +8,7 @@
 #include <sstream>
 #include <mutex>
 #include "definitions.h"
-
-std::vector<std::string> splitString(const std::string& input, char delimiter);
+#include "configfilemanager.h"
 
 class userManager
 {
@@ -19,7 +18,7 @@ private:
 
 public:
     
-    static std::string getScanCommandFromUser(const std::string&);
+    static std::string getScanCommandFromUser(const std::string&, configfilemanager& cfm);
 
     void addUserFromLogLine(std::string &line)
     {