Merge pull request #2942 from reubenmiller/fix-user-group-lookup-busybox

fix: improve compatibility of user/group existence check in package maintainer scripts
thin-edge · Jun 17, 2024 · 54b736d · 54b736d
2 parents 82732a9 + 9b4a8bb
commit 54b736d
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 16 deletions.
diff --git a/configuration/package_scripts/_generated/tedge/apk/postrm b/configuration/package_scripts/_generated/tedge/apk/postrm
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 remove_user_tedge() {
-    if getent passwd tedge > /dev/null; then
+    if user_exists tedge; then
         if command_exists userdel; then
             userdel tedge
         elif command_exists deluser; then
@@ -18,7 +42,7 @@ remove_user_tedge() {
 }
 
 remove_tedge_group() {
-    if getent group tedge > /dev/null; then
+    if group_exists tedge; then
         if command_exists groupdel; then
             groupdel tedge
         elif command_exists delgroup; then

diff --git a/configuration/package_scripts/_generated/tedge/apk/preinst b/configuration/package_scripts/_generated/tedge/apk/preinst
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 ### Create groups
-if ! getent group tedge >/dev/null; then
+if ! group_exists tedge; then
     if command_exists groupadd; then
         groupadd --system tedge
     elif command_exists addgroup; then
@@ -18,7 +42,7 @@ fi
 
 ### Create users
 # Create user tedge with no home(--no-create-home), no login(--shell) and in group tedge(--gid)
-if ! getent passwd tedge >/dev/null; then
+if ! user_exists tedge; then
     if command_exists useradd; then
         useradd --system --no-create-home --shell /sbin/nologin --gid tedge tedge
     elif command_exists adduser; then

diff --git a/configuration/package_scripts/_generated/tedge/deb/postrm b/configuration/package_scripts/_generated/tedge/deb/postrm
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 remove_user_tedge() {
-    if getent passwd tedge > /dev/null; then
+    if user_exists tedge; then
         if command_exists userdel; then
             userdel tedge
         elif command_exists deluser; then
@@ -18,7 +42,7 @@ remove_user_tedge() {
 }
 
 remove_tedge_group() {
-    if getent group tedge > /dev/null; then
+    if group_exists tedge; then
         if command_exists groupdel; then
             groupdel tedge
         elif command_exists delgroup; then

diff --git a/configuration/package_scripts/_generated/tedge/deb/preinst b/configuration/package_scripts/_generated/tedge/deb/preinst
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 ### Create groups
-if ! getent group tedge >/dev/null; then
+if ! group_exists tedge; then
     if command_exists groupadd; then
         groupadd --system tedge
     elif command_exists addgroup; then
@@ -18,7 +42,7 @@ fi
 
 ### Create users
 # Create user tedge with no home(--no-create-home), no login(--shell) and in group tedge(--gid)
-if ! getent passwd tedge >/dev/null; then
+if ! user_exists tedge; then
     if command_exists useradd; then
         useradd --system --no-create-home --shell /sbin/nologin --gid tedge tedge
     elif command_exists adduser; then

diff --git a/configuration/package_scripts/_generated/tedge/rpm/postrm b/configuration/package_scripts/_generated/tedge/rpm/postrm
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 remove_user_tedge() {
-    if getent passwd tedge > /dev/null; then
+    if user_exists tedge; then
         if command_exists userdel; then
             userdel tedge
         elif command_exists deluser; then
@@ -18,7 +42,7 @@ remove_user_tedge() {
 }
 
 remove_tedge_group() {
-    if getent group tedge > /dev/null; then
+    if group_exists tedge; then
         if command_exists groupdel; then
             groupdel tedge
         elif command_exists delgroup; then

diff --git a/configuration/package_scripts/_generated/tedge/rpm/preinst b/configuration/package_scripts/_generated/tedge/rpm/preinst
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 ### Create groups
-if ! getent group tedge >/dev/null; then
+if ! group_exists tedge; then
     if command_exists groupadd; then
         groupadd --system tedge
     elif command_exists addgroup; then
@@ -18,7 +42,7 @@ fi
 
 ### Create users
 # Create user tedge with no home(--no-create-home), no login(--shell) and in group tedge(--gid)
-if ! getent passwd tedge >/dev/null; then
+if ! user_exists tedge; then
     if command_exists useradd; then
         useradd --system --no-create-home --shell /sbin/nologin --gid tedge tedge
     elif command_exists adduser; then

diff --git a/configuration/package_scripts/tedge/postrm b/configuration/package_scripts/tedge/postrm
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 remove_user_tedge() {
-    if getent passwd tedge > /dev/null; then
+    if user_exists tedge; then
         if command_exists userdel; then
             userdel tedge
         elif command_exists deluser; then
@@ -18,7 +42,7 @@ remove_user_tedge() {
 }
 
 remove_tedge_group() {
-    if getent group tedge > /dev/null; then
+    if group_exists tedge; then
         if command_exists groupdel; then
             groupdel tedge
         elif command_exists delgroup; then

diff --git a/configuration/package_scripts/tedge/preinst b/configuration/package_scripts/tedge/preinst
@@ -5,8 +5,32 @@ command_exists() {
     command -V "$1" >/dev/null 2>&1
 }
 
+group_exists() {
+    name="$1"
+    if command_exists id; then
+        id -g "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent group "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/group
+    fi
+}
+
+user_exists() {
+    name="$1"
+    if command_exists id; then
+        id -u "$name" >/dev/null 2>&1
+    elif command_exists getent; then
+        getent passwd "$name" >/dev/null 2>&1
+    else
+        # Fallback to plain grep, as busybox does not have getent
+        grep -q "^${name}:" /etc/passwd
+    fi
+}
+
 ### Create groups
-if ! getent group tedge >/dev/null; then
+if ! group_exists tedge; then
     if command_exists groupadd; then
         groupadd --system tedge
     elif command_exists addgroup; then
@@ -18,7 +42,7 @@ fi
 
 ### Create users
 # Create user tedge with no home(--no-create-home), no login(--shell) and in group tedge(--gid)
-if ! getent passwd tedge >/dev/null; then
+if ! user_exists tedge; then
     if command_exists useradd; then
         useradd --system --no-create-home --shell /sbin/nologin --gid tedge tedge
     elif command_exists adduser; then