tyler.durden/lynis
1
0
Fork 0
mirror of https://github.com/CISOfy/lynis.git synced 2025-07-30 01:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow overriding of the upload and license server

Browse Source
This commit is contained in:
mboelen 2015-02-03 18:26:30 +01:00
parent bbe779ce2c
commit 5686b82f17
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/data_upload
View File

@ -20,15 +20,26 @@
# #
# logtextbreak # logtextbreak
PROGRAM_VERSION="101" PROGRAM_VERSION="101"
LICENSE_SERVER="https://cisofy.com"
if [ "${UPLOAD_URL}" = "" ]; then
UPLOAD_URL="https://cisofy.com/upload/"
fi
logtext "Upload server: ${LICENSE_SERVER} (static)" # Data upload destination
if [ "${UPLOAD_SERVER}" = "" ]; then
UPLOAD_SERVER="cisofy.com"
fi
UPLOAD_URL="https://${UPLOAD_SERVER}/upload/"
logtext "Upload server: ${UPLOAD_SERVER}"
logtext "URL to upload to: ${UPLOAD_URL}" logtext "URL to upload to: ${UPLOAD_URL}"
# License server (set to upload server if not configured)
if [ "${LICENSE_SERVER}" = "" ]; then
LICENSE_SERVER="${UPLOAD_SERVER}"
fi
LICENSE_SERVER_URL="https://${LICENSE_SERVER}/license/"
logtext "License server: ${LICENSE_SERVER}"
# Additional options to curl # Additional options to curl
if [ "${UPLOAD_OPTIONS}" = "" ]; then if [ "${UPLOAD_OPTIONS}" = "" ]; then
CURL_OPTIONS="" CURL_OPTIONS=""
@ -79,7 +90,7 @@ output "Settings file: ${SETTINGS_FILE}"
if [ -f ${REPORTFILE} ]; then if [ -f ${REPORTFILE} ]; then
output "${WHITE}Report file found.${NORMAL} Starting with connectivity check.." output "${WHITE}Report file found.${NORMAL} Starting with connectivity check.."
# Quit if license is not valid, to reduce load on both client and server. # Quit if license is not valid, to reduce load on both client and server.
UPLOAD=`${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "collector_version=${PROGRAM_VERSION}" ${LICENSE_SERVER}/license/` UPLOAD=`${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode "licensekey=${LICENSE_KEY}" --data-urlencode "collector_version=${PROGRAM_VERSION}" ${LICENSE_SERVER_URL}`
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}"
@ -108,6 +119,7 @@ output "Settings file: ${SETTINGS_FILE}"
output "${GREEN}Data uploaded successfully${NORMAL}" output "${GREEN}Data uploaded successfully${NORMAL}"
else else
echo "${RED}Error occured, please check documentation for code ${UPLOAD_CODE}.${NORMAL}" echo "${RED}Error occured, please check documentation for code ${UPLOAD_CODE}.${NORMAL}"
echo "Command used: ${CURLBINARY} ${CURL_OPTIONS} -s -S --data-urlencode \"data@${REPORTFILE}\" --data-urlencode \"licensekey=${LICENSE_KEY}\" --data-urlencode \"hostid=${HOSTID}\" ${UPLOAD_URL}"
output "Debug:" output "Debug:"
output ${UPLOAD} output ${UPLOAD}
# Quit # Quit