nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-20 04:28:13 -05:00
Code

fix: rm redundant copy to avoid permission errors for non-"app" user

Browse Source
This commit is contained in:
tangowithfoxtrot 2025-03-06 06:50:30 -08:00
parent b0c60ea7ef
commit db2f3e95e1
No known key found for this signature in database
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitwarden_license/src/Scim/entrypoint.sh
View File

@ -59,16 +59,9 @@ if [[ -f "/etc/bitwarden/kerberos/bitwarden.keytab" && -f "/etc/bitwarden/kerber
fi fi
if [[ $globalSettings__selfHosted == "true" ]]; then if [[ $globalSettings__selfHosted == "true" ]]; then
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \
{
# infer a non-root location for the certificate
if [[ -z $globalSettings__identityServer__certificateLocation ]]; then if [[ -z $globalSettings__identityServer__certificateLocation ]]; then
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx export globalSettings__identityServer__certificateLocation=/etc/bitwarden/identity/identity.pfx
fi fi
# copy the certificate to the non-root location to avoid permission issues
mkdir -p "$(dirname "$globalSettings__identityServer__certificateLocation")"
cp /etc/bitwarden/identity/identity.pfx "$globalSettings__identityServer__certificateLocation"
}
fi fi
exec $gosu_cmd /app/"${PROJECT_NAME}" exec $gosu_cmd /app/"${PROJECT_NAME}"

9
bitwarden_license/src/Sso/entrypoint.sh
View File

@ -59,16 +59,9 @@ if [[ -f "/etc/bitwarden/kerberos/bitwarden.keytab" && -f "/etc/bitwarden/kerber
fi fi
if [[ $globalSettings__selfHosted == "true" ]]; then if [[ $globalSettings__selfHosted == "true" ]]; then
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \
{
# infer a non-root location for the certificate
if [[ -z $globalSettings__identityServer__certificateLocation ]]; then if [[ -z $globalSettings__identityServer__certificateLocation ]]; then
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx export globalSettings__identityServer__certificateLocation=/etc/bitwarden/identity/identity.pfx
fi fi
# copy the certificate to the non-root location to avoid permission issues
mkdir -p "$(dirname "$globalSettings__identityServer__certificateLocation")"
cp /etc/bitwarden/identity/identity.pfx "$globalSettings__identityServer__certificateLocation"
}
fi fi
exec $gosu_cmd /app/"${PROJECT_NAME}" exec $gosu_cmd /app/"${PROJECT_NAME}"

9
src/Identity/entrypoint.sh
View File

@ -59,16 +59,9 @@ if [[ -f "/etc/bitwarden/kerberos/bitwarden.keytab" && -f "/etc/bitwarden/kerber
fi fi
if [[ $globalSettings__selfHosted == "true" ]]; then if [[ $globalSettings__selfHosted == "true" ]]; then
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \
{
# infer a non-root location for the certificate
if [[ -z $globalSettings__identityServer__certificateLocation ]]; then if [[ -z $globalSettings__identityServer__certificateLocation ]]; then
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx export globalSettings__identityServer__certificateLocation=/etc/bitwarden/identity/identity.pfx
fi fi
# copy the certificate to the non-root location to avoid permission issues
mkdir -p "$(dirname "$globalSettings__identityServer__certificateLocation")"
cp /etc/bitwarden/identity/identity.pfx "$globalSettings__identityServer__certificateLocation"
}
fi fi
exec $gosu_cmd /app/"${PROJECT_NAME}" exec $gosu_cmd /app/"${PROJECT_NAME}"