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
0093dc3d
Commit
0093dc3d
authored
May 13, 2019
by
neilpang
Browse files
fix
https://github.com/Neilpang/acme.sh/issues/2256
parent
ccefd3be
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
0093dc3d
...
@@ -1114,14 +1114,14 @@ _createcsr() {
...
@@ -1114,14 +1114,14 @@ _createcsr() {
elif [ -z "$domainlist" ] || [ "$domainlist" = "$NO_VALUE" ]; then
elif [ -z "$domainlist" ] || [ "$domainlist" = "$NO_VALUE" ]; then
#single domain
#single domain
_info "Single domain" "$domain"
_info "Single domain" "$domain"
printf
--
"
\n
subjectAltName=DNS:
$(
_idn
$domain
)
"
>>
"
$csrconf
"
printf -- "\nsubjectAltName=DNS:$(_idn
"
$domain
"
)" >>"$csrconf"
else
else
domainlist="$(_idn "$domainlist")"
domainlist="$(_idn "$domainlist")"
_debug2 domainlist "$domainlist"
_debug2 domainlist "$domainlist"
if _contains "$domainlist" ","; then
if _contains "$domainlist" ","; then
alt
=
"DNS:
$(
_idn
$domain
)
,DNS:
$(
echo
"
$domainlist
"
|
sed
"s/,,/,/g"
|
sed
"s/,/,DNS:/g"
)
"
alt="DNS:$(_idn
"
$domain
"
),DNS:$(echo "$domainlist" | sed "s/,,/,/g" | sed "s/,/,DNS:/g")"
else
else
alt
=
"DNS:
$(
_idn
$domain
)
,DNS:
$domainlist
"
alt="DNS:$(_idn
"
$domain
"
),DNS:$domainlist"
fi
fi
#multi
#multi
_info "Multi domain" "$alt"
_info "Multi domain" "$alt"
...
@@ -3648,9 +3648,9 @@ _check_dns_entries() {
...
@@ -3648,9 +3648,9 @@ _check_dns_entries() {
for entry in $dns_entries; do
for entry in $dns_entries; do
d=$(_getfield "$entry" 1)
d=$(_getfield "$entry" 1)
txtdomain=$(_getfield "$entry" 2)
txtdomain=$(_getfield "$entry" 2)
txtdomain
=
$(
_idn
$txtdomain
)
txtdomain=$(_idn
"
$txtdomain
"
)
aliasDomain=$(_getfield "$entry" 3)
aliasDomain=$(_getfield "$entry" 3)
aliasDomain
=
$(
_idn
$aliasDomain
)
aliasDomain=$(_idn
"
$aliasDomain
"
)
txt=$(_getfield "$entry" 5)
txt=$(_getfield "$entry" 5)
d_api=$(_getfield "$entry" 6)
d_api=$(_getfield "$entry" 6)
_debug "d" "$d"
_debug "d" "$d"
...
@@ -3847,7 +3847,7 @@ issue() {
...
@@ -3847,7 +3847,7 @@ issue() {
if [ -z "$vlist" ]; then
if [ -z "$vlist" ]; then
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACME_VERSION" = "2" ]; then
#make new order request
#make new order request
_identifiers
=
"{
\"
type
\"
:
\"
dns
\"
,
\"
value
\"
:
\"
$(
_idn
$_main_domain
)
\"
}"
_identifiers="{\"type\":\"dns\",\"value\":\"$(_idn
"
$_main_domain
"
)\"}"
_w_index=1
_w_index=1
while true; do
while true; do
d="$(echo "$_alt_domains," | cut -d , -f "$_w_index")"
d="$(echo "$_alt_domains," | cut -d , -f "$_w_index")"
...
@@ -3856,7 +3856,7 @@ issue() {
...
@@ -3856,7 +3856,7 @@ issue() {
if [ -z "$d" ]; then
if [ -z "$d" ]; then
break
break
fi
fi
_identifiers
=
"
$_identifiers
,{
\"
type
\"
:
\"
dns
\"
,
\"
value
\"
:
\"
$(
_idn
$d
)
\"
}"
_identifiers="$_identifiers,{\"type\":\"dns\",\"value\":\"$(_idn
"
$d
"
)\"}"
done
done
_debug2 _identifiers "$_identifiers"
_debug2 _identifiers "$_identifiers"
if ! _send_signed_request "$ACME_NEW_ORDER" "{\"identifiers\": [$_identifiers]}"; then
if ! _send_signed_request "$ACME_NEW_ORDER" "{\"identifiers\": [$_identifiers]}"; then
...
@@ -3944,7 +3944,7 @@ $_authorizations_map"
...
@@ -3944,7 +3944,7 @@ $_authorizations_map"
fi
fi
if [ "$ACME_VERSION" = "2" ]; then
if [ "$ACME_VERSION" = "2" ]; then
response
=
"
$(
echo
"
$_authorizations_map
"
|
grep
"^
$(
_idn
$d
)
,"
|
sed
"s/
$d
,//"
)
"
response="$(echo "$_authorizations_map" | grep "^$(_idn
"
$d
"
)," | sed "s/$d,//")"
_debug2 "response" "$response"
_debug2 "response" "$response"
if [ -z "$response" ]; then
if [ -z "$response" ]; then
_err "get to authz error."
_err "get to authz error."
...
...
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