Added multi-user mode to handle the creation of multiple users and ad…

…d passwords to make them Samba users.

Dockerfile

@@ -24,6 +24,8 @@ ENV UID=1000
 ENV GID=1000
 ENV RW=true
 
+ENV MULTI_USER=false
+
 HEALTHCHECK --interval=60s --timeout=15s CMD smbclient -L \\localhost -U % -m SMB3
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/samba.sh"]

compose.yml

@@ -8,6 +8,7 @@ services:
       RW: true      # Optional, default true
       UID: 1000    # Optional, default 1000
       GID: 1000    # Optional, default 1000
+      MULTI_USER: false
     ports:
       - 445:445
     volumes:

samba.sh

@@ -1,84 +1,142 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-# Set variables for group and share directory
-group="smb"
-share="/storage"
-secret="/run/secrets/pass"
-
-# Create shared directory
-mkdir -p "$share" || { echo "Failed to create directory $share"; exit 1; }
-
-# Check if the smb group exists, if not, create it
-if ! getent group "$group" &>/dev/null; then
-    groupadd "$group" || { echo "Failed to create group $group"; exit 1; }
-fi
-
-# Check if the user already exists, if not, create it
-if ! id "$USER" &>/dev/null; then
-    adduser -S -D -H -h /tmp -s /sbin/nologin -G "$group" -g 'Samba User' "$USER" || { echo "Failed to create user $USER"; exit 1; }
-fi
+# This function checks for the existence of a specified Samba user and group. If the user does not exist, 
+# it creates a new user with the provided username, user ID (UID), group name, group ID (GID), and password. 
+# If the user already exists, it updates the user's UID and group association as necessary, 
+# and updates the password in the Samba database. The function ensures that the group also exists, 
+# creating it if necessary, and modifies the group ID if it differs from the provided value.
+add_or_update_samba_user() {
+    local username="$1"
+    local uid="$2"
+    local groupname="$3"
+    local gid="$4"
+    local password="$5"
+
+    # Check if the smb group exists, if not, create it
+    if ! getent group "$groupname" &>/dev/null; then
+        echo "Group $groupname does not exist, creating group..."
+        groupadd -o -g "$gid" "$groupname" || { echo "Failed to create group $groupname"; return 1; }
+    else
+        # Check if the gid right,if not, change it
+        local current_gid
+        current_gid=$(getent group "$groupname" | cut -d: -f3)
+        if [[ "$current_gid" != "$gid" ]]; then
+            echo "Group $groupname exists but GID differs, updating GID..."
+            groupmod -o -g "$gid" "$groupname" || { echo "Failed to update GID for group $groupname"; return 1; }
+        fi
+    fi
 
-# Get the current user and group IDs
-OldUID=$(id -u "$USER")
-OldGID=$(getent group "$group" | cut -d: -f3)
+    # Check if the user already exists, if not, create it
+    if ! id "$username" &>/dev/null; then
+        echo "User $username does not exist, creating user..."
+        adduser -S -D -H -h /tmp -s /sbin/nologin -G "$groupname" -o -u "$uid" -g "Samba User" "$username" || { echo "Failed to create user $username"; return 1; }
+    else
+        # Check if the uid right,if not, change it
+        local current_uid
+        current_uid=$(id -u "$username")
+        if [[ "$current_uid" != "$uid" ]]; then
+            echo "User $username exists but UID differs, updating UID..."
+            usermod -o -u "$uid" "$username" || { echo "Failed to update UID for user $username"; return 1; }
+        fi
 
-# Change the UID and GID of the user and group if necessary
-if [[ "$OldUID" != "$UID" ]]; then
-    usermod -o -u "$UID" "$USER" || { echo "Failed to change UID for $USER"; exit 1; }
-fi
+        # Update user's group
+        usermod -g "$groupname" "$username" || { echo "Failed to update group for user $username"; return 1; }
+    fi
 
-if [[ "$OldGID" != "$GID" ]]; then
-    groupmod -o -g "$GID" "$group" || { echo "Failed to change GID for group $group"; exit 1; }
-fi
+    # Check if the user is a samba user
+    if pdbedit -L | grep -q "^$username:"; then
+        # if the user is a samba user, change its password
+        echo -e "$password\n$password" | smbpasswd -s "$username" || { echo "Failed to update Samba password for $username"; return 1; }
+        echo "Password for existing Samba user $username has been updated."
+    else
+        # if the user is not a samba user, create it and set a password
+        echo -e "$password\n$password" | smbpasswd -a -s "$username" || { echo "Failed to add Samba user $username"; return 1; }
+        echo "User $username has been added to Samba and password set."
+    fi
+}
 
-# Check if an external config file was supplied
+# External config file
 config="/etc/samba/smb.conf"
+user_config="/etc/samba/smb_user.conf"
+
+# Check if multi-user mode is enabled
+if [[ "$MULTI_USER" == true ]]; then
+    # Check if the user configuration file exists, note: config and user_config must be exist!!!
+    if [[ -f "$user_config" && -f "$config" ]]; then
+        while read -r line; do
+            # Skip lines that are comments or empty
+            [[ "$line" =~ ^#.*$ || -z "$line" ]] && continue
+
+            # Split each line by colon and assign to variables
+            username=$(echo "$line" | cut -d: -f1)
+            uid=$(echo "$line" | cut -d: -f2)
+            groupname=$(echo "$line" | cut -d: -f3)
+            gid=$(echo "$line" | cut -d: -f4)
+            password=$(echo "$line" | cut -d: -f5)
+
+            # Check if all required fields are present
+            if [[ -z "$username" || -z "$uid" || -z "$groupname" || -z "$gid" || -z "$password" ]]; then
+                echo "Skipping incomplete line: $line"
+                continue
+            fi
+
+            # Call the function with extracted values
+            add_or_update_samba_user "$username" "$uid" "$groupname" "$gid" "$password"
+        done < "$user_config"
+    else
+        echo "/etc/samba/smb_user.conf not found, setting MULTI_USER to false."
+        MULTI_USER=false
+    fi
+fi
 
-if [ -f "$config" ]; then
-
-    # Inform the user we are using a custom configuration file.
-    echo "Using provided configuration file: $config."
-
-else
-
-    config="/etc/samba/smb.tmp"
-    template="/etc/samba/smb.default"
-
-    # Generate a config file from template
-    rm -f "$config"
-    cp "$template" "$config"
+# Handle single user case
+if [[ "$MULTI_USER" == false ]]; then
+    # Set variables for group and share directory
+    group="smb"
+    share="/storage"
+    secret="/run/secrets/pass"
 
-    # Update force user and force group in smb.conf
-    sed -i "s/^\(\s*\)force user =.*/\1force user = $USER/" "$config"
-    sed -i "s/^\(\s*\)force group =.*/\1force group = $group/" "$config"
+    # Create shared directory
+    mkdir -p "$share" || { echo "Failed to create directory $share"; exit 1; }
 
-    # Verify if the RW variable is equal to false (indicating read-only mode) 
-    if [[ "$RW" == [Ff0]* ]]; then
+    # Check if the secret file exists and if its size is greater than zero
+    if [ -s "$secret" ]; then
+        PASS=$(cat "$secret")
+    fi
 
-        # Adjust settings in smb.conf to set share to read-only
-        sed -i "s/^\(\s*\)writable =.*/\1writable = no/" "$config"
-        sed -i "s/^\(\s*\)read only =.*/\1read only = yes/" "$config"
+    add_or_update_samba_user "$USER" "$UID" "$group" "$GID" "$PASS"
 
+    if [ -f "$config" ]; then
+        # Inform the user we are using a custom configuration file.
+        echo "Using provided configuration file: $config."
     else
-
-        # Set permissions for share directory if new (empty), leave untouched if otherwise
-        if [ -z "$(ls -A "$share")" ]; then
-          chmod 0770 "$share" || { echo "Failed to set permissions for directory $share"; exit 1; }
-          chown "$USER:$group" "$share" || { echo "Failed to set ownership for directory $share"; exit 1; }
+        config="/etc/samba/smb.tmp"
+        template="/etc/samba/smb.default"
+
+        # Generate a config file from template
+        rm -f "$config"
+        cp "$template" "$config"
+
+        # Update force user and force group in smb.conf
+        sed -i "s/^\(\s*\)force user =.*/\1force user = $USER/" "$config"
+        sed -i "s/^\(\s*\)force group =.*/\1force group = $group/" "$config"
+
+        # Verify if the RW variable is equal to false (indicating read-only mode) 
+        if [[ "$RW" == [Ff0]* ]]; then
+            # Adjust settings in smb.conf to set share to read-only
+            sed -i "s/^\(\s*\)writable =.*/\1writable = no/" "$config"
+            sed -i "s/^\(\s*\)read only =.*/\1read only = yes/" "$config"
+        else
+            # Set permissions for share directory if new (empty), leave untouched if otherwise
+            if [ -z "$(ls -A "$share")" ]; then
+                chmod 0770 "$share" || { echo "Failed to set permissions for directory $share"; exit 1; }
+                chown "$USER:$group" "$share" || { echo "Failed to set ownership for directory $share"; exit 1; }
+            fi
         fi
-
     fi
 fi
 
-# Check if the secret file exists and if its size is greater than zero
-if [ -s "$secret" ]; then
-  PASS=$(cat "$secret")
-fi
-
-# Change Samba password
-echo -e "$PASS\n$PASS" | smbpasswd -a -c "$config" -s "$USER" > /dev/null || { echo "Failed to change Samba password for $USER"; exit 1; }
-
 # Start the Samba daemon with the following options:
 #  --foreground: Run in the foreground instead of daemonizing.
 #  --debug-stdout: Send debug output to stdout.

samba_user.conf

@@ -0,0 +1,2 @@
+#username:UID:groupname:GID:password
+samba:1000:smb:1000:secret