MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-07-18 05:02:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added trustedproxy to dynamic config feature.

Browse Source
This commit is contained in:
Daan Selen 2025-03-25 15:12:58 +01:00
parent 910f12c25a
commit db7eacbca3
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile
View File

@ -58,7 +58,7 @@ ENV REGEN_SESSIONKEY="false"
ENV REVERSE_PROXY="" ENV REVERSE_PROXY=""
ENV REVERSE_PROXY_TLS_PORT="443" ENV REVERSE_PROXY_TLS_PORT="443"
ENV WEBRTC="false" ENV WEBRTC="false"
ENV TRUSTED_PROXY=""
# MongoDB Variables # MongoDB Variables
ARG INCLUDE_MONGODB_TOOLS="false" ARG INCLUDE_MONGODB_TOOLS="false"

26
docker/entrypoint.sh
View File

@ -106,7 +106,7 @@ if [[ "$DYNAMIC_CONFIG" =~ ^(true|yes)$ ]]; then
fi fi
# HOSTNAME # HOSTNAME
if [[ -n $HOSTNAME ]] && [[ $HOSTNAME =~ ^[a-zA-Z0-9-]+$ ]]; then if [[ -n $HOSTNAME ]]; then
echo "Setting hostname (cert)... $HOSTNAME" echo "Setting hostname (cert)... $HOSTNAME"
jq --arg hostname "$HOSTNAME" \ jq --arg hostname "$HOSTNAME" \
@ -159,6 +159,26 @@ if [[ "$DYNAMIC_CONFIG" =~ ^(true|yes)$ ]]; then
sed -i 's/"AllowFraming":/"_AllowFraming":/g' "$CONFIG_FILE" sed -i 's/"AllowFraming":/"_AllowFraming":/g' "$CONFIG_FILE"
fi fi
# trustedProxy
if [[ -n $TRUSTED_PROXY ]]; then
echo "Setting trustedProxy... - $REVERSE_PROXY_STRING"
if [[ $TRUSTED_PROXY == "all" ]]; then
sed -i 's/"_trustedProxy"/"trustedProxy"/' "$CONFIG_FILE"
jq --argjson trusted_proxy "true" \
'.settings.trustedProxy = $trusted_proxy' \
"$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
else
sed -i 's/"_trustedProxy"/"trustedProxy"/' "$CONFIG_FILE"
jq --argjson trusted_proxy "$TRUSTED_PROXY" \
'.settings.trustedProxy = $trusted_proxy' \
"$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
fi
else
echo "Invalid or no REVERSE_PROXY and/or REVERSE_PROXY_TLS_PORT value given, commenting out so default applies... Value(s) given: $REVERSE_PROXY_STRING"
sed -i 's/"certUrl":/"_certUrl":/g' "$CONFIG_FILE"
fi
# ALLOW_NEW_ACCOUNTS # ALLOW_NEW_ACCOUNTS
if [[ -n $ALLOW_NEW_ACCOUNTS ]] && [[ $ALLOW_NEW_ACCOUNTS =~ ^(true|false)$ ]]; then if [[ -n $ALLOW_NEW_ACCOUNTS ]] && [[ $ALLOW_NEW_ACCOUNTS =~ ^(true|false)$ ]]; then
echo "Setting NewAccounts... $ALLOW_NEW_ACCOUNTS" echo "Setting NewAccounts... $ALLOW_NEW_ACCOUNTS"
@ -190,7 +210,7 @@ if [[ "$DYNAMIC_CONFIG" =~ ^(true|yes)$ ]]; then
echo "Setting minify... $MINIFY" echo "Setting minify... $MINIFY"
sed -i 's/"_minify"/"minify"/' "$CONFIG_FILE" sed -i 's/"_minify"/"minify"/' "$CONFIG_FILE"
jq --arg minify "$MINIFY" \ jq --argjson minify "$MINIFY" \
'.domains[""].minify = $minify' \ '.domains[""].minify = $minify' \
"$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE" "$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
#sed -i "s/\"minify\": *[a-z]*/\"minify\": $MINIFY/" "$CONFIG_FILE" #sed -i "s/\"minify\": *[a-z]*/\"minify\": $MINIFY/" "$CONFIG_FILE"
@ -204,7 +224,7 @@ if [[ "$DYNAMIC_CONFIG" =~ ^(true|yes)$ ]]; then
echo "Setting allowedOrigin... $ALLOWED_ORIGIN" echo "Setting allowedOrigin... $ALLOWED_ORIGIN"
sed -i 's/"_allowedOrigin"/"allowedOrigin"/' "$CONFIG_FILE" sed -i 's/"_allowedOrigin"/"allowedOrigin"/' "$CONFIG_FILE"
jq --arg allowed_origin "$ALLOWED_ORIGIN" \ jq --argjson allowed_origin "$ALLOWED_ORIGIN" \
'.domains[""].allowedOrigin = $allowed_origin' \ '.domains[""].allowedOrigin = $allowed_origin' \
"$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE" "$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
else else