ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polish error messages and make "detect root zone" scaleable

Browse Source
This commit is contained in:
Michael Braunoeder 2019-09-18 09:45:31 +02:00
parent b30f94cf82
commit 171fb13d21
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dnsapi/dns_rcode0.sh
View File

@ -33,7 +33,7 @@ dns_rcode0_add() {
if [ -z "$RCODE0_API_TOKEN" ]; then if [ -z "$RCODE0_API_TOKEN" ]; then
RCODE0_API_TOKEN="" RCODE0_API_TOKEN=""
_err "Missing Rcode0 API Token." _err "Missing Rcode0 ACME API Token."
_err "Please login and create your token at httsp://my.rcodezero.at/enableapi and try again." _err "Please login and create your token at httsp://my.rcodezero.at/enableapi and try again."
return 1 return 1
fi fi
@ -52,7 +52,7 @@ dns_rcode0_add() {
_debug "Detect root zone" _debug "Detect root zone"
if ! _get_root "$fulldomain"; then if ! _get_root "$fulldomain"; then
_err "invalid domain" _err "No 'MASTER' zone for $fulldomain found at RcodeZero Anycast."
return 1 return 1
fi fi
_debug _domain "$_domain" _debug _domain "$_domain"
@ -198,21 +198,25 @@ _get_root() {
domain=$1 domain=$1
i=1 i=1
if _rcode0_rest "GET" "/api/v1/acme/zones"; then # if _rcode0_rest "GET" "/api/v1/acme/zones"; then
_zones_response="$response" # _zones_response="$response"
fi # fi
#
_debug2 "$response" # _debug2 "$response"
while true; do while true; do
h=$(printf "%s" "$domain" | cut -d . -f $i-100) h=$(printf "%s" "$domain" | cut -d . -f $i-100)
_debug "H: $h" _debug "try to find: $h"
if _contains "$_zones_response" "\"domain\":\"$h\""; then if _rcode0_rest "GET" "/api/v1/acme/zones/$h"; then
_domain="$h" if [ "$response" = "[\"found\"]" ]; then
if [ -z "$h" ]; then _domain="$h"
_domain="=2E" if [ -z "$h" ]; then
_domain="=2E"
fi
return 0
elif [ "$response" = "[\"not a master domain\"]" ]; then
return 1
fi fi
return 0
fi fi
if [ -z "$h" ]; then if [ -z "$h" ]; then
@ -220,7 +224,7 @@ _get_root() {
fi fi
i=$(_math $i + 1) i=$(_math $i + 1)
done done
_debug "$domain not found" _debug "no matching domain for $domain found"
return 1 return 1
} }