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

Merge 1.5.0 changes back to master.

Browse Source
This commit is contained in:
Mike Jumper
2023-01-22 09:33:31 -08:00
parent 44d53a21b0 9a587a16eb
commit f194ca6367
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,17 +749,18 @@ END
## authentication provider, and configure it to connect to the specified SAML ## authentication provider, and configure it to connect to the specified SAML
## provider. ## provider.
## ##
associate_saml() { associate_saml() {
# Verify required parameters are present # Verify required parameters are present
if [ -z "$SAML_IDP_METADATA_URL" ] && \ if [ -z "$SAML_IDP_METADATA_URL" ] && \
[ -z "$SAML_ENTITY_ID" -o -z "$SAML_CALLBACK_URL" ] [ -z "$SAML_ENTITY_ID" -o -z "$SAML_CALLBACK_URL" -o -z "$SAML_IDP_URL" ]
then then
cat <<END cat <<END
FATAL: Missing required environment variables FATAL: Missing required environment variables
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
If using a SAML authentication, you must provide either SAML_IDP_METADATA_URL If using a SAML authentication, you must provide either SAML_IDP_METADATA_URL
or both SAML_ENTITY_ID and SAML_CALLBACK_URL environment variables: or SAML_IDP_URL, SAML_ENTITY_ID and SAML_CALLBACK_URL environment variables:
SAML_IDP_METADATA_URL The URI of the XML metadata file that from the SAML Identity SAML_IDP_METADATA_URL The URI of the XML metadata file that from the SAML Identity
Provider that contains all of the information the SAML Provider that contains all of the information the SAML
@@ -767,8 +768,11 @@ or both SAML_ENTITY_ID and SAML_CALLBACK_URL environment variables:
the IdP. This URI can either be a remote server (e.g. https://) the IdP. This URI can either be a remote server (e.g. https://)
or a local file on the filesystem (e.g. file://). or a local file on the filesystem (e.g. file://).
SAML_IDP_URL The URL of the Identity Provider (IdP), which the user
will be redirected to in order to authenticate.
SAML_ENTITY_ID The entity ID of the Guacamole SAML client, which is SAML_ENTITY_ID The entity ID of the Guacamole SAML client, which is
generally the URL of the Guacamole server generally the URL of the Guacamole server.
SAML_CALLBACK_URL The URL that the IdP will use once authentication has SAML_CALLBACK_URL The URL that the IdP will use once authentication has
succeeded to return to the Guacamole web application and succeeded to return to the Guacamole web application and