aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2026-02-10 23:04:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tor + Callbacks fix, thanks @Tomtibo

Browse Source
This commit is contained in:
kexkey
2020-04-02 15:57:56 -04:00
parent 874c42daca
commit ed06a00380
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
notifier_docker/script/web.sh
View File

@@ -8,7 +8,7 @@ web() {
local msg=${1}
local url
local body
local torbypass
local tor
local returncode
local response
local result
@@ -29,15 +29,15 @@ web() {
trace "[web] no body, GET request"
fi
torbypass=$(echo ${msg} | jq -e ".torbypass")
tor=$(echo ${msg} | jq -e ".tor")
# jq -e will have a return code of 1 if the supplied tag is null.
if [ "$?" -ne "0" ]; then
# torbypass tag null
torbypass=false
# tor tag null
tor=false
fi
trace "[web] torbypass=${torbypass}"
trace "[web] tor=${tor}"
response=$(curl_it "${url}" "${body}" "${torbypass}")
response=$(curl_it "${url}" "${body}" "${tor}")
returncode=$?
trace_rc ${returncode}
@@ -51,25 +51,25 @@ curl_it() {
local url=$(echo "${1}" | tr -d '"')
local data=${2}
local torbypass=${3}
local tor=${3}
local returncode
local response
local rnd=$(dd if=/dev/urandom bs=5 count=1 | xxd -pc 5)
if [ "${torbypass}" = "true" ] || [ -z "${TOR_HOST}" ]; then
# If we want to bypass tor or the config file doesn't exist
torbypass=""
if [ "${tor}" = "true" ] && [ -n "${TOR_HOST}" ]; then
# If we want to use tor and the tor host config exists
tor="--socks5-hostname ${TOR_HOST}:${TOR_PORT}"
else
torbypass="--socks5-hostname ${TOR_HOST}:${TOR_PORT}"
tor=""
fi
if [ -n "${data}" ]; then
trace "[curl_it] curl ${torbypass} -o webresponse-${rnd} -m 20 -w \"%{http_code}\" -H \"Content-Type: application/json\" -H \"X-Forwarded-Proto: https\" -d \"${data}\" -k ${url}"
rc=$(curl ${torbypass} -o webresponse-${rnd} -m 20 -w "%{http_code}" -H "Content-Type: application/json" -H "X-Forwarded-Proto: https" -d "${data}" -k ${url})
trace "[curl_it] curl ${tor} -o webresponse-${rnd} -m 20 -w \"%{http_code}\" -H \"Content-Type: application/json\" -H \"X-Forwarded-Proto: https\" -d \"${data}\" -k ${url}"
rc=$(curl ${tor} -o webresponse-${rnd} -m 20 -w "%{http_code}" -H "Content-Type: application/json" -H "X-Forwarded-Proto: https" -d "${data}" -k ${url})
returncode=$?
else
trace "[curl_it] curl ${torbypass} -o webresponse-$$ -m 20 -w \"%{http_code}\" -k ${url}"
rc=$(curl ${torbypass} -o webresponse-${rnd} -m 20 -w "%{http_code}" -k ${url})
trace "[curl_it] curl ${tor} -o webresponse-$$ -m 20 -w \"%{http_code}\" -k ${url}"
rc=$(curl ${tor} -o webresponse-${rnd} -m 20 -w "%{http_code}" -k ${url})
returncode=$?
fi
trace "[curl_it] HTTP return code=${rc}"