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
b7c370ff
Unverified
Commit
b7c370ff
authored
Jul 08, 2023
by
neil
Committed by
GitHub
Jul 08, 2023
Browse files
Merge pull request #4691 from acmesh-official/4442
4442
parents
0472f5da
8fd3a64e
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
b7c370ff
...
...
@@ -2116,6 +2116,7 @@ _send_signed_request() {
if
[
-z
"
$keyfile
"
]
;
then
keyfile
=
"
$ACCOUNT_KEY_PATH
"
fi
_debug
"=======Begin Send Signed Request======="
_debug url
"
$url
"
_debug payload
"
$payload
"
...
...
@@ -4602,9 +4603,10 @@ issue() {
_d
=
"*.
$_d
"
fi
_debug2 _d
"
$_d
"
_authorizations_map
=
"
$_d
,
$response
_authorizations_map
=
"
$_d
,
$response
#
$_authz_url
$_authorizations_map
"
done
_debug2 _authorizations_map
"
$_authorizations_map
"
_index
=
0
...
...
@@ -4656,7 +4658,8 @@ $_authorizations_map"
_on_issue_err
"
$_post_hook
"
return
1
fi
_authz_url
=
"
$(
echo
"
$_candidates
"
|
sed
"s/
$_idn_d
,//"
| _egrep_o
"#.*"
|
sed
"s/^#//"
)
"
_debug _authz_url
"
$_authz_url
"
if
[
-z
"
$thumbprint
"
]
;
then
thumbprint
=
"
$(
__calc_account_thumbprint
)
"
fi
...
...
@@ -4708,7 +4711,7 @@ $_authorizations_map"
_debug keyauthorization
"
$keyauthorization
"
fi
dvlist
=
"
$d$sep$keyauthorization$sep$uri$sep$vtype$sep$_currentRoot
"
dvlist
=
"
$d$sep$keyauthorization$sep$uri$sep$vtype$sep$_currentRoot
$sep$_authz_url
"
_debug dvlist
"
$dvlist
"
vlist
=
"
$vlist$dvlist$dvsep
"
...
...
@@ -4725,6 +4728,7 @@ $_authorizations_map"
keyauthorization
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
2
)
vtype
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
4
)
_currentRoot
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
5
)
_authz_url
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
6
)
_debug d
"
$d
"
if
[
"
$keyauthorization
"
=
"
$STATE_VERIFIED
"
]
;
then
_debug
"
$d
is already verified, skip
$vtype
."
...
...
@@ -4850,7 +4854,7 @@ $_authorizations_map"
uri
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
3
)
vtype
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
4
)
_currentRoot
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
5
)
_authz_url
=
$(
echo
"
$ventry
"
|
cut
-d
"
$sep
"
-f
6
)
if
[
"
$keyauthorization
"
=
"
$STATE_VERIFIED
"
]
;
then
_info
"
$d
is already verified, skip
$vtype
."
continue
...
...
@@ -4860,6 +4864,7 @@ $_authorizations_map"
_debug
"d"
"
$d
"
_debug
"keyauthorization"
"
$keyauthorization
"
_debug
"uri"
"
$uri
"
_debug
"_authz_url"
"
$_authz_url
"
removelevel
=
""
token
=
"
$(
printf
"%s"
"
$keyauthorization
"
|
cut
-d
'.'
-f
1
)
"
...
...
@@ -4967,6 +4972,7 @@ $_authorizations_map"
MAX_RETRY_TIMES
=
30
fi
_debug
"Lets check the status of the authz"
while
true
;
do
waittimes
=
$(
_math
"
$waittimes
"
+ 1
)
if
[
"
$waittimes
"
-ge
"
$MAX_RETRY_TIMES
"
]
;
then
...
...
@@ -5014,9 +5020,9 @@ $_authorizations_map"
break
fi
if
[
"
$status
"
=
"pending"
]
;
then
if
_contains
"
$status
"
"pending"
;
then
_info
"Pending, The CA is processing your order, please just wait. (
$waittimes
/
$MAX_RETRY_TIMES
)"
elif
[
"
$status
"
=
"processing"
]
;
then
elif
_contains
"
$status
"
"processing"
;
then
_info
"Processing, The CA is processing your order, please just wait. (
$waittimes
/
$MAX_RETRY_TIMES
)"
else
_err
"
$d
:Verify error:
$response
"
...
...
@@ -5029,7 +5035,7 @@ $_authorizations_map"
_sleep 2
_debug
"checking"
_send_signed_request
"
$ur
i
"
_send_signed_request
"
$
_authz_
ur
l
"
if
[
"
$?
"
!=
"0"
]
;
then
_err
"
$d
:Verify error:
$response
"
...
...
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