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
02882fb3
Unverified
Commit
02882fb3
authored
Mar 17, 2019
by
neil
Committed by
GitHub
Mar 17, 2019
Browse files
Merge pull request #2168 from Neilpang/dev
sync
parents
44c1572b
c74d597c
Changes
3
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
02882fb3
...
...
@@ -2111,7 +2111,7 @@ _startserver() {
echo 'HTTP/1.0 200 OK'; \
echo 'Content-Length\: $_content_len'; \
echo ''; \
printf '
$content
';"
&
printf
--
'$content';" &
serverproc="$!"
}
...
...
@@ -3931,21 +3931,21 @@ $_authorizations_map"
else
txtdomain="_acme-challenge.$_d_alias"
fi
dns_entr
ies
=
"
${
dns_entries
}
${
_dns_root_d
}${
dvsep
}
_acme-challenge.
$_dns_root_d$dvsep$txtdomain$dvsep$_currentRoot
"
dns_entr
y="
${_dns_root_d}${dvsep}_acme-challenge.$_dns_root_d$dvsep$txtdomain$dvsep$_currentRoot"
else
txtdomain="_acme-challenge.$_dns_root_d"
dns_entr
ies
=
"
${
dns_entries
}
${
_dns_root_d
}${
dvsep
}
_acme-challenge.
$_dns_root_d$dvsep$dvsep$_currentRoot
"
dns_entr
y="
${_dns_root_d}${dvsep}_acme-challenge.$_dns_root_d$dvsep$dvsep$_currentRoot"
fi
_debug txtdomain "$txtdomain"
txt="$(printf "%s" "$keyauthorization" | _digest "sha256" | _url_replace)"
_debug txt "$txt"
d_api="$(_findHook "$_dns_root_d" dnsapi "$_currentRoot")"
_debug d_api "$d_api"
dns_entries
=
"
$dns_entries$dvsep$txt
${
dvsep
}
$d_api
"
_debug2
"
$dns_entr
ies
"
dns_entry="$dns_entry$dvsep$txt${dvsep}$d_api
"
_debug2
dns_entry
"$dns_entr
y
"
if [ "$d_api" ]; then
_info "Found domain api file: $d_api"
else
...
...
@@ -3984,6 +3984,9 @@ $_authorizations_map"
_clearup
return 1
fi
dns_entries="$dns_entries$dns_entry
"
_debug2 "$dns_entries"
dnsadded='1'
fi
done
...
...
dnsapi/dns_namecom.sh
View file @
02882fb3
...
...
@@ -13,6 +13,8 @@ dns_namecom_add() {
fulldomain
=
$1
txtvalue
=
$2
Namecom_Username
=
"
${
Namecom_Username
:-
$(
_readaccountconf_mutable Namecom_Username
)
}
"
Namecom_Token
=
"
${
Namecom_Token
:-
$(
_readaccountconf_mutable Namecom_Token
)
}
"
# First we need name.com credentials.
if
[
-z
"
$Namecom_Username
"
]
;
then
Namecom_Username
=
""
...
...
@@ -27,10 +29,11 @@ dns_namecom_add() {
_err
"Please specify that in your environment variable."
return
1
fi
_debug Namecom_Username
"
$Namecom_Username
"
_secure_debug Namecom_Token
"
$Namecom_Token
"
# Save them in configuration.
_saveaccountconf Namecom_Username
"
$Namecom_Username
"
_saveaccountconf Namecom_Token
"
$Namecom_Token
"
_saveaccountconf
_mutable
Namecom_Username
"
$Namecom_Username
"
_saveaccountconf
_mutable
Namecom_Token
"
$Namecom_Token
"
# Login in using API
if
!
_namecom_login
;
then
...
...
@@ -46,7 +49,7 @@ dns_namecom_add() {
# Add TXT record.
_namecom_addtxt_json
=
"{
\"
host
\"
:
\"
$_sub_domain
\"
,
\"
type
\"
:
\"
TXT
\"
,
\"
answer
\"
:
\"
$txtvalue
\"
,
\"
ttl
\"
:
\"
300
\"
}"
if
_namecom_rest POST
"domains/
$_domain
/records"
"
$_namecom_addtxt_json
"
;
then
_retvalue
=
$(
printf
"%s
\n
"
"
$response
"
| _egrep_o
"
\"
$_sub_domain
\"
"
)
_retvalue
=
$(
echo
"
$response
"
| _egrep_o
"
\"
$_sub_domain
\"
"
)
if
[
"
$_retvalue
"
]
;
then
_info
"Successfully added TXT record, ready for validation."
return
0
...
...
@@ -63,6 +66,8 @@ dns_namecom_rm() {
fulldomain
=
$1
txtvalue
=
$2
Namecom_Username
=
"
${
Namecom_Username
:-
$(
_readaccountconf_mutable Namecom_Username
)
}
"
Namecom_Token
=
"
${
Namecom_Token
:-
$(
_readaccountconf_mutable Namecom_Token
)
}
"
if
!
_namecom_login
;
then
return
1
fi
...
...
@@ -75,7 +80,7 @@ dns_namecom_rm() {
# Get the record id.
if
_namecom_rest GET
"domains/
$_domain
/records"
;
then
_record_id
=
$(
printf
"%s
\n
"
"
$response
"
| _egrep_o
"
\"
id
\"
:[0-9]+,
\"
domainName
\"
:
\"
$_domain
\"
,
\"
host
\"
:
\"
$_sub_domain
\"
,
\"
fqdn
\"
:
\"
$fulldomain
.
\"
,
\"
type
\"
:
\"
TXT
\"
,
\"
answer
\"
:
\"
$txtvalue
\"
"
|
cut
-d
\"
-f
3 | _egrep_o
[
0-9]+
)
_record_id
=
$(
echo
"
$response
"
| _egrep_o
"
\"
id
\"
:[0-9]+,
\"
domainName
\"
:
\"
$_domain
\"
,
\"
host
\"
:
\"
$_sub_domain
\"
,
\"
fqdn
\"
:
\"
$fulldomain
.
\"
,
\"
type
\"
:
\"
TXT
\"
,
\"
answer
\"
:
\"
$txtvalue
\"
"
|
cut
-d
\"
-f
3 | _egrep_o
[
0-9]+
)
_debug record_id
"
$_record_id
"
if
[
"
$_record_id
"
]
;
then
_info
"Successfully retrieved the record id for ACME challenge."
...
...
@@ -126,10 +131,12 @@ _namecom_login() {
_namecom_auth
=
$(
printf
"%s:%s"
"
$Namecom_Username
"
"
$Namecom_Token
"
| _base64
)
if
_namecom_rest GET
"hello"
;
then
retcode
=
$(
printf
"%s
\n
"
"
$response
"
| _egrep_o
"
\"
username
\"\:\"
$Namecom_Username
\"
"
)
retcode
=
$(
echo
"
$response
"
| _egrep_o
"
\"
username
\"\:\"
$Namecom_Username
\"
"
)
if
[
"
$retcode
"
]
;
then
_info
"Successfully logged in."
else
_err
"
$response
"
_err
"Please add your ip to api whitelist"
_err
"Logging in failed."
return
1
fi
...
...
dnsapi/dns_netcup.sh
View file @
02882fb3
...
...
@@ -8,6 +8,7 @@ end="https://ccp.netcup.net/run/webservice/servers/endpoint.php?JSON"
client
=
""
dns_netcup_add
()
{
_debug NC_Apikey
"
$NC_Apikey
"
login
if
[
"
$NC_Apikey
"
=
""
]
||
[
"
$NC_Apipw
"
=
""
]
||
[
"
$NC_CID
"
=
""
]
;
then
_err
"No Credentials given"
...
...
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