From df25f73fdbd39f5c1952594da926f433ca1a0e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Fri, 12 Nov 2021 10:15:41 +0100
Subject: [PATCH] improve setproxy

* add function urlencode
* urlencode credentials
* make socks5-proxy possible
* add no_proxy
---
 functions.sh | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index c1ca385..abc6281 100755
--- a/functions.sh
+++ b/functions.sh
@@ -107,6 +107,7 @@ setproxy () {
                 return 1
             else
                 CONFIG=$(find ${SETPROXY_CREDS_DIRS[*]} -mindepth 1 -name "$1.conf" -print -quit 2>/dev/null )
+                NO_PROXY=$(find ${SETPROXY_CREDS_DIRS[*]} -mindepth 1 -name "no_proxy.conf" -print -quit 2>/dev/null )
             fi
          ;;
     esac
@@ -114,16 +115,25 @@ setproxy () {
     logwarn "CONFIG: ${CONFIG}"
 
     if [ -e ${CONFIG} ]; then
-        loginfo -n "${CONFIG} existing: "
+        logdebug -n "${CONFIG} existing: "
         source "${CONFIG}"
-        loginfo "sourced"
-        export PROXY_CREDS="${PROXY_USER}:${PROXY_PASS}@"
+        loginfo "read $CONFIG"
+        export PROXY_CREDS="$(urlencode ${PROXY_USER})${PROXY_PASS:+:}$(urlencode ${PROXY_PASS})"
     else
         loginfo "${CONFIG} not existing"
-        export PROXY_CREDS=""
+#        export PROXY_CREDS=""
     fi
-    export {http,https,ftp}_proxy="http://${PROXY_CREDS}${PROXY_SERVER}:${PROXY_PORT}"
-    export {HTTP,HTTPS,FTP}_PROXY="http://${PROXY_CREDS}${PROXY_SERVER}:${PROXY_PORT}"
+    export {http,https,ftp}_proxy="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}"
+    export {HTTP,HTTPS,FTP}_PROXY="${PROXY_PROTO:-http}://${PROXY_CREDS}${PROXY_CREDS:+@}${PROXY_SERVER}${PROXY_PORT:+:}${PROXY_PORT}"
+    no_proxy="127.0.0.1,localhost"
+    #no_proxy=$no_proxy,$(echo 10.{0..255}.{0..255}.{0..255}|tr ' ' ',')
+    #no_proxy=$no_proxy,$(echo 172.{16..31}.{0..255}.{0..255}|tr ' ' ',')
+    #no_proxy=$no_proxy,$(echo 192.168.{0..255}.{0..255}|tr ' ' ',')
+    no_proxy=${no_proxy}${PROXY_IGNORE:+,}${PROXY_IGNORE}
+    . $NO_PROXY
+    
+    export no_proxy
+
     EXIT
 }
 
@@ -1113,4 +1123,27 @@ function connectdb () {
 
     PGPASSWORD=$DB_PWD psql -h $DB_HOST -p $DB_PORT -U $DB_USER $DB_NAME
 }
+
+
+urlencode() {
+    # urlencode <string>
+
+    local LANG=C
+    local length="${#1}"
+    for (( i = 0; i < length; i++ )); do
+        local c="${1:i:1}"
+        case $c in
+            [a-zA-Z0-9.~_-]) printf "$c" ;;
+            *) printf '%%%02X' "'$c" ;; 
+        esac
+    done
+}
+
+urldecode() {
+    # urldecode <string>
+
+    local url_encoded="${1//+/ }"
+    printf '%b' "${url_encoded//%/\\x}"
+}
+
 #EOF