tyler.durden/lynis
1
0
Fork 0
mirror of https://github.com/CISOfy/lynis.git synced 2025-07-25 14:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added more text output for data uploads

Browse Source
This commit is contained in:
Michael Boelen 2019-08-08 12:38:25 +02:00
parent c86e24fced
commit b9fa5bce14
No known key found for this signature in database
GPG Key ID: 26141F77A09D7F04
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/data_upload
View File

@ -22,6 +22,8 @@
# #
################################################################################# #################################################################################
# #
InsertSection "${SECTION_DATA_UPLOAD}"
PROGRAM_VERSION="105" PROGRAM_VERSION="105"
# Data upload destination # Data upload destination
@ -95,7 +97,6 @@
Output "${WHITE}Report file found.${NORMAL} Starting with connectivity check." Output "${WHITE}Report file found.${NORMAL} Starting with connectivity check."
if [ ! "${UPLOAD_PROXY_SERVER}" = "" ]; then if [ ! "${UPLOAD_PROXY_SERVER}" = "" ]; then
LogText "Upload: Proxy is configured: ${UPLOAD_SERVER}" LogText "Upload: Proxy is configured: ${UPLOAD_SERVER}"
# Port is optional # Port is optional
@ -125,16 +126,17 @@
# CURL_OPTIONS="${CURL_OPTIONS} --compressed -H 'Content-Encoding: gzip'" # CURL_OPTIONS="${CURL_OPTIONS} --compressed -H 'Content-Encoding: gzip'"
#fi #fi
# Quit if license is not valid, to reduce load on both client and server.
# License check
LogText "Command used: ${CURLBINARY}${CURL_OPTIONS} -s -S --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "collector_version=${PROGRAM_VERSION}" ${LICENSE_SERVER_URL} 2> /dev/null" LogText "Command used: ${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) 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=$?
LogText "Exit code: ${EXITCODE}" LogText "Exit code: ${EXITCODE}"
if [ ${EXITCODE} -gt 0 ]; then if [ ${EXITCODE} -gt 0 ]; then
echo "" Display --indent 2 --text "- License check" --result "FAILED" --color RED
echo "${RED}Upload Error${NORMAL}: License could not be checked. See ${LOGFILE} for details."
echo "Suggested command: tail -n 20 ${LOGFILE}"
echo "" echo ""
case ${EXITCODE} in case ${EXITCODE} in
@ -142,7 +144,7 @@
LogText "Result: could not initialize" 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 "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." 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 (2)${NORMAL}: could not initialize cURL. See ${LOGFILE} for details." echo "${RED}Error (2)${NORMAL}: could not initialize cURL."
;; ;;
5) 5)
LogText "Result: could not resolve the defined proxy server (${UPLOAD_PROXY_SERVER})." LogText "Result: could not resolve the defined proxy server (${UPLOAD_PROXY_SERVER})."
@ -156,7 +158,7 @@
LogText "Result: could not contact license server." LogText "Result: could not contact license server."
LogText "Details: used URL ${LICENSE_SERVER_URL}" LogText "Details: used URL ${LICENSE_SERVER_URL}"
LogText "Suggestion: check if the upload host is correctly configured." LogText "Suggestion: check if the upload host is correctly configured."
echo "${RED}Error (7)${NORMAL}: license server not available. See ${LOGFILE} for details." echo "${RED}Error (7)${NORMAL}: license server not available."
;; ;;
59) 59)
echo "${RED}Error (59)${NORMAL}: Could not connect because of used SSL cipher." echo "${RED}Error (59)${NORMAL}: Could not connect because of used SSL cipher."
@ -181,14 +183,23 @@
LogText "Result: cURL exited with code ${EXITCODE}. See man page of cURL for the meaning of this code." LogText "Result: cURL exited with code ${EXITCODE}. See man page of cURL for the meaning of this code."
;; ;;
esac esac
echo ""
echo "${RED}Upload Error${NORMAL}: License could not be checked. See ${LOGFILE} for details."
echo "Suggested command: tail -n 20 ${LOGFILE}"
echo ""
LogText "Suggestion: run the cURL command manually without the options -s and -S" LogText "Suggestion: run the cURL command manually without the options -s and -S"
LogText "Result: quitting, can't check license" LogText "Result: quitting, can't check license"
# Quit if license is not valid, to reduce load on both client and server.
ExitFatal ExitFatal
fi fi
UPLOAD_CODE=$(echo ${UPLOAD} | head -n 1 | awk '{ if ($1=="Response") { print $2 }}') UPLOAD_CODE=$(echo ${UPLOAD} | head -n 1 | awk '{ if ($1=="Response") { print $2 }}')
if [ "${UPLOAD_CODE}" = "100" ]; then if [ "${UPLOAD_CODE}" = "100" ]; then
Output "${WHITE}License is valid${NORMAL}" Output "${WHITE}License is valid${NORMAL}"
LogText "Result: license is valid" LogText "Result: license is valid"
Display --indent 2 --text "- License check" --result "${STATUS_DONE}" --color GREEN
else else
LogText "Result: error while checking license" LogText "Result: error while checking license"
LogText "Output: ${UPLOAD_CODE}" LogText "Output: ${UPLOAD_CODE}"
@ -210,7 +221,7 @@
fi fi
# Check for host IDs # Check for host IDs
if [ ! "${HOSTID}" = "" -a ! "${HOSTID2}" = "" ]; then if [ -n "${HOSTID}" -a -n "${HOSTID2}" ]; then
Output "${WHITE}Found hostid: ${HOSTID}${NORMAL}" Output "${WHITE}Found hostid: ${HOSTID}${NORMAL}"
# Try to connect # Try to connect
Output "Uploading data.." Output "Uploading data.."
@ -221,6 +232,8 @@
EXITCODE=$? EXITCODE=$?
LogText "Exit code: ${EXITCODE}" LogText "Exit code: ${EXITCODE}"
if [ ${EXITCODE} -gt 0 ]; then if [ ${EXITCODE} -gt 0 ]; then
Display --indent 2 --text "- Data upload (${UPLOAD_SERVER})" --result "${STATUS_FAILED}" --color RED
echo "" echo ""
echo "${RED}Upload Error${NORMAL}: cURL could not upload data. See ${LOGFILE} for details." echo "${RED}Upload Error${NORMAL}: cURL could not upload data. See ${LOGFILE} for details."
echo "Suggested command: tail -n 20 ${LOGFILE}" echo "Suggested command: tail -n 20 ${LOGFILE}"
@ -238,7 +251,7 @@
# Quit # Quit
ExitClean ExitClean
else else
Display --indent 2 --text "Data upload status (${UPLOAD_SERVER})" --result OK --color GREEN Display --indent 2 --text "- Data upload (${UPLOAD_SERVER})" --result "${STATUS_DONE}" --color GREEN
fi fi
else else
echo "${RED}Error${NORMAL}: No hostid and/or hostid2 found. Can not upload report file." echo "${RED}Error${NORMAL}: No hostid and/or hostid2 found. Can not upload report file."