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
84e1f364
Unverified
Commit
84e1f364
authored
Jul 08, 2020
by
neil
Committed by
GitHub
Jul 08, 2020
Browse files
Merge pull request #3035 from acmesh-official/dev
sync
parents
4daef529
0ab2cfaf
Changes
3
Show whitespace changes
Inline
Side-by-side
Dockerfile
View file @
84e1f364
FROM
alpine:3.1
0
FROM
alpine:3.1
2
RUN
apk update
-f
\
RUN
apk update
-f
\
&&
apk
--no-cache
add
-f
\
&&
apk
--no-cache
add
-f
\
...
...
acme.sh
View file @
84e1f364
...
@@ -1014,8 +1014,32 @@ _sign() {
...
@@ -1014,8 +1014,32 @@ _sign() {
fi
fi
_debug3
"_signedECText"
"
$_signedECText
"
_debug3
"_signedECText"
"
$_signedECText
"
_ec_r
=
"
$(
echo
"
$_signedECText
"
| _head_n 2 | _tail_n 1 |
cut
-d
:
-f
4 |
tr
-d
"
\r\n
"
)
"
_ec_r
=
"
$(
echo
"
$_signedECText
"
| _head_n 2 | _tail_n 1 |
cut
-d
:
-f
4 |
tr
-d
"
\r\n
"
)
"
_debug3
"_ec_r"
"
$_ec_r
"
_ec_s
=
"
$(
echo
"
$_signedECText
"
| _head_n 3 | _tail_n 1 |
cut
-d
:
-f
4 |
tr
-d
"
\r\n
"
)
"
_ec_s
=
"
$(
echo
"
$_signedECText
"
| _head_n 3 | _tail_n 1 |
cut
-d
:
-f
4 |
tr
-d
"
\r\n
"
)
"
if
[
"
$__ECC_KEY_LEN
"
-eq
"256"
]
;
then
while
[
"
${#
_ec_r
}
"
-lt
"64"
]
;
do
_ec_r
=
"0
${
_ec_r
}
"
done
while
[
"
${#
_ec_s
}
"
-lt
"64"
]
;
do
_ec_s
=
"0
${
_ec_s
}
"
done
fi
if
[
"
$__ECC_KEY_LEN
"
-eq
"384"
]
;
then
while
[
"
${#
_ec_r
}
"
-lt
"96"
]
;
do
_ec_r
=
"0
${
_ec_r
}
"
done
while
[
"
${#
_ec_s
}
"
-lt
"96"
]
;
do
_ec_s
=
"0
${
_ec_s
}
"
done
fi
if
[
"
$__ECC_KEY_LEN
"
-eq
"512"
]
;
then
while
[
"
${#
_ec_r
}
"
-lt
"132"
]
;
do
_ec_r
=
"0
${
_ec_r
}
"
done
while
[
"
${#
_ec_s
}
"
-lt
"132"
]
;
do
_ec_s
=
"0
${
_ec_s
}
"
done
fi
_debug3
"_ec_r"
"
$_ec_r
"
_debug3
"_ec_s"
"
$_ec_s
"
_debug3
"_ec_s"
"
$_ec_s
"
printf
"%s"
"
$_ec_r$_ec_s
"
| _h2b | _base64
printf
"%s"
"
$_ec_r$_ec_s
"
| _h2b | _base64
else
else
...
@@ -4098,17 +4122,17 @@ $_authorizations_map"
...
@@ -4098,17 +4122,17 @@ $_authorizations_map"
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
if
[
"
$ACME_VERSION
"
=
"2"
]
;
then
_idn_d
=
"
$(
_idn
"
$d
"
)
"
_idn_d
=
"
$(
_idn
"
$d
"
)
"
_candi
n
dates
=
"
$(
echo
"
$_authorizations_map
"
|
grep
-i
"^
$_idn_d
,"
)
"
_candidates
=
"
$(
echo
"
$_authorizations_map
"
|
grep
-i
"^
$_idn_d
,"
)
"
_debug2 _candi
n
dates
"
$_candi
n
dates
"
_debug2 _candidates
"
$_candidates
"
if
[
"
$(
echo
"
$_candi
n
dates
"
|
wc
-l
)
"
-gt
1
]
;
then
if
[
"
$(
echo
"
$_candidates
"
|
wc
-l
)
"
-gt
1
]
;
then
for
_can
in
$_candi
n
dates
;
do
for
_can
in
$_candidates
;
do
if
_startswith
"
$(
echo
"
$_can
"
|
tr
'.'
'|'
)
"
"
$(
echo
"
$_idn_d
"
|
tr
'.'
'|'
)
,"
;
then
if
_startswith
"
$(
echo
"
$_can
"
|
tr
'.'
'|'
)
"
"
$(
echo
"
$_idn_d
"
|
tr
'.'
'|'
)
,"
;
then
_candi
n
dates
=
"
$_can
"
_candidates
=
"
$_can
"
break
break
fi
fi
done
done
fi
fi
response
=
"
$(
echo
"
$_candi
n
dates
"
|
sed
"s/
$_idn_d
,//"
)
"
response
=
"
$(
echo
"
$_candidates
"
|
sed
"s/
$_idn_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."
...
...
dnsapi/dns_variomedia.sh
View file @
84e1f364
...
@@ -107,7 +107,7 @@ _get_root() {
...
@@ -107,7 +107,7 @@ _get_root() {
fi
fi
if
_startswith
"
$response
"
"
\{\"
data
\"
:"
;
then
if
_startswith
"
$response
"
"
\{\"
data
\"
:"
;
then
if
_contains
"
$response
"
"
\"
id
\"
:
\"
$h
\"
"
;
then
if
_contains
"
$response
"
"
\"
id
\"
:
\"
$h
\"
"
;
then
_sub_domain
=
"
$(
echo
"
$fulldomain
"
|
sed
"s/
\\
.
$h
\$
//"
)
"
_sub_domain
=
"
$(
echo
"
$fulldomain
"
|
sed
"s/
\\
.
$h
\$
//"
)
"
_domain
=
$h
_domain
=
$h
return
0
return
0
...
...
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