diff options
| author | mboelen <michael@cisofy.com> | 2016-02-15 15:50:03 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2016-02-15 15:50:03 +0300 |
| commit | 75ca02d1a59824ccb313ead9a4d9b95d49be9002 (patch) | |
| tree | 1c942bea0a1899103dfc938e8767f0454c1ef6da /include/data_upload | |
| parent | b6c71c7ea78406b46c4926c1343255baf69247be (diff) | |
Allow proxy usage during license check
Diffstat (limited to 'include/data_upload')
| -rw-r--r-- | include/data_upload | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/include/data_upload b/include/data_upload index 34ec91ce..371248fd 100644 --- a/include/data_upload +++ b/include/data_upload @@ -87,8 +87,37 @@ output "Settings file: ${SETTINGS_FILE}" # Check report file if [ -f ${REPORTFILE} ]; then output "${WHITE}Report file found.${NORMAL} Starting with connectivity check.." + + if [ ! "${UPLOAD_PROXY_SERVER}" = "" ]; then + LogText "Upload: Proxy is configured: ${UPLOAD_SERVER}" + if [ ! "${UPLOAD_PROXY_PORT}" = "" ]; then + LogText "Upload: Proxy port number is ${UPLOAD_PROXY_PORT}" + UPLOAD_PROXY_PORT=":${UPLOAD_PROXY_PORT}" + fi + LogText "Upload: Proxy protocol is ${UPLOAD_PROXY_PROTOCOL}" + case ${UPLOAD_PROXY_PROTOCOL} in + "http") + UPLOAD_PROXY="http://${UPLOAD_PROXY_SERVER}${UPLOAD_PROXY_PORT}" + CURL_OPTIONS="${CURL_OPTIONS} --proxy ${UPLOAD_PROXY}" + ;; + "https") + UPLOAD_PROXY="https://${UPLOAD_PROXY_SERVER}${UPLOAD_PROXY_PORT}" + CURL_OPTIONS="${CURL_OPTIONS} --proxy ${UPLOAD_PROXY}" + ;; + "socks5") + UPLOAD_PROXY="${UPLOAD_PROXY_SERVER}${UPLOAD_PROXY_PORT}" + CURL_OPTIONS="${CURL_OPTIONS} --socks5 ${UPLOAD_PROXY}" + ;; + *) + echo "Unknown protocol. Please report to lynis-dev@cisofy.com" + ExitFatal + ;; + esac + fi + # 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_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` EXITCODE=$? if [ ${EXITCODE} -gt 0 ]; then LogText "Exit code: ${EXITCODE}" |