tyler.durden
/
lynis
mirror of https://github.com/CISOfy/lynis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added details to logging if upload fails

This commit is contained in:
mboelen 2015-11-22 19:35:34 +01:00
parent 391f67e7c2
commit c3054de0fe
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/data_upload
View File

@ -93,14 +93,18 @@ output "Settings file: ${SETTINGS_FILE}"
UPLOAD=`${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "collector_version=${PROGRAM_VERSION}" ${LICENSE_SERVER_URL} 2> /dev/null` UPLOAD=`${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "collector_version=${PROGRAM_VERSION}" ${LICENSE_SERVER_URL} 2> /dev/null`
EXITCODE=$? EXITCODE=$?
if [ ${EXITCODE} -gt 0 ]; then if [ ${EXITCODE} -gt 0 ]; then
if [ ${EXITCODE} -eq 60 ]; then if [ ${EXITCODE} -eq 7 ]; then
logtext "Result: could not contact license server."
logtext "Details: used URL ${LICENSE_SERVER_URL}"
logtext "Suggestion: check if the upload host is correctly configured."
elif [ ${EXITCODE} -eq 60 ]; then
echo "${RED}Self-signed certificate used on Lynis Enterprise node${NORMAL}" echo "${RED}Self-signed certificate used on Lynis Enterprise node${NORMAL}"
echo "If you want to accept a self-signed certificate, use the -k option in the profile." echo "If you want to accept a self-signed certificate, use the -k option in the profile."
echo "Example: ${WHITE}config:upload_options:-k:${NORMAL}" echo "Example: ${WHITE}config:upload_options:-k:${NORMAL}"
logtext "Result: found self-signed certificate, however cURL -k option not used." logtext "Result: found self-signed certificate, however cURL -k option not used."
else else
echo "${RED}Upload Error: ${NORMAL}cURL exited with code ${EXITCODE}" echo "${RED}Upload Error: ${NORMAL}cURL exited with code ${EXITCODE}. See ${LOGFILE} for details."
logtext "Result: cURL exited with code ${EXITCODE}" logtext "Result: cURL exited with code ${EXITCODE}."
fi fi
logtext "Result: quitting, can't check license" logtext "Result: quitting, can't check license"
ExitFatal ExitFatal