]> git.proxmox.com Git - mirror_acme.sh.git/commitdiff
fix https://github.com/acmesh-official/acme.sh/issues/3600
authorneil <win10@neilpang.com>
Mon, 12 Jul 2021 13:46:08 +0000 (21:46 +0800)
committerneil <win10@neilpang.com>
Mon, 12 Jul 2021 13:46:08 +0000 (21:46 +0800)
acme.sh

diff --git a/acme.sh b/acme.sh
index 4b20b7086648b8608f03f81a49b0113364bfdc8f..c57cd2ade041f8f0f14dc4f4629e1c99d274bdd7 100755 (executable)
--- a/acme.sh
+++ b/acme.sh
@@ -4712,26 +4712,13 @@ $_authorizations_map"
         return 1
       fi
 
-      _debug "sleep 2 secs to verify"
-      sleep 2
-      _debug "checking"
-
-      _send_signed_request "$uri"
-
-      if [ "$?" != "0" ]; then
-        _err "$d:Verify error:$response"
-        _clearupwebbroot "$_currentRoot" "$removelevel" "$token"
-        _clearup
-        _on_issue_err "$_post_hook" "$vlist"
-        return 1
-      fi
       _debug2 original "$response"
 
       response="$(echo "$response" | _normalizeJson)"
       _debug2 response "$response"
 
       status=$(echo "$response" | _egrep_o '"status":"[^"]*' | cut -d : -f 2 | tr -d '"')
-
+      _debug2 status "$status"
       if _contains "$status" "invalid"; then
         error="$(echo "$response" | _egrep_o '"error":\{[^\}]*')"
         _debug2 error "$error"
@@ -4773,7 +4760,19 @@ $_authorizations_map"
         _on_issue_err "$_post_hook" "$vlist"
         return 1
       fi
+      _debug "sleep 2 secs to verify again"
+      sleep 2
+      _debug "checking"
 
+      _send_signed_request "$uri"
+
+      if [ "$?" != "0" ]; then
+        _err "$d:Verify error:$response"
+        _clearupwebbroot "$_currentRoot" "$removelevel" "$token"
+        _clearup
+        _on_issue_err "$_post_hook" "$vlist"
+        return 1
+      fi
     done
 
   done