starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-04-25 01:38:28 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

don't fail on nested json array in challenge info

Browse Source
This commit is contained in:
Lukas Schauer
2018-01-13 23:06:32 +01:00
parent 3e521e1c01
commit 656af8cadc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dehydrated
View File

@@ -651,14 +651,14 @@ sign_csr() {
fi fi
challenges="$(printf '%s\n' "${response}" | sed -n 's/.*\("challenges":[^\[]*\[[^]]*]\).*/\1/p')" challenges="$(printf '%s\n' "${response}" | sed -n 's/.*\("challenges":[^\[]*\[[^]]*]\).*/\1/p')"
repl=$'\n''{' # fix syntax highlighting in Vim challenge="$(<<<"${challenges}" _sed -e 's/^[^\[]+\[(.+)\]$/\1/' -e 's/\}(, (\{)|(\]))/}\'$'\n''\2/g' | grep \""${CHALLENGETYPE}"\")"
challenge="$(printf "%s" "${challenges//\{/${repl}}" | grep \""${CHALLENGETYPE}"\")"
challenge_token="$(printf '%s' "${challenge}" | get_json_string_value token | _sed 's/[^A-Za-z0-9_\-]/_/g')" challenge_token="$(printf '%s' "${challenge}" | get_json_string_value token | _sed 's/[^A-Za-z0-9_\-]/_/g')"
if [[ ${API} -eq 1 ]]; then if [[ ${API} -eq 1 ]]; then
challenge_uri="$(printf '%s' "${challenge}" | get_json_string_value uri)" challenge_uri="$(printf '%s' "${challenge}" | get_json_string_value uri)"
else else
challenge_uri="$(printf '%s' "${challenge}" | get_json_string_value url)" challenge_uri="$(printf '%s' "${challenge}" | get_json_string_value url)"
fi fi
if [[ -z "${challenge_token}" ]] || [[ -z "${challenge_uri}" ]]; then if [[ -z "${challenge_token}" ]] || [[ -z "${challenge_uri}" ]]; then
_exiterr "Can't retrieve challenges (${response})" _exiterr "Can't retrieve challenges (${response})"