yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-10 21:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Neilpang/acme.sh

Browse Source
This commit is contained in:
Roy Kaldung 2018-08-22 18:45:21 +02:00
commit e0c940b2bb
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
acme.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
VER=2.7.9 VER=2.8.0
PROJECT_NAME="acme.sh" PROJECT_NAME="acme.sh"
@ -1374,17 +1374,17 @@ _url_replace() {
} }
_time2str() { _time2str() {
#Linux
if date -u -d@"$1" 2>/dev/null; then
return
fi
#BSD #BSD
if date -u -r "$1" 2>/dev/null; then if date -u -r "$1" 2>/dev/null; then
return return
fi fi
#Soaris #Linux
if date -u -d@"$1" 2>/dev/null; then
return
fi
#Solaris
if _exists adb; then if _exists adb; then
_t_s_a=$(echo "0t${1}=Y" | adb) _t_s_a=$(echo "0t${1}=Y" | adb)
echo "$_t_s_a" echo "$_t_s_a"
@ -1795,15 +1795,13 @@ _send_signed_request() {
return 1 return 1
fi fi
if [ "$ACME_VERSION" = "2" ]; then __request_conent_type="$CONTENT_TYPE_JSON"
__request_conent_type="$CONTENT_TYPE_JSON"
else
__request_conent_type=""
fi
payload64=$(printf "%s" "$payload" | _base64 | _url_replace) payload64=$(printf "%s" "$payload" | _base64 | _url_replace)
_debug3 payload64 "$payload64" _debug3 payload64 "$payload64"
MAX_REQUEST_RETRY_TIMES=5 MAX_REQUEST_RETRY_TIMES=20
_sleep_retry_sec=1
_request_retry_times=0 _request_retry_times=0
while [ "${_request_retry_times}" -lt "$MAX_REQUEST_RETRY_TIMES" ]; do while [ "${_request_retry_times}" -lt "$MAX_REQUEST_RETRY_TIMES" ]; do
_request_retry_times=$(_math "$_request_retry_times" + 1) _request_retry_times=$(_math "$_request_retry_times" + 1)
@ -1898,8 +1896,9 @@ _send_signed_request() {
fi fi
if _contains "$_body" "JWS has invalid anti-replay nonce" || _contains "$_body" "JWS has an invalid anti-replay nonce"; then 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." _info "It seems the CA server is busy now, let's wait and retry. Sleeping $_sleep_retry_sec seconds."
_sleep 5 _CACHED_NONCE=""
_sleep $_sleep_retry_sec
continue continue
fi fi
break break

3
dnsapi/dns_inwx.sh
View File

@ -158,7 +158,8 @@ _inwx_login() {
export _H1 export _H1
#https://github.com/inwx/php-client/blob/master/INWX/Domrobot.php#L71 #https://github.com/inwx/php-client/blob/master/INWX/Domrobot.php#L71
if _contains "$response" "tfa"; then if _contains "$response" "<member><name>code</name><value><int>1000</int></value></member>" \
&& _contains "$response" "<member><name>tfa</name><value><string>GOOGLE-AUTH</string></value></member>"; then
if [ -z "$INWX_Shared_Secret" ]; then if [ -z "$INWX_Shared_Secret" ]; then
_err "Mobile TAN detected." _err "Mobile TAN detected."
_err "Please define a shared secret." _err "Please define a shared secret."