fix: add invoking user to panel admin group

Author: Jayian1890

RemoteCoOp/service/README.md

@@ -53,7 +53,7 @@ The panel uses a generated self-signed HTTPS certificate unless `OPENNOW_REMOTE_
 
 Use a system username and password. Access is allowed for members of `opennow-coop-admin`. If that group does not exist, the panel falls back to local administrator groups.
 
-The installers create `opennow-coop-admin` and add the user running `sudo` to it when possible.
+The installers create `opennow-coop-admin` and add the invoking user plus the panel service user to it. Override the login account added by the installer with `LOGIN_USER=your-user`.
 
 ## Controls
 

RemoteCoOp/service/install-linux.sh

@@ -7,6 +7,7 @@ NODE_BIN=${NODE_BIN:-$(command -v node)}
 SUDO=${SUDO:-sudo}
 SERVICE_GROUP=${SERVICE_GROUP:-opennow-coop}
 ADMIN_GROUP=${ADMIN_GROUP:-opennow-coop-admin}
+LOGIN_USER=${LOGIN_USER:-${SUDO_USER:-$(id -un)}}
 ENV_DIR=/etc/opennow
 ENV_FILE=$ENV_DIR/remote-coop-panel.env
 HELPER=/usr/local/libexec/opennow-remote-coop-pam-auth-helper
@@ -318,8 +319,11 @@ SERVICE_USER=${SERVICE_USER:-$(stat -c %U "$REPO_ROOT")}
 $SUDO groupadd -f "$SERVICE_GROUP"
 $SUDO usermod -a -G "$SERVICE_GROUP" "$SERVICE_USER"
 $SUDO groupadd -f "$ADMIN_GROUP"
-if [ -n "${SUDO_USER:-}" ] && id "$SUDO_USER" >/dev/null 2>&1; then
-  $SUDO usermod -a -G "$ADMIN_GROUP" "$SUDO_USER"
+if [ -n "$LOGIN_USER" ] && id "$LOGIN_USER" >/dev/null 2>&1; then
+  $SUDO usermod -a -G "$ADMIN_GROUP" "$LOGIN_USER"
+fi
+if [ -n "$SERVICE_USER" ] && id "$SERVICE_USER" >/dev/null 2>&1; then
+  $SUDO usermod -a -G "$ADMIN_GROUP" "$SERVICE_USER"
 fi
 
 $SUDO mkdir -p "$ENV_DIR" /usr/local/libexec
@@ -346,3 +350,4 @@ echo "TURN port: $TURN_PORT"
 echo "TURN relay UDP range: $TURN_MIN_PORT-$TURN_MAX_PORT"
 echo "Panel access group: $ADMIN_GROUP"
 echo "Panel service user: $SERVICE_USER"
+echo "Panel login user: $LOGIN_USER"

RemoteCoOp/service/install-macos.sh

@@ -7,6 +7,7 @@ NODE_BIN=${NODE_BIN:-$(command -v node)}
 SUDO=${SUDO:-sudo}
 ADMIN_GROUP=${ADMIN_GROUP:-opennow-coop-admin}
 SERVICE_USER=${SERVICE_USER:-$(stat -f %Su "$REPO_ROOT")}
+LOGIN_USER=${LOGIN_USER:-${SUDO_USER:-$(id -un)}}
 PLIST=/Library/LaunchDaemons/com.opennow.remote-coop.panel.plist
 HELPER=/usr/local/libexec/opennow-remote-coop-pam-auth-helper
 PANEL_PORT=${OPENNOW_REMOTE_COOP_PANEL_PORT:-}
@@ -147,8 +148,8 @@ select_service_ports
 if ! dscl . -read "/Groups/$ADMIN_GROUP" >/dev/null 2>&1; then
   $SUDO dseditgroup -o create "$ADMIN_GROUP"
 fi
-if [ -n "${SUDO_USER:-}" ] && id "$SUDO_USER" >/dev/null 2>&1; then
-  $SUDO dseditgroup -o edit -a "$SUDO_USER" -t user "$ADMIN_GROUP"
+if [ -n "$LOGIN_USER" ] && id "$LOGIN_USER" >/dev/null 2>&1; then
+  $SUDO dseditgroup -o edit -a "$LOGIN_USER" -t user "$ADMIN_GROUP"
 fi
 $SUDO dseditgroup -o edit -a "$SERVICE_USER" -t user "$ADMIN_GROUP"
 
@@ -179,3 +180,4 @@ echo "TURN port: $TURN_PORT"
 echo "TURN relay UDP range: $TURN_MIN_PORT-$TURN_MAX_PORT"
 echo "Panel access group: $ADMIN_GROUP"
 echo "Panel service user: $SERVICE_USER"
+echo "Panel login user: $LOGIN_USER"