admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proxy parameters check only done when proxy is on

Browse Source
This commit is contained in:
Quentin McGaw
2019-09-10 00:10:18 -04:00
parent bea809778b
commit eee538ab52
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
entrypoint.sh
View File

@@ -107,45 +107,49 @@ if [ "$PORT_FORWARDING" == "on" ] && [ -z "$PORT_FORWARDING_STATUS_FILE" ]; then
exit 1 exit 1
fi fi
exitIfNotIn TINYPROXY "on,off" exitIfNotIn TINYPROXY "on,off"
exitIfNotIn TINYPROXY_LOG "Info,Warning,Error,Critical" if [ "$TINYPROXY" == "on" ]; then
if [ -z $TINYPROXY_PORT ]; then exitIfNotIn TINYPROXY_LOG "Info,Warning,Error,Critical"
TINYPROXY_PORT=8888 if [ -z $TINYPROXY_PORT ]; then
fi TINYPROXY_PORT=8888
if [ `echo $TINYPROXY_PORT | grep -E "^[0-9]+$"` != $TINYPROXY_PORT ]; then fi
printf "TINYPROXY_PORT is not a valid number\n" if [ `echo $TINYPROXY_PORT | grep -E "^[0-9]+$"` != $TINYPROXY_PORT ]; then
exit 1 printf "TINYPROXY_PORT is not a valid number\n"
elif [ $TINYPROXY_PORT -lt 1024 ]; then exit 1
printf "TINYPROXY_PORT cannot be a privileged port under port 1024\n" elif [ $TINYPROXY_PORT -lt 1024 ]; then
exit 1 printf "TINYPROXY_PORT cannot be a privileged port under port 1024\n"
elif [ $TINYPROXY_PORT -gt 65535 ]; then exit 1
printf "TINYPROXY_PORT cannot be a port higher than the maximum port 65535\n" elif [ $TINYPROXY_PORT -gt 65535 ]; then
exit 1 printf "TINYPROXY_PORT cannot be a port higher than the maximum port 65535\n"
fi exit 1
if [ ! -z "$TINYPROXY_USER" ] && [ -z "$TINYPROXY_PASSWORD" ]; then fi
printf "TINYPROXY_USER is set but TINYPROXY_PASSWORD is not set\n" if [ ! -z "$TINYPROXY_USER" ] && [ -z "$TINYPROXY_PASSWORD" ]; then
exit 1 printf "TINYPROXY_USER is set but TINYPROXY_PASSWORD is not set\n"
elif [ -z "$TINYPROXY_USER" ] && [ ! -z "$TINYPROXY_PASSWORD" ]; then exit 1
printf "TINYPROXY_USER is not set but TINYPROXY_PASSWORD is set\n" elif [ -z "$TINYPROXY_USER" ] && [ ! -z "$TINYPROXY_PASSWORD" ]; then
exit 1 printf "TINYPROXY_USER is not set but TINYPROXY_PASSWORD is set\n"
exit 1
fi
fi fi
exitIfNotIn SHADOWSOCKS "on,off" exitIfNotIn SHADOWSOCKS "on,off"
exitIfNotIn SHADOWSOCKS_LOG "on,off" if [ "$SHADOWSOCKS" == "on" ]; then
if [ -z $SHADOWSOCKS_PORT ]; then exitIfNotIn SHADOWSOCKS_LOG "on,off"
SHADOWSOCKS_PORT=8388 if [ -z $SHADOWSOCKS_PORT ]; then
fi SHADOWSOCKS_PORT=8388
if [ `echo $SHADOWSOCKS_PORT | grep -E "^[0-9]+$"` != $SHADOWSOCKS_PORT ]; then fi
printf "SHADOWSOCKS_PORT is not a valid number\n" if [ `echo $SHADOWSOCKS_PORT | grep -E "^[0-9]+$"` != $SHADOWSOCKS_PORT ]; then
exit 1 printf "SHADOWSOCKS_PORT is not a valid number\n"
elif [ $SHADOWSOCKS_PORT -lt 1024 ]; then exit 1
printf "SHADOWSOCKS_PORT cannot be a privileged port under port 1024\n" elif [ $SHADOWSOCKS_PORT -lt 1024 ]; then
exit 1 printf "SHADOWSOCKS_PORT cannot be a privileged port under port 1024\n"
elif [ $SHADOWSOCKS_PORT -gt 65535 ]; then exit 1
printf "SHADOWSOCKS_PORT cannot be a port higher than the maximum port 65535\n" elif [ $SHADOWSOCKS_PORT -gt 65535 ]; then
exit 1 printf "SHADOWSOCKS_PORT cannot be a port higher than the maximum port 65535\n"
fi exit 1
if [ -z $SHADOWSOCKS_PASSWORD ]; then fi
printf "SHADOWSOCKS_PASSWORD is not set\n" if [ -z $SHADOWSOCKS_PASSWORD ]; then
exit 1 printf "SHADOWSOCKS_PASSWORD is not set\n"
exit 1
fi
fi fi
############################################ ############################################
@@ -447,7 +451,6 @@ fi
############################################ ############################################
if [ "$SHADOWSOCKS" == "on" ]; then if [ "$SHADOWSOCKS" == "on" ]; then
ARGS="-c /etc/shadowsocks.json" ARGS="-c /etc/shadowsocks.json"
# add -d 127.0.0.1 for DNS?
if [ "$SHADOWSOCKS_LOG" == " on" ]; then if [ "$SHADOWSOCKS_LOG" == " on" ]; then
printf "[INFO] Setting ShadowSocks logging..." printf "[INFO] Setting ShadowSocks logging..."
ARGS="$ARGS -v" ARGS="$ARGS -v"