[deb/rpm] Cleanup user management (#83848)

jbudz · arenard · kibanamachine · jbudz · commit 17e250cb3b77 · 2020-12-10T09:39:35.000-06:00
Co-authored-by: Arnaud RENARD &lt;arenard@gmail.com&gt;
Co-authored-by: Kibana Machine &lt;42973632+kibanamachine@users.noreply.github.com&gt;
diff --git a/src/dev/build/tasks/os_packages/package_scripts/post_install.sh b/src/dev/build/tasks/os_packages/package_scripts/post_install.sh
@@ -31,13 +31,23 @@ setup() {
 case $1 in
   # Debian
   configure)
-    if ! getent group "<%= group %>" >/dev/null; then
+    if ! getent group "<%= group %>" >/dev/null 2>&1 ; then
+      echo -n "Creating <%= group %> group..."
       addgroup --quiet --system "<%= group %>"
+      echo " OK"
     fi
 
-    if ! getent passwd "<%= user %>" >/dev/null; then
-      adduser --quiet --system --no-create-home --disabled-password \
-      --ingroup "<%= group %>" --shell /bin/false "<%= user %>"
+    if ! id "<%= user %>" >/dev/null 2>&1 ; then
+      echo -n "Creating <%= user %> user..."
+      adduser --quiet \
+              --system \
+              --no-create-home \
+              --home /nonexistent \
+              --ingroup "<%= group %>" \
+              --disabled-password \
+              --shell /bin/false \
+              "<%= user %>"
+      echo " OK"
     fi
 
     if [ -n "$2" ]; then
@@ -53,13 +63,22 @@ case $1 in
 
   # Red Hat
   1|2)
-    if ! getent group "<%= group %>" >/dev/null; then
+    if ! getent group "<%= group %>" >/dev/null 2>&1 ; then
+      echo -n "Creating <%= group %> group..."
       groupadd -r "<%= group %>"
+      echo " OK"
     fi
 
-    if ! getent passwd "<%= user %>" >/dev/null; then
-      useradd -r -g "<%= group %>" -M -s /sbin/nologin \
-      -c "kibana service user" "<%= user %>"
+    if ! id "<%= user %>" >/dev/null 2>&1 ; then
+      echo -n "Creating <%= user %> user..."
+      useradd --system \
+              --no-create-home \
+              --home-dir /nonexistent \
+              --gid "<%= group %>" \
+              --shell /sbin/nologin \
+              --comment "kibana service user" \
+              "<%= user %>" \
+      echo " OK"
     fi
 
     if [ "$1" = "2" ]; then
@@ -71,8 +90,8 @@ case $1 in
   ;;
 
   *)
-      echo "post install script called with unknown argument \`$1'" >&2
-      exit 1
+    echo "post install script called with unknown argument \`$1'" >&2
+    exit 1
   ;;
 esac
 
diff --git a/src/dev/build/tasks/os_packages/package_scripts/post_remove.sh b/src/dev/build/tasks/os_packages/package_scripts/post_remove.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 set -e
 
-REMOVE_USER_AND_GROUP=false
 REMOVE_DIRS=false
+REMOVE_USER_AND_GROUP=false
 
 case $1 in
   # Includes cases for all valid arguments, exit 1 otherwise
   # Debian
   purge)
-    REMOVE_USER_AND_GROUP=true
     REMOVE_DIRS=true
+    REMOVE_USER_AND_GROUP=true
   ;;
   remove)
     REMOVE_DIRS=true
@@ -28,28 +28,20 @@ case $1 in
   ;;
 
   *)
-      echo "post remove script called with unknown argument \`$1'" >&2
-      exit 1
+    echo "post remove script called with unknown argument \`$1'" >&2
+    exit 1
   ;;
 esac
 
-if [ "$REMOVE_USER_AND_GROUP" = "true" ]; then
-  if getent passwd "<%= user %>" >/dev/null; then
-    userdel "<%= user %>"
-  fi
-
-  if getent group "<%= group %>" >/dev/null; then
-    groupdel "<%= group %>"
-  fi
-fi
-
 if [ "$REMOVE_DIRS" = "true" ]; then
   if [ -d "<%= optimizeDir %>" ]; then
     rm -rf "<%= optimizeDir %>"
   fi
 
   if [ -d "<%= pluginsDir %>" ]; then
+    echo -n "Deleting plugins directory..."
     rm -rf "<%= pluginsDir %>"
+    echo " OK"
   fi
 
   if [ -d "<%= configDir %>" ]; then
@@ -60,3 +52,13 @@ if [ "$REMOVE_DIRS" = "true" ]; then
     rmdir --ignore-fail-on-non-empty "<%= dataDir %>"
   fi
 fi
+
+if [ "$REMOVE_USER_AND_GROUP" = "true" ]; then
+    if id <%= user %> > /dev/null 2>&1 ; then
+        userdel <%= user %>
+    fi
+
+    if getent group <%= group %> > /dev/null 2>&1 ; then
+        groupdel <%= group %>
+    fi
+fi
