plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects Releases Wiki Activity

minor, fix normalize json

Browse Source
This commit is contained in:
neil 2016-05-23 22:02:43 +08:00
parent bb276fc985
commit eae290992f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
acme.sh
View File

@ -480,6 +480,10 @@ _time2str() {
} }
_normalizeJson() {
sed "s/\" *: *\([\"{\[]\)/\":\1/g" | sed "s/^ *\([^ ]\)/\1/" | tr -d "\r\n"
}
_stat() { _stat() {
#Linux #Linux
if stat -c '%U:%G' "$1" 2>/dev/null ; then if stat -c '%U:%G' "$1" 2>/dev/null ; then
@ -667,7 +671,11 @@ _send_signed_request() {
_debug2 body "$body" _debug2 body "$body"
response="$(_post "$body" $url "$needbase64" | tr -d "\r\n ")" response="$(_post "$body" $url "$needbase64")"
_debug2 original "$response"
response="$( echo "$response" | _normalizeJson )"
responseHeaders="$(cat $HTTP_HEADER)" responseHeaders="$(cat $HTTP_HEADER)"
@ -1421,7 +1429,7 @@ issue() {
_debug "sleep 5 secs to verify" _debug "sleep 5 secs to verify"
sleep 5 sleep 5
_debug "checking" _debug "checking"
response="$(_get $uri | tr -d "\r\n ")" response="$(_get $uri | _normalizeJson )"
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
_err "$d:Verify error:$response" _err "$d:Verify error:$response"
_clearupwebbroot "$_currentRoot" "$removelevel" "$token" _clearupwebbroot "$_currentRoot" "$removelevel" "$token"
@ -1486,7 +1494,7 @@ issue() {
if [ -z "$Le_LinkCert" ] ; then if [ -z "$Le_LinkCert" ] ; then
response="$(echo $response | _dbase64 "multiline" )" response="$(echo $response | _dbase64 "multiline" | _normalizeJson )"
_err "Sign failed: $(echo "$response" | grep -o '"detail":"[^"]*"')" _err "Sign failed: $(echo "$response" | grep -o '"detail":"[^"]*"')"
return 1 return 1
fi fi