gf4
/
wagon
2
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Improved curl error reporting

master
Keith Irwin 2022-12-04 10:55:21 -07:00
parent 29eb950f2d
commit 0e1230212c
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/lib/admin/peer/add
View File

@ -10,7 +10,7 @@ ip="${1}"; qs="$(<<<"${2}" tr '&' '\n' | sed 's/?//')"
# Check token
token_fail(){
printf 'Rejecting admin %s request for new peer due to %s token\n' "${ip}" "${1}" >&2
printf 'Invalid token\n' | /usr/lib/wgapi/http_res 403; exit
printf 'Invalid token\n' | /usr/lib/wgapi/http_res 403; exit 1
}
saved_token="$(grep "${ip}" /var/local/wgapi/tokens | cut -f2)"
[ "${saved_token}" == "" ] && token_fail 'missing'

14
back/lib/fed_peer_add
View File

@ -6,11 +6,9 @@
source /etc/wgapi/config
url="${1}"; secret="${2}"; pubkey="${3}"; psk="${4}"; allowedips="${5}"
curl --request POST --cacert "${SSL_CA_CERT}" "${url}?secret=${secret}&pubkey=${pubkey}&psk=${psk}&ips=${allowedips}" >&2
#if res="$(curl --silent --request POST "${url}?secret=${secret}&pubkey=${pubkey}&psk=${psk}&ips=${allowedips}")"; then
# printf 'Sent peer %s to federated server %s\n' "${pubkey}" "${url}" >&2
#else
# printf 'ERROR: Failed to send peer to federated server %s\n' "${url}" >&2
# exit 1
#fi
if [ "$(curl --silent -o /dev/null -w "%{http_code}" --request POST --cacert "${SSL_CA_CERT}" "${url}?secret=${secret}&pubkey=${pubkey}&psk=${psk}&ips=${allowedips}")" == '200' ] ; then
printf 'Sent peer %s to federated server %s\n' "${pubkey}" "${url}" >&2
else
printf 'ERROR: Failed to send peer to federated server %s\n' "${url}" >&2
exit 1
fi

2
back/lib/fed_peer_del
View File

@ -6,7 +6,7 @@
source /etc/wgapi/config
url="${1}"; secret="${2}"; pubkey="${3}"
if res="$(curl --silent --request DELETE --cacert "${SSL_CA_CERT}" "${url}?secret=${secret}&pubkey=${pubkey}")"; then
if [ "$(curl --silent -o /dev/null -w "%{http_code}" --request DELETE --cacert "${SSL_CA_CERT}" "${url}?secret=${secret}&pubkey=${pubkey}")" == '200' ]; then
printf 'Sent peer %s to federated server %s\n' "${pubkey}" "${url}" >&2
else
printf 'ERROR: Failed to send peer to federated server %s\n' "${url}" >&2