Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
9cc9f519
Unverified
Commit
9cc9f519
authored
Jan 06, 2019
by
neil
Committed by
GitHub
Jan 06, 2019
Browse files
Merge pull request #2010 from Neilpang/dev
Support Post as Get
parents
55461203
0483d841
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
9cc9f519
...
@@ -3651,7 +3651,7 @@ issue() {
...
@@ -3651,7 +3651,7 @@ issue() {
_authorizations_map
=
""
_authorizations_map
=
""
for
_authz_url
in
$(
echo
"
$_authorizations_seg
"
|
tr
','
' '
)
;
do
for
_authz_url
in
$(
echo
"
$_authorizations_seg
"
|
tr
','
' '
)
;
do
_debug2
"_authz_url"
"
$_authz_url
"
_debug2
"_authz_url"
"
$_authz_url
"
if
!
response
=
"
$(
_ge
t
"
$_authz_url
"
)
"
;
then
if
!
_send_signed_reques
t
"
$_authz_url
"
;
then
_err
"get to authz error."
_err
"get to authz error."
_err
"_authorizations_seg"
"
$_authorizations_seg
"
_err
"_authorizations_seg"
"
$_authorizations_seg
"
_err
"_authz_url"
"
$_authz_url
"
_err
"_authz_url"
"
$_authz_url
"
...
@@ -4069,7 +4069,11 @@ $_authorizations_map"
...
@@ -4069,7 +4069,11 @@ $_authorizations_map"
_debug
"sleep 2 secs to verify"
_debug
"sleep 2 secs to verify"
sleep
2
sleep
2
_debug
"checking"
_debug
"checking"
response
=
"
$(
_get
"
$uri
"
)
"
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
_send_signed_request
"
$uri
"
else
response
=
"
$(
_get
"
$uri
"
)
"
fi
if
[
"
$?
"
!=
"0"
]
;
then
if
[
"
$?
"
!=
"0"
]
;
then
_err
"
$d
:Verify error:
$response
"
_err
"
$d
:Verify error:
$response
"
_clearupwebbroot
"
$_currentRoot
"
"
$removelevel
"
"
$token
"
_clearupwebbroot
"
$_currentRoot
"
"
$removelevel
"
"
$token
"
...
@@ -4145,13 +4149,16 @@ $_authorizations_map"
...
@@ -4145,13 +4149,16 @@ $_authorizations_map"
fi
fi
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
)
"
if
!
_get
"
$Le_LinkCert
"
>
"
$CERT_PATH
"
;
then
_tempSignedResponse
=
"
$response
"
if
!
_send_signed_request
"
$Le_LinkCert
"
""
"needbase64"
;
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
"
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"
cat
"
$CERT_PATH
"
>
"
$CERT_FULLCHAIN_PATH
"
cat
"
$CERT_PATH
"
>
"
$CERT_FULLCHAIN_PATH
"
...
@@ -4161,6 +4168,7 @@ $_authorizations_map"
...
@@ -4161,6 +4168,7 @@ $_authorizations_map"
_end_n
=
"
$(
_math
$_end_n
+ 1
)
"
_end_n
=
"
$(
_math
$_end_n
+ 1
)
"
sed
-n
"
${
_end_n
}
,9999p"
"
$CERT_FULLCHAIN_PATH
"
>
"
$CA_CERT_PATH
"
sed
-n
"
${
_end_n
}
,9999p"
"
$CERT_FULLCHAIN_PATH
"
>
"
$CA_CERT_PATH
"
fi
fi
response
=
"
$_tempSignedResponse
"
else
else
if
!
_send_signed_request
"
${
ACME_NEW_ORDER
}
"
"{
\"
resource
\"
:
\"
$ACME_NEW_ORDER_RES
\"
,
\"
csr
\"
:
\"
$der
\"
}"
"needbase64"
;
then
if
!
_send_signed_request
"
${
ACME_NEW_ORDER
}
"
"{
\"
resource
\"
:
\"
$ACME_NEW_ORDER_RES
\"
,
\"
csr
\"
:
\"
$der
\"
}"
"needbase64"
;
then
_err
"Sign failed.
$response
"
_err
"Sign failed.
$response
"
...
@@ -4231,7 +4239,8 @@ $_authorizations_map"
...
@@ -4231,7 +4239,8 @@ $_authorizations_map"
while
[
"
$_link_issuer_retry
"
-lt
"
$_MAX_ISSUER_RETRY
"
]
;
do
while
[
"
$_link_issuer_retry
"
-lt
"
$_MAX_ISSUER_RETRY
"
]
;
do
_debug _link_issuer_retry
"
$_link_issuer_retry
"
_debug _link_issuer_retry
"
$_link_issuer_retry
"
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
if
_get
"
$Le_LinkIssuer
"
>
"
$CA_CERT_PATH
"
;
then
if
_send_signed_request
"
$Le_LinkIssuer
"
;
then
echo
"
$response
"
>
"
$CA_CERT_PATH
"
break
break
fi
fi
else
else
...
@@ -4957,7 +4966,7 @@ _deactivate() {
...
@@ -4957,7 +4966,7 @@ _deactivate() {
authzUri
=
"
$_authorizations_seg
"
authzUri
=
"
$_authorizations_seg
"
_debug2
"authzUri"
"
$authzUri
"
_debug2
"authzUri"
"
$authzUri
"
if
!
response
=
"
$(
_ge
t
"
$authzUri
"
)
"
;
then
if
!
_send_signed_reques
t
"
$authzUri
"
;
then
_err
"get to authz error."
_err
"get to authz error."
_err
"_authorizations_seg"
"
$_authorizations_seg
"
_err
"_authorizations_seg"
"
$_authorizations_seg
"
_err
"authzUri"
"
$authzUri
"
_err
"authzUri"
"
$authzUri
"
...
...
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