Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
f2acdd27
Commit
f2acdd27
authored
Feb 17, 2019
by
neilpang
Browse files
fix tr err for Mac
parent
4ade446b
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
f2acdd27
...
@@ -1882,29 +1882,34 @@ _send_signed_request() {
...
@@ -1882,29 +1882,34 @@ _send_signed_request() {
_err "Can not post to $url"
_err "Can not post to $url"
return 1
return 1
fi
fi
_debug2 original
"
$response
"
response
=
"
$(
echo
"
$response
"
| _normalizeJson
)
"
responseHeaders="$(cat "$HTTP_HEADER")"
responseHeaders="$(cat "$HTTP_HEADER")"
_debug2 responseHeaders "$responseHeaders"
_debug2 responseHeaders "$responseHeaders"
_debug2 response
"
$response
"
code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\r\n")"
code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\r\n")"
_debug code "$code"
_debug code "$code"
_CACHED_NONCE
=
"
$(
echo
"
$responseHeaders
"
|
grep
"Replay-Nonce:"
| _head_n 1 |
tr
-d
"
\r\n
"
|
cut
-d
':'
-f
2
)
"
_debug2 original "$response"
if echo "$responseHeaders" | grep -i "Content-Type: application/json" >/dev/null 2>&1; then
_body
=
"
$response
"
response="$(echo "$response" | _normalizeJson)"
if
[
"
$needbase64
"
]
;
then
_body
=
"
$(
echo
"
$_body
"
| _dbase64 |
tr
-d
'\0'
)
"
_debug3 _body
"
$_body
"
fi
fi
_debug2 response "$response"
if
_contains
"
$_body
"
"JWS has invalid anti-replay nonce"
||
_contains
"
$_body
"
"JWS has an invalid anti-replay nonce"
;
then
_CACHED_NONCE="$(echo "$responseHeaders" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
_info
"It seems the CA server is busy now, let's wait and retry. Sleeping
$_sleep_retry_sec
seconds."
_CACHED_NONCE
=
""
if ! _startswith "$code" "2"; then
_sleep
$_sleep_retry_sec
_body="$response"
continue
if [ "$needbase64" ]; then
_body="$(echo "$_body" | _dbase64 multiline)"
_debug3 _body "$_body"
fi
if _contains "$_body" "JWS has invalid anti-replay nonce" || _contains "$_body" "JWS has an invalid anti-replay nonce"; then
_info "It seems the CA server is busy now, let's wait and retry. Sleeping $_sleep_retry_sec seconds."
_CACHED_NONCE=""
_sleep $_sleep_retry_sec
continue
fi
fi
fi
break
break
done
done
...
@@ -4113,14 +4118,14 @@ $_authorizations_map"
...
@@ -4113,14 +4118,14 @@ $_authorizations_map"
Le_LinkCert="$(echo "$response" | tr -d '\r\n' | _egrep_o '"certificate" *: *"[^"]*"' | cut -d '"' -f 4)"
Le_LinkCert="$(echo "$response" | tr -d '\r\n' | _egrep_o '"certificate" *: *"[^"]*"' | cut -d '"' -f 4)"
_tempSignedResponse="$response"
_tempSignedResponse="$response"
if
!
_send_signed_request
"
$Le_LinkCert
"
""
"needbase64"
;
then
if ! _send_signed_request "$Le_LinkCert"; then
_err "Sign failed, can not download cert:$Le_LinkCert."
_err "Sign failed, can not download cert:$Le_LinkCert."
_err "$response"
_err "$response"
_on_issue_err "$_post_hook"
_on_issue_err "$_post_hook"
return 1
return 1
fi
fi
echo
"
$response
"
| _dbase64
"multiline"
>
"
$CERT_PATH
"
echo "$response" >"$CERT_PATH"
if [ "$(grep -- "$BEGIN_CERT" "$CERT_PATH" | wc -l)" -gt "1" ]; then
if [ "$(grep -- "$BEGIN_CERT" "$CERT_PATH" | wc -l)" -gt "1" ]; then
_debug "Found cert chain"
_debug "Found cert chain"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment