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

fix: avoid breaking changes by falling back to copying the identity cert to a location that doesn't require root

Browse Source
This commit is contained in:
tangowithfoxtrot 2025-03-04 12:52:51 -08:00
parent bebb8a4ab9
commit faf9befdf5
No known key found for this signature in database
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,4 +58,17 @@ if [[ -f "/etc/bitwarden/kerberos/bitwarden.keytab" && -f "/etc/bitwarden/kerber
$gosu_cmd kinit $globalSettings__kerberosUser -k -t /etc/bitwarden/kerberos/bitwarden.keytab $gosu_cmd kinit $globalSettings__kerberosUser -k -t /etc/bitwarden/kerberos/bitwarden.keytab
fi fi
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
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx
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
exec $gosu_cmd /app/"${PROJECT_NAME}" exec $gosu_cmd /app/"${PROJECT_NAME}"

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

@ -60,9 +60,15 @@ fi
if [[ $globalSettings__selfHosted == "true" ]]; then if [[ $globalSettings__selfHosted == "true" ]]; then
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \ cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \
if [[ -z $globalSettings__identityServer__certificateLocation ]]; then {
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx # infer a non-root location for the certificate
fi if [[ -z $globalSettings__identityServer__certificateLocation ]]; then
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx
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}"

12
src/Identity/entrypoint.sh
View File

@ -60,9 +60,15 @@ fi
if [[ $globalSettings__selfHosted == "true" ]]; then if [[ $globalSettings__selfHosted == "true" ]]; then
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \ cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx || \
if [[ -z $globalSettings__identityServer__certificateLocation ]]; then {
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx # infer a non-root location for the certificate
fi if [[ -z $globalSettings__identityServer__certificateLocation ]]; then
export globalSettings__identityServer__certificateLocation=/home/app/config/identity.pfx
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}"