mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-25 06:31:42 +00:00
Merge pull request #1996 from Tigger2014/dev
dnsapi update dynu for api v2
This commit is contained in:
commit
b7b504d43a
@ -10,7 +10,7 @@
|
|||||||
Dynu_Token=""
|
Dynu_Token=""
|
||||||
#
|
#
|
||||||
#Endpoint
|
#Endpoint
|
||||||
Dynu_EndPoint="https://api.dynu.com/v1"
|
Dynu_EndPoint="https://api.dynu.com/v2"
|
||||||
#
|
#
|
||||||
#Author: Dynu Systems, Inc.
|
#Author: Dynu Systems, Inc.
|
||||||
#Report Bugs here: https://github.com/shar0119/acme.sh
|
#Report Bugs here: https://github.com/shar0119/acme.sh
|
||||||
@ -51,11 +51,11 @@ dns_dynu_add() {
|
|||||||
_debug _domain_name "$_domain_name"
|
_debug _domain_name "$_domain_name"
|
||||||
|
|
||||||
_info "Creating TXT record."
|
_info "Creating TXT record."
|
||||||
if ! _dynu_rest POST "dns/record/add" "{\"domain_name\":\"$_domain_name\",\"node_name\":\"$_node\",\"record_type\":\"TXT\",\"text_data\":\"$txtvalue\",\"state\":true,\"ttl\":90}"; then
|
if ! _dynu_rest POST "dns/$dnsId/record" "{\"domainId\":\"$dnsId\",\"nodeName\":\"$_node\",\"recordType\":\"TXT\",\"textData\":\"$txtvalue\",\"state\":true,\"ttl\":90}"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! _contains "$response" "text_data"; then
|
if ! _contains "$response" "200"; then
|
||||||
_err "Could not add TXT record."
|
_err "Could not add TXT record."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -132,11 +132,12 @@ _get_root() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! _dynu_rest GET "dns/get/$h"; then
|
if ! _dynu_rest GET "dns/getroot/$h"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
|
if _contains "$response" "\"domainName\":\"$h\"" >/dev/null; then
|
||||||
|
dnsId=$(printf "%s" "$response" | tr -d "{}" | cut -d , -f 2 | cut -d : -f 2)
|
||||||
_domain_name=$h
|
_domain_name=$h
|
||||||
_node=$(printf "%s" "$domain" | cut -d . -f 1-$p)
|
_node=$(printf "%s" "$domain" | cut -d . -f 1-$p)
|
||||||
return 0
|
return 0
|
||||||
@ -152,7 +153,7 @@ _get_recordid() {
|
|||||||
fulldomain=$1
|
fulldomain=$1
|
||||||
txtvalue=$2
|
txtvalue=$2
|
||||||
|
|
||||||
if ! _dynu_rest GET "dns/record/get?hostname=$fulldomain&rrtype=TXT"; then
|
if ! _dynu_rest GET "dns/$dnsId/record"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -161,19 +162,18 @@ _get_recordid() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_dns_record_id=$(printf "%s" "$response" | _egrep_o "{[^}]*}" | grep "\"text_data\":\"$txtvalue\"" | _egrep_o ",[^,]*," | grep ',"id":' | tr -d ",," | cut -d : -f 2)
|
_dns_record_id=$(printf "%s" "$response" | sed -e 's/[^{]*\({[^}]*}\)[^{]*/\1\n/g' | grep "\"textData\":\"$txtvalue\"" | sed -e 's/.*"id":\([^,]*\).*/\1/')
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
_delete_txt_record() {
|
_delete_txt_record() {
|
||||||
_dns_record_id=$1
|
_dns_record_id=$1
|
||||||
|
|
||||||
if ! _dynu_rest GET "dns/record/delete/$_dns_record_id"; then
|
if ! _dynu_rest DELETE "dns/$dnsId/record/$_dns_record_id"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! _contains "$response" "true"; then
|
if ! _contains "$response" "200"; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -189,7 +189,7 @@ _dynu_rest() {
|
|||||||
export _H1="Authorization: Bearer $Dynu_Token"
|
export _H1="Authorization: Bearer $Dynu_Token"
|
||||||
export _H2="Content-Type: application/json"
|
export _H2="Content-Type: application/json"
|
||||||
|
|
||||||
if [ "$data" ]; then
|
if [ "$data" ] || [ "$m" = "DELETE" ]; then
|
||||||
_debug data "$data"
|
_debug data "$data"
|
||||||
response="$(_post "$data" "$Dynu_EndPoint/$ep" "" "$m")"
|
response="$(_post "$data" "$Dynu_EndPoint/$ep" "" "$m")"
|
||||||
else
|
else
|
||||||
@ -216,8 +216,8 @@ _dynu_authentication() {
|
|||||||
_err "Authentication failed."
|
_err "Authentication failed."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if _contains "$response" "accessToken"; then
|
if _contains "$response" "access_token"; then
|
||||||
Dynu_Token=$(printf "%s" "$response" | tr -d "[]" | cut -d , -f 2 | cut -d : -f 2 | cut -d '"' -f 2)
|
Dynu_Token=$(printf "%s" "$response" | tr -d "{}" | cut -d , -f 1 | cut -d : -f 2 | cut -d '"' -f 2)
|
||||||
fi
|
fi
|
||||||
if _contains "$Dynu_Token" "null"; then
|
if _contains "$Dynu_Token" "null"; then
|
||||||
Dynu_Token=""
|
Dynu_Token=""
|
||||||
|
Loading…
Reference in New Issue
Block a user