samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redo proxy, set HTTPS_PROXY_HOST and HTTPS_PROXY_PORT

This commit is contained in:
lablans 2023-10-24 07:01:22 +00:00
parent e0990d99cb
commit f008b18760
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/functions.sh
View File

@ -10,28 +10,21 @@ detectCompose() {
} }
setupProxy() { setupProxy() {
### Note: As the current data protection concepts do not allow communication via HTTP, this ### Note: As the current data protection concepts do not allow communication via HTTP,
### handling of a proxy for HTTP requests is commented out and will not be used ### we are not setting a proxy for HTTP requests.
#
http="no"
# if [ $HTTP_PROXY_URL ]; then
# if [[ ! -z "$HTTP_PROXY_USERNAME" && ! -z "$HTTP_PROXY_PASSWORD" ]]; then
# proto="$(echo $HTTP_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
# fqdn="$(echo ${HTTP_PROXY_URL/$proto/})"
# HTTP_PROXY_FULL_URL="$(echo $proto$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$fqdn)"
# http="authenticated"
# else
# HTTP_PROXY_FULL_URL=$HTTP_PROXY_URL
# http="unauthenticated"
# fi
# fi
https="no" local http="no"
local https="no"
if [ $HTTPS_PROXY_URL ]; then if [ $HTTPS_PROXY_URL ]; then
if [[ ! -z "$HTTPS_PROXY_USERNAME" && ! -z "$HTTPS_PROXY_PASSWORD" ]]; then if [[ ! -z "$HTTPS_PROXY_USERNAME" && ! -z "$HTTPS_PROXY_PASSWORD" ]]; then
proto="$(echo $HTTPS_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')" local proto="$(echo $HTTPS_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
fqdn="$(echo ${HTTPS_PROXY_URL/$proto/})" local fqdn="$(echo ${HTTPS_PROXY_URL/$proto/})"
HTTPS_PROXY_FULL_URL="$(echo $proto$HTTPS_PROXY_USERNAME:$HTTPS_PROXY_PASSWORD@$fqdn)" HTTPS_PROXY_FULL_URL="$(echo $proto$HTTPS_PROXY_USERNAME:$HTTPS_PROXY_PASSWORD@$fqdn)"
local hostport=$(echo $HTTPS_PROXY_URL | sed -e s,$proto,,g | cut -d/ -f1)
HTTPS_PROXY_HOST="$(echo $hostport | sed -e 's,:.*,,g')"
HTTPS_PROXY_PORT="$(echo $hostport | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g')"
https="authenticated" https="authenticated"
else else
HTTPS_PROXY_FULL_URL=$HTTPS_PROXY_URL HTTPS_PROXY_FULL_URL=$HTTPS_PROXY_URL
@ -39,8 +32,7 @@ setupProxy() {
fi fi
fi fi
log INFO "Configuring proxy servers: $http http proxy, $https https proxy" log INFO "Configuring proxy servers: $http http proxy (we're not supporting unencrypted comms), $https https proxy"
unset http https fqdn proto
} }
exitIfNotRoot() { exitIfNotRoot() {