starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-05-17 12:26:55 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

Replace \s with [[:space:]] for compatibility

Browse Source
This commit is contained in:
Jarkko Oranen
2020-09-07 20:47:30 +03:00
committed by Lukas Schauer
parent 8ddead4854
commit e69df6521b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dehydrated
+6 -6
View File
@@ -43,27 +43,27 @@ json_path() {
# Get string value from json dictionary # Get string value from json dictionary
get_json_string_value() { get_json_string_value() {
local filter local filter
filter="$(printf 's/.*\[%s\]\s*"\([^"]*\)"/\\1/p' "$(json_path "${1:-}" "${2:-}")")" filter="$(printf 's/.*\[%s\][[:space:]]*"\([^"]*\)"/\\1/p' "$(json_path "${1:-}" "${2:-}")")"
sed -n "${filter}" sed -n "${filter}"
} }
# Get array values from json dictionary # Get array values from json dictionary
get_json_array_values() { get_json_array_values() {
grep -E '^\['"$(json_path "${1:-}" "${2:-}")"',[0-9]*\]' | sed -e 's/\[[^\]*\]\s*//g' -e 's/^"//' -e 's/"$//' grep -E '^\['"$(json_path "${1:-}" "${2:-}")"',[0-9]*\]' | sed -e 's/\[[^\]*\][[:space:]]*//g' -e 's/^"//' -e 's/"$//'
} }
# Get sub-dictionary from json # Get sub-dictionary from json
get_json_dict_value() { get_json_dict_value() {
local filter local filter
echo "$(json_path "${1:-}" "${2:-}")" echo "$(json_path "${1:-}" "${2:-}")"
filter="$(printf 's/.*\[%s\]\s*\(.*\)/\\1/p' "$(json_path "${1:-}" "${2:-}")")" filter="$(printf 's/.*\[%s\][[:space:]]*\(.*\)/\\1/p' "$(json_path "${1:-}" "${2:-}")")"
sed -n "${filter}" | jsonsh sed -n "${filter}" | jsonsh
} }
# Get integer value from json # Get integer value from json
get_json_int_value() { get_json_int_value() {
local filter local filter
filter="$(printf 's/.*\[%s\]\s*\([^"]*\)/\\1/p' "$(json_path "${1:-}" "${2:-}")")" filter="$(printf 's/.*\[%s\][[:space:]]*\([^"]*\)/\\1/p' "$(json_path "${1:-}" "${2:-}")")"
sed -n "${filter}" sed -n "${filter}"
} }
@@ -1004,10 +1004,10 @@ sign_csr() {
fi fi
# Find challenge in authorization # Find challenge in authorization
challengeindex="$(echo "${response}" | grep -E '^\["challenges",[0-9]+,"type"\]\s+"'"${CHALLENGETYPE}"'"' | cut -d',' -f2 || true)" challengeindex="$(echo "${response}" | grep -E '^\["challenges",[0-9]+,"type"\][[:space:]]+"'"${CHALLENGETYPE}"'"' | cut -d',' -f2 || true)"
if [ -z "${challengeindex}" ]; then if [ -z "${challengeindex}" ]; then
allowed_validations="$(echo "${response}" | grep -E '^\["challenges",[0-9]+,"type"\]' | sed -e 's/\[[^\]*\]\s*//g' -e 's/^"//' -e 's/"$//' | tr '\n' ' ')" allowed_validations="$(echo "${response}" | grep -E '^\["challenges",[0-9]+,"type"\]' | sed -e 's/\[[^\]*\][[:space:]]*//g' -e 's/^"//' -e 's/"$//' | tr '\n' ' ')"
_exiterr "Validating this certificate is not possible using ${CHALLENGETYPE}. Possible validation methods are: ${allowed_validations}" _exiterr "Validating this certificate is not possible using ${CHALLENGETYPE}. Possible validation methods are: ${allowed_validations}"
fi fi
challenge="$(echo "${response}" | get_json_dict_value -p '"challenges",'"${challengeindex}")" challenge="$(echo "${response}" | get_json_dict_value -p '"challenges",'"${challengeindex}")"