nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-25 13:24:50 -05:00
Code

Revert "Use user primary group if not root (#292)"

Browse Source 
This reverts commit ec89c36ca0b04b2e82006402801f82d55c2cf2ea.
This commit is contained in:
Kyle Spearrin 2018-05-29 19:17:48 -04:00
parent ec89c36ca0
commit 0f675d8ccb
11 changed files with 393 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/install.sh
View File

@ -4,11 +4,10 @@ set -e
CYAN='\033[0;36m' CYAN='\033[0;36m'
NC='\033[0m' # No Color NC='\033[0m' # No Color
OUTPUT_DIR=".." OUTPUT_DIR="../."
if [ $# -gt 0 ] if [ $# -gt 0 ]
then then
OUTPUT_DIR=$1 OUTPUT_DIR=$1
mkdir -p $OUTPUT_DIR
fi fi
COREVERSION="latest" COREVERSION="latest"
@ -23,13 +22,16 @@ then
WEBVERSION=$3 WEBVERSION=$3
fi fi
ENV_DIR="$OUTPUT_DIR/env" OS="lin"
if [ "$(uname)" == "Darwin" ]
then
OS="mac"
fi
# Save the installation UID/GID, they could also be manually changed later on if desired
LUID="LOCAL_UID=`id -u $USER`" LUID="LOCAL_UID=`id -u $USER`"
LGID="LOCAL_GID=`id -g $USER`" LGID="LOCAL_GID=`getent group docker | cut -d: -f3`"
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env mkdir -p $OUTPUT_DIR
LETS_ENCRYPT="n" LETS_ENCRYPT="n"
echo -e -n "${CYAN}(!)${NC} Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): " echo -e -n "${CYAN}(!)${NC} Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): "
@ -62,8 +64,14 @@ then
fi fi
docker pull bitwarden/setup:$COREVERSION docker pull bitwarden/setup:$COREVERSION
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ if [ $OS == "lin" ]
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION then
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden -e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
echo "" echo ""
echo "Setup complete" echo "Setup complete"

65
scripts/run.sh
View File

@ -5,7 +5,7 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
OUTPUT_DIR=".." OUTPUT_DIR="../."
if [ $# -gt 1 ] if [ $# -gt 1 ]
then then
OUTPUT_DIR=$2 OUTPUT_DIR=$2
@ -23,18 +23,17 @@ then
WEBVERSION=$4 WEBVERSION=$4
fi fi
ENV_DIR="$OUTPUT_DIR/env" OS="lin"
DOCKER_DIR="$OUTPUT_DIR/docker" if [ "$(uname)" == "Darwin" ]
# As in install.sh, save the running UID/GID, they could not exist yet, during an update for example
if ! grep -q "^LOCAL_UID=" $ENV_DIR/uid.env 2>/dev/null || ! grep -q "^LOCAL_GID=" $ENV_DIR/uid.env 2>/dev/null
then then
LUID="LOCAL_UID=`id -u $USER`" OS="mac"
LGID="LOCAL_GID=`id -g $USER`"
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env
fi fi
DOCKER_DIR="$OUTPUT_DIR/docker"
ENV_DIR="$OUTPUT_DIR/env"
LUID="LOCAL_UID=`id -u $USER`"
LGID="LOCAL_GID=`getent group docker | cut -d: -f3`"
# Functions # Functions
function dockerComposeUp() { function dockerComposeUp() {
@ -80,30 +79,58 @@ function updateLetsEncrypt() {
function updateDatabase() { function updateDatabase() {
pullSetup pullSetup
docker run -i --rm --name setup --network container:bitwarden-mssql \ if [ $OS == "lin" ]
-v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ then
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION docker run -i --rm --name setup --network container:bitwarden-mssql \
-v $OUTPUT_DIR:/bitwarden -e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup --network container:bitwarden-mssql \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
echo "Database update complete" echo "Database update complete"
} }
function update() { function update() {
pullSetup pullSetup
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \ if [ $OS == "lin" ]
--env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ then
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
-e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
} }
function printEnvironment() { function printEnvironment() {
pullSetup pullSetup
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \ if [ $OS == "lin" ]
--env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ then
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
-e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
} }
function restart() { function restart() {
dockerComposeDown dockerComposeDown
dockerComposePull dockerComposePull
updateLetsEncrypt updateLetsEncrypt
if [ $OS == "lin" ]
then
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env
fi
dockerComposeUp dockerComposeUp
dockerPrune dockerPrune
printEnvironment printEnvironment

57
src/Admin/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
@ -38,4 +63,4 @@ chown -R $USERNAME:$GROUPNAME /etc/bitwarden
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \ cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates && update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Admin.dll gosu $USERNAME:$GROUPNAME dotnet /app/Admin.dll

60
src/Api/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
@ -38,11 +63,10 @@ mkdir -p /etc/bitwarden/logs
mkdir -p /etc/bitwarden/ca-certificates mkdir -p /etc/bitwarden/ca-certificates
chown -R $USERNAME:$GROUPNAME /etc/bitwarden chown -R $USERNAME:$GROUPNAME /etc/bitwarden
# Sounds like gosu keeps env when switching, but of course cron does not env >> /etc/environment
env > /etc/environment
cron cron
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \ cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates && update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Api.dll gosu $USERNAME:$GROUPNAME dotnet /app/Api.dll

58
src/Icons/entrypoint.sh
View File

@ -5,30 +5,54 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
chown -R $USERNAME:$GROUPNAME /app chown -R $USERNAME:$GROUPNAME /app
gosu $USERNAME:$GROUPNAME dotnet /app/Icons.dll
exec gosu $USERNAME:$GROUPNAME dotnet /app/Icons.dll

57
src/Identity/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
@ -41,4 +66,4 @@ chown -R $USERNAME:$GROUPNAME /app
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \ cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates && update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Identity.dll gosu $USERNAME:$GROUPNAME dotnet /app/Identity.dll

57
util/Attachments/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
@ -33,5 +58,5 @@ chown -R $USERNAME:$GROUPNAME /bitwarden_server
mkdir -p /etc/bitwarden/core/attachments mkdir -p /etc/bitwarden/core/attachments
chown -R $USERNAME:$GROUPNAME /etc/bitwarden chown -R $USERNAME:$GROUPNAME /etc/bitwarden
exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \ gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
/contentRoot=/etc/bitwarden/core/attachments /webRoot=. /serveUnknown=true /contentRoot=/etc/bitwarden/core/attachments /webRoot=. /serveUnknown=true

60
util/MsSql/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...
@ -38,8 +63,7 @@ chown -R $USERNAME:$GROUPNAME /var/opt/mssql
chown $USERNAME:$GROUPNAME /backup-db.sh chown $USERNAME:$GROUPNAME /backup-db.sh
chown $USERNAME:$GROUPNAME /backup-db.sql chown $USERNAME:$GROUPNAME /backup-db.sql
# Sounds like gosu keeps env when switching, but of course cron does not env >> /etc/environment
env > /etc/environment
cron cron
exec gosu $USERNAME:$GROUPNAME /opt/mssql/bin/sqlservr gosu $USERNAME:$GROUPNAME /opt/mssql/bin/sqlservr

57
util/Nginx/entrypoint.sh
View File

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

5
util/Setup/EnvironmentFileBuilder.cs
View File

@ -172,10 +172,7 @@ SA_PASSWORD=SECRET
Helpers.Exec("chmod 600 /bitwarden/env/mssql.override.env"); Helpers.Exec("chmod 600 /bitwarden/env/mssql.override.env");
// Empty uid env file. Only used on Linux hosts. // Empty uid env file. Only used on Linux hosts.
if(!File.Exists("/bitwarden/env/uid.env")) using(var sw = File.CreateText("/bitwarden/env/uid.env")) { }
{
using(var sw = File.CreateText("/bitwarden/env/uid.env")) { }
}
} }
} }
} }

55
util/Setup/entrypoint.sh
View File

@ -5,27 +5,52 @@
GROUPNAME="bitwarden" GROUPNAME="bitwarden"
USERNAME="bitwarden" USERNAME="bitwarden"
LUID=${LOCAL_UID:-0} CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-0} LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ] # Step down from host root
if [ $LGID == 0 ]
then then
LUID=65534 LGID=999
fi
if [ $LGID -eq 0 ]
then
LGID=65534
fi fi
# Create user and group if [ $LUID == 0 ]
then
LUID=999
fi
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || # Create group
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || if [ $CURRENTGID ]
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 then
mkhomedir_helper $USERNAME 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
# The rest... # The rest...