From a8e9fcb3630ebdcc92d895a6d8bf3e1c9a588a35 Mon Sep 17 00:00:00 2001
From: Timo <6674623+underhood@users.noreply.github.com>
Date: Wed, 25 Mar 2020 09:17:51 +0100
Subject: HTTP proxy support + some cleanup (#8418)

* HTTP proxy support + some cleanup

* fix unrelated compiler warnings with -Wextra

* minor - log proxy setting

* run changed code trough .clang-format

* fix case when url ends by /

* update README
---
 claim/claim.c             | 4 ++--
 claim/netdata-claim.sh.in | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'claim')

diff --git a/claim/claim.c b/claim/claim.c
index 0ecc0b712c..a3c947fd93 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -64,9 +64,9 @@ void claim_agent(char *claiming_arguments)
     ACLK_PROXY_TYPE proxy_type;
     char proxy_flag[CLAIMING_PROXY_LENGTH] = "-noproxy";
 
-    proxy_str = aclk_lws_wss_get_proxy_setting(&proxy_type);
+    proxy_str = aclk_get_proxy(&proxy_type);
 
-    if(proxy_type == PROXY_TYPE_SOCKS5)
+    if (proxy_type == PROXY_TYPE_SOCKS5 || proxy_type == PROXY_TYPE_HTTP)
         snprintf(proxy_flag, CLAIMING_PROXY_LENGTH, "-proxy=\"%s\"", proxy_str);
 
     snprintfz(command_buffer,
diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in
index 6284868aa7..aef8de4b63 100755
--- a/claim/netdata-claim.sh.in
+++ b/claim/netdata-claim.sh.in
@@ -129,7 +129,7 @@ do
                 -hostname=*) HOSTNAME=${arg:10} ;;
                 -verbose) VERBOSE=1 ;;
                 -insecure) INSECURE=1 ;;
-                -proxy=socks*) PROXY=${arg:7} ;;
+                -proxy=*) PROXY=${arg:7} ;;
                 -noproxy) NOPROXY=yes ;;
                 *)  echo >&2 "Unknown argument ${arg}"
                     exit 1 ;;
@@ -148,6 +148,7 @@ echo >&2 "Base URL: $URL_BASE"
 echo >&2 "Id: $ID"
 echo >&2 "Rooms: $ROOMS"
 echo >&2 "Hostname: $HOSTNAME"
+echo >&2 "Proxy: $PROXY"
 
 # create the claiming directory for this user
 if [ ! -d "${CLAIMING_DIR}" ] ; then
@@ -214,6 +215,8 @@ else
         --body-file=\"${CLAIMING_DIR}/tmpin.txt\""
         if [ "${NOPROXY}" = "yes" ] ; then
                 URLCOMMAND="${URLCOMMAND} --no-proxy"
+        elif [ "${PROXY:0:4}" = http ] ; then
+                URLCOMMAND="export http_proxy=${PROXY}; ${URLCOMMAND}"
         fi
 fi
 
-- 
cgit v1.2.3