|
|
@ -1702,17 +1702,33 @@ _post() { |
|
|
|
fi |
|
|
|
_debug "_CURL" "$_CURL" |
|
|
|
if [ "$needbase64" ]; then |
|
|
|
if [ "$body" ]; then |
|
|
|
if [ "$_postContentType" ]; then |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)" |
|
|
|
else |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)" |
|
|
|
fi |
|
|
|
else |
|
|
|
if [ "$_postContentType" ]; then |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)" |
|
|
|
else |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)" |
|
|
|
fi |
|
|
|
fi |
|
|
|
else |
|
|
|
if [ "$body" ]; then |
|
|
|
if [ "$_postContentType" ]; then |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")" |
|
|
|
else |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")" |
|
|
|
fi |
|
|
|
else |
|
|
|
if [ "$_postContentType" ]; then |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")" |
|
|
|
else |
|
|
|
response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")" |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
_ret="$?" |
|
|
|
if [ "$_ret" != "0" ]; then |
|
|
@ -1890,7 +1906,7 @@ _send_signed_request() { |
|
|
|
if [ "$ACME_NEW_NONCE" ]; then |
|
|
|
_debug2 "Get nonce with HEAD. ACME_NEW_NONCE" "$ACME_NEW_NONCE" |
|
|
|
nonceurl="$ACME_NEW_NONCE" |
|
|
|
if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type"; then |
|
|
|
if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type" >/dev/null; then |
|
|
|
_headers="$(cat "$HTTP_HEADER")" |
|
|
|
_debug2 _headers "$_headers" |
|
|
|
_CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)" |
|
|
|