nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

Rework service user (#299)

Browse Source 
* Use user primary group if not root

* Do not run getent on MacOS

* Simplify UID/GID management

* Make uid.env backward compatible in run.sh

* Merge install.sh with run.sh to avoid duplicating code

Especially the UID/GID management one

* Generate correct OS name

* Be sure to keep old behavior for backward compatiblilty

* Get the colors back from install.sh
This commit is contained in:
Mart124
2018-05-31 18:05:26 +02:00
committed by Kyle Spearrin
parent 961c0c6749
commit 92b08e6cf1
12 changed files with 222 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
util/Nginx/entrypoint.sh
View File

@ -5,52 +5,27 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
# Step down from host root to well-known nobody/nogroup user
# Step down from host root
if [ $LGID == 0 ]
if [ $LUID -eq 0 ]
then
LGID=999
LUID=65534
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi
if [ $LUID == 0 ]
then
LUID=999
fi
# Create user and group
# Create group
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
# The rest...
@ -65,4 +40,4 @@ chown -R $USERNAME:$GROUPNAME /var/run/nginx.pid
chown -R $USERNAME:$GROUPNAME /var/cache/nginx
chown -R $USERNAME:$GROUPNAME /var/log/nginx
gosu $USERNAME:$GROUPNAME nginx -g 'daemon off;'
exec gosu $USERNAME:$GROUPNAME nginx -g 'daemon off;'