From 000077d3791041311bcaf047fc4d3acf033a27e2 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 30 May 2016 17:06:14 +0200
Subject: [PATCH] Added more tips when cURL has issues uploading the data

---
 include/data_upload | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/include/data_upload b/include/data_upload
index 977eefb8..f21d01be 100644
--- a/include/data_upload
+++ b/include/data_upload
@@ -134,38 +134,46 @@
                         LogText "Result: could not initialize"
                         LogText "Possible cause: most likely your cURL version is too old and does not support the --data-urlencode option."
                         LogText "Suggestion: copy the data to a different server and use a new cURL version there, or use the Lynis Collector tool."
-                        echo "${RED}Error${NORMAL}: could not initialize cURL. See ${LOGFILE} for details."
+                        echo "${RED}Error (2)${NORMAL}: could not initialize cURL. See ${LOGFILE} for details."
                         ;;
                     5)
                         LogText "Result: could not resolve the defined proxy server (${UPLOAD_PROXY_SERVER})."
                         LogText "Suggestion: check if the proxy is properly defined in the profile."
-                        echo "${RED}Error${NORMAL}: could not use the defined proxy (${UPLOAD_PROXY_SERVER}). See ${LOGFILE} for details."
+                        echo "${RED}Error (5)${NORMAL}: could not use the defined proxy (${UPLOAD_PROXY_SERVER}). See ${LOGFILE} for details."
                         ;;
                     6)
-                        echo "${YELLOW}Error (6): ${NORMAL}Could not resolve the hostname of central server."
+                        echo "${RED}Error (6)${NORMAL}: Could not resolve the hostname of central server."
                         ;;
                     7)
                         LogText "Result: could not contact license server."
                         LogText "Details: used URL ${LICENSE_SERVER_URL}"
                         LogText "Suggestion: check if the upload host is correctly configured."
-                        echo "${RED}Error${NORMAL}: license server not available. See ${LOGFILE} for details."
+                        echo "${RED}Error (7)${NORMAL}: license server not available. See ${LOGFILE} for details."
                         ;;
                     59)
-                        echo "${YELLOW}Error (59): ${NORMAL}Could not connect because of used SSL cipher."
+                        echo "${RED}Error (59)${NORMAL}: Could not connect because of used SSL cipher."
                         LogText "Result: SSL cipher used is not understood or accepted."
                         ;;
                     60)
-                        echo "${RED}Self-signed certificate used on Lynis Enterprise node${NORMAL}"
+                        echo "${RED}Error (60)${NORMAL}: Self-signed certificate used on Lynis Enterprise node${NORMAL}"
                         echo "If you want to accept a self-signed certificate, configure your profile and set the -k option in the upload-options."
                         echo "Example: ${WHITE}$0 configure settings upload-options=-k${NORMAL}"
                         LogText "Result: found self-signed certificate, however cURL -k option not used."
                         ;;
-                    83) echo "${YELLOW}Error (83): ${NORMAL}Could not check used certificate of server." ;;
+                    77)
+                        echo "${YELLOW}Error (77)${NORMAL}: Could not use CA certificates to check certificate chain. See ${LOGFILE} for details."
+                        LogText "Result: could not use CA certificates to check certificate chain"
+                        LogText "Possible cause: missing CA certificates, or no permissions to access them"
+                        LogText "Suggestion: update your ca-certificates package. Usually updating your packages already solves the issue with missing CA certificates."
+                        ;;
+                    83)
+                        echo "${YELLOW}Error (83)${NORMAL}: Could not check used certificate of server. See ${LOGFILE} for details." ;;
                     *)
                         echo "${RED}Upload Error: ${NORMAL}cURL exited with code ${EXITCODE}. See ${LOGFILE} for details."
                         LogText "Result: cURL exited with code ${EXITCODE}. See man page of cURL for the meaning of this code."
                         ;;
             esac
+            LogText "Suggestion: run the cURL command manually without the options -s and -S"
             LogText "Result: quitting, can't check license"
             ExitFatal
         fi