From 31c7c019cb3c0678eeac4935cf770d7919587398 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 30 Aug 2021 14:04:48 +0200
Subject: [PATCH 1/3] Fix piping to pihole tricorder

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 pihole | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pihole b/pihole
index e8fa9317..1fba6f4d 100755
--- a/pihole
+++ b/pihole
@@ -404,29 +404,10 @@ tricorderFunc() {
     exit 1
   fi
 
-  if ! (echo > /dev/tcp/tricorder.pi-hole.net/9998) >/dev/null 2>&1; then
-    echo -e "  ${CROSS} Unable to connect to Pi-hole's Tricorder server"
-    exit 1
-  fi
-
-  if command -v openssl &> /dev/null; then
-    openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin
-    exit "$?"
-  else
-    echo -e "  ${INFO} ${COL_YELLOW}Security Notice${COL_NC}: ${COL_WHITE}openssl${COL_NC} is not installed
-       Your debug log will be transmitted unencrypted via plain-text
-       There is a possibility that this could be intercepted by a third party
-       If you wish to cancel, press Ctrl-C to exit within 10 seconds"
-    secs="10"
-    while [[ "$secs" -gt "0" ]]; do
-       echo -ne "."
-       sleep 1
-       : $((secs--))
-    done
-    echo " "
-    nc tricorder.pi-hole.net 9999 < /dev/stdin
-    exit "$?"
-  fi
+  curl --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin
+  ret=$?
+  echo ""
+  exit $ret
 }
 
 updateCheckFunc() {

From 21897d7fbd1b7b9d2e3bab3fa94c29fd63625367 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 30 Aug 2021 15:55:42 +0200
Subject: [PATCH 2/3] Add warning if curl failed

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/piholeDebug.sh |  1 -
 pihole                          | 12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 26ef61fa..4e2a1ca8 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1336,7 +1336,6 @@ curl_to_tricorder() {
     # transmit he log via TLS and store the token returned in a variable
     tricorder_token=$(curl --silent --upload-file ${PIHOLE_DEBUG_LOG} https://tricorder.pi-hole.net)
     if [ -z "${tricorder_token}" ]; then
-        # curl failed, fallback to nc
         log_write "    * ${COL_GREEN}curl${COL_NC} failed, contact Pi-hole support for assistance."
     fi
 }
diff --git a/pihole b/pihole
index 1fba6f4d..e7a6978b 100755
--- a/pihole
+++ b/pihole
@@ -399,15 +399,19 @@ Branches:
 }
 
 tricorderFunc() {
+  local tricorder_token
   if [[ ! -p "/dev/stdin" ]]; then
     echo -e "  ${INFO} Please do not call Tricorder directly"
     exit 1
   fi
 
-  curl --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin
-  ret=$?
-  echo ""
-  exit $ret
+  tricorder_token="$(curl --silent --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin)"
+  if [ -z "${tricorder_token}" ]; then
+        echo -e "${CROSS} uploading failed failed, contact Pi-hole support for assistance."
+        exit 1
+  fi
+  echo "Upload successful, your token is: ${COL_BLUE}${tricorder_token}${COL_NC}"
+  exit 0
 }
 
 updateCheckFunc() {

From 115e3eeda9098e3d3499dfcedf6154b8ce77c78b Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 30 Aug 2021 20:20:45 +0200
Subject: [PATCH 3/3] Use --no-progress-meter instead of --silent so error
 reasons are printed

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 pihole | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole b/pihole
index e7a6978b..7b1d5404 100755
--- a/pihole
+++ b/pihole
@@ -405,9 +405,9 @@ tricorderFunc() {
     exit 1
   fi
 
-  tricorder_token="$(curl --silent --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin)"
+  tricorder_token="$(curl --no-progress-meter --upload-file "-" https://tricorder.pi-hole.net/upload < /dev/stdin)"
   if [ -z "${tricorder_token}" ]; then
-        echo -e "${CROSS} uploading failed failed, contact Pi-hole support for assistance."
+        echo -e "${CROSS} uploading failed, contact Pi-hole support for assistance."
         exit 1
   fi
   echo "Upload successful, your token is: ${COL_BLUE}${tricorder_token}${COL_NC}"