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
552a49a6
Unverified
Commit
552a49a6
authored
Jan 27, 2020
by
neil
Committed by
GitHub
Jan 27, 2020
Browse files
Merge pull request #2707 from Neilpang/2695
fix 2695
parents
57b4eda0
97741398
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
552a49a6
...
...
@@ -4119,45 +4119,59 @@ $_authorizations_map"
entry
=
"
$(
echo
"
$response
"
| _egrep_o
'[^\{]*"type":"'
$vtype
'"[^\}]*'
)
"
_debug entry
"
$entry
"
keyauthorization
=
""
if
[
-z
"
$entry
"
]
;
then
_err
"Error, can not get domain token entry
$d
"
_supported_vtypes
=
"
$(
echo
"
$response
"
| _egrep_o
"
\"
challenges
\"
:
\[
[^]]*]"
|
tr
'{'
"
\n
"
|
grep type
|
cut
-d
'"'
-f
4 |
tr
"
\n
"
' '
)
"
if
[
"
$_supported_vtypes
"
]
;
then
_err
"The supported validation types are:
$_supported_vtypes
, but you specified:
$vtype
"
if
!
_startswith
"
$d
"
'*.'
;
then
_debug
"Not a wildcard domain, lets check whether the validation is already valid."
if
echo
"
$response
"
|
grep
'"status":"valid"'
>
/dev/null 2>&1
;
then
_debug
"
$d
is already valid."
keyauthorization
=
"
$STATE_VERIFIED
"
_debug keyauthorization
"
$keyauthorization
"
fi
fi
if
[
-z
"
$keyauthorization
"
]
;
then
_err
"Error, can not get domain token entry
$d
for
$vtype
"
_supported_vtypes
=
"
$(
echo
"
$response
"
| _egrep_o
"
\"
challenges
\"
:
\[
[^]]*]"
|
tr
'{'
"
\n
"
|
grep type
|
cut
-d
'"'
-f
4 |
tr
"
\n
"
' '
)
"
if
[
"
$_supported_vtypes
"
]
;
then
_err
"The supported validation types are:
$_supported_vtypes
, but you specified:
$vtype
"
fi
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
token
=
"
$(
echo
"
$entry
"
| _egrep_o
'"token":"[^"]*'
|
cut
-d
:
-f
2 |
tr
-d
'"'
)
"
_debug token
"
$token
"
if
[
-z
"
$token
"
]
;
then
_err
"Error, can not get domain token
$entry
"
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
uri
=
"
$(
echo
"
$entry
"
| _egrep_o
'"url":"[^"]*'
|
cut
-d
'"'
-f
4 | _head_n 1
)
"
else
uri
=
"
$(
echo
"
$entry
"
| _egrep_o
'"uri":"[^"]*'
|
cut
-d
'"'
-f
4
)
"
fi
_debug uri
"
$uri
"
if
[
-z
"
$keyauthorization
"
]
;
then
token
=
"
$(
echo
"
$entry
"
| _egrep_o
'"token":"[^"]*'
|
cut
-d
:
-f
2 |
tr
-d
'"'
)
"
_debug token
"
$token
"
if
[
-z
"
$uri
"
]
;
then
_err
"Error, can not get domain uri.
$entry
"
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
keyauthorization
=
"
$token
.
$thumbprint
"
_debug keyauthorization
"
$keyauthorization
"
if
[
-z
"
$token
"
]
;
then
_err
"Error, can not get domain token
$entry
"
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
uri
=
"
$(
echo
"
$entry
"
| _egrep_o
'"url":"[^"]*'
|
cut
-d
'"'
-f
4 | _head_n 1
)
"
else
uri
=
"
$(
echo
"
$entry
"
| _egrep_o
'"uri":"[^"]*'
|
cut
-d
'"'
-f
4
)
"
fi
_debug uri
"
$uri
"
if
printf
"%s"
"
$response
"
|
grep
'"status":"valid"'
>
/dev/null 2>&1
;
then
_debug
"
$d
is already verified."
keyauthorization
=
"
$STATE_VERIFIED
"
if
[
-z
"
$uri
"
]
;
then
_err
"Error, can not get domain uri.
$entry
"
_clearup
_on_issue_err
"
$_post_hook
"
return
1
fi
keyauthorization
=
"
$token
.
$thumbprint
"
_debug keyauthorization
"
$keyauthorization
"
if
printf
"%s"
"
$response
"
|
grep
'"status":"valid"'
>
/dev/null 2>&1
;
then
_debug
"
$d
is already verified."
keyauthorization
=
"
$STATE_VERIFIED
"
_debug keyauthorization
"
$keyauthorization
"
fi
fi
dvlist
=
"
$d$sep$keyauthorization$sep$uri$sep$vtype$sep$_currentRoot
"
...
...
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