safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1539: fix docker init logic when only auth-json is configured

Browse Source 
This commit fixes an issue where the Docker init-script won't start if only the
auth-json extension is present.
This commit is contained in:
Romain Aviolat
2022-02-17 14:13:59 +01:00
parent 97c37d6681
commit 57db729afb
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
guacamole-docker/bin/start.sh
View File

@@ -1051,24 +1051,6 @@ if [ -n "$SAML_IDP_METADATA_URL" ]; then
INSTALLED_AUTH="$INSTALLED_AUTH saml" INSTALLED_AUTH="$INSTALLED_AUTH saml"
fi fi
#
# Validate that at least one authentication backend is installed
#
if [ -z "$INSTALLED_AUTH" -a -z "$GUACAMOLE_HOME_TEMPLATE" ]; then
cat <<END
FATAL: No authentication configured
-------------------------------------------------------------------------------
The Guacamole Docker container needs at least one authentication mechanism in
order to function, such as a MySQL database, PostgreSQL database, SQLServer
database, LDAP directory or RADIUS server. Please specify at least the
MYSQL_DATABASE or POSTGRES_DATABASE or SQLSERVER_DATABASE environment variables,
or check Guacamole's Docker documentation regarding configuring LDAP and/or
custom extensions.
END
exit 1;
fi
# Use TOTP if specified. # Use TOTP if specified.
if [ "$TOTP_ENABLED" = "true" ]; then if [ "$TOTP_ENABLED" = "true" ]; then
associate_totp associate_totp
@@ -1092,6 +1074,25 @@ fi
# Use json-auth if specified. # Use json-auth if specified.
if [ -n "$JSON_SECRET_KEY" ]; then if [ -n "$JSON_SECRET_KEY" ]; then
associate_json associate_json
INSTALLED_AUTH="$INSTALLED_AUTH json"
fi
#
# Validate that at least one authentication backend is installed
#
if [ -z "$INSTALLED_AUTH" -a -z "$GUACAMOLE_HOME_TEMPLATE" ]; then
cat <<END
FATAL: No authentication configured
-------------------------------------------------------------------------------
The Guacamole Docker container needs at least one authentication mechanism in
order to function, such as a MySQL database, PostgreSQL database, SQLServer
database, LDAP directory or RADIUS server. Please specify at least the
MYSQL_DATABASE or POSTGRES_DATABASE or SQLSERVER_DATABASE environment variables,
or check Guacamole's Docker documentation regarding configuring LDAP and/or
custom extensions.
END
exit 1;
fi fi
# Set extension priority if specified # Set extension priority if specified