extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-07 16:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

distinguish empty output from invalid JSON in reserve share handler

Browse Source
This commit is contained in:
Kenneth Bingham 2024-03-13 23:54:09 -04:00
parent d3147d6ed9
commit 7af61a1959
No known key found for this signature in database
GPG Key ID: 31709281860130B6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nfpm/zrok-share.bash
View File

@ -147,11 +147,14 @@ if [[ "${ZROK_FRONTEND_MODE:-}" == temp-public ]]; then
exec zrok ${ZROK_CMD} exec zrok ${ZROK_CMD}
else else
# reserve and continue # reserve and continue
zrok ${ZROK_CMD} | jq -rc | tee ~/.zrok/reserved.json zrok ${ZROK_CMD} > ~/.zrok/reserved.json
# share the reserved backend target until exit # share the reserved backend target until exit
if ! [[ -s ~/.zrok/reserved.json ]]; then if ! [[ -s ~/.zrok/reserved.json ]]; then
echo "ERROR: empty or missing $(realpath ~/.zrok)/reserved.json" >&2 echo "ERROR: empty or missing $(realpath ~/.zrok)/reserved.json" >&2
exit 1 exit 1
elif ! jq . < ~/.zrok/reserved.json &>/dev/null; then
echo "ERROR: invalid JSON in $(realpath ~/.zrok)/reserved.json" >&2
exit 1
else else
ZROK_PUBLIC_URLS=$(jq -cr '.frontend_endpoints' ~/.zrok/reserved.json 2>/dev/null) ZROK_PUBLIC_URLS=$(jq -cr '.frontend_endpoints' ~/.zrok/reserved.json 2>/dev/null)
if [[ -z "${ZROK_PUBLIC_URLS}" || "${ZROK_PUBLIC_URLS}" == null ]]; then if [[ -z "${ZROK_PUBLIC_URLS}" || "${ZROK_PUBLIC_URLS}" == null ]]; then