mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-22 05:01:40 +00:00
https://github.com/Neilpang/acme.sh/issues/1246
This commit is contained in:
parent
71013b372d
commit
584fb2904b
14
acme.sh
14
acme.sh
@ -3594,7 +3594,7 @@ $_authorizations_map"
|
||||
entry="$(printf "%s\n" "$response" | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
|
||||
_debug entry "$entry"
|
||||
if [ -z "$entry" ]; then
|
||||
_err "Error, can not get domain token $d"
|
||||
_err "Error, can not get domain token entry $d"
|
||||
_clearup
|
||||
_on_issue_err "$_post_hook"
|
||||
return 1
|
||||
@ -3602,6 +3602,12 @@ $_authorizations_map"
|
||||
token="$(printf "%s\n" "$entry" | _egrep_o '"token":"[^"]*' | cut -d : -f 2 | tr -d '"')"
|
||||
_debug token "$token"
|
||||
|
||||
if [ -z "$token" ]; then
|
||||
_err "Error, can not get domain token $entry"
|
||||
_clearup
|
||||
_on_issue_err "$_post_hook"
|
||||
return 1
|
||||
fi
|
||||
if [ "$ACME_VERSION" = "2" ]; then
|
||||
uri="$(printf "%s\n" "$entry" | _egrep_o '"url":"[^"]*' | cut -d '"' -f 4 | _head_n 1)"
|
||||
else
|
||||
@ -3609,6 +3615,12 @@ $_authorizations_map"
|
||||
fi
|
||||
_debug uri "$uri"
|
||||
|
||||
if [ -z "$uri" ]; then
|
||||
_err "Error, can not get domain uri. $entry"
|
||||
_clearup
|
||||
_on_issue_err "$_post_hook"
|
||||
return 1
|
||||
fi
|
||||
keyauthorization="$token.$thumbprint"
|
||||
_debug keyauthorization "$keyauthorization"
|
||||
|
||||
|
@ -35,53 +35,9 @@ dns_inwx_add() {
|
||||
fi
|
||||
_debug _sub_domain "$_sub_domain"
|
||||
_debug _domain "$_domain"
|
||||
_debug "Getting txt records"
|
||||
|
||||
xml_content=$(printf '<?xml version="1.0" encoding="UTF-8"?>
|
||||
<methodCall>
|
||||
<methodName>nameserver.info</methodName>
|
||||
<params>
|
||||
<param>
|
||||
<value>
|
||||
<struct>
|
||||
<member>
|
||||
<name>domain</name>
|
||||
<value>
|
||||
<string>%s</string>
|
||||
</value>
|
||||
</member>
|
||||
<member>
|
||||
<name>type</name>
|
||||
<value>
|
||||
<string>TXT</string>
|
||||
</value>
|
||||
</member>
|
||||
<member>
|
||||
<name>name</name>
|
||||
<value>
|
||||
<string>%s</string>
|
||||
</value>
|
||||
</member>
|
||||
</struct>
|
||||
</value>
|
||||
</param>
|
||||
</params>
|
||||
</methodCall>' "$_domain" "$_sub_domain")
|
||||
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
|
||||
|
||||
if ! printf "%s" "$response" | grep "Command completed successfully" >/dev/null; then
|
||||
_err "Error could net get txt records"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! printf "%s" "$response" | grep "count" >/dev/null; then
|
||||
_info "Adding record"
|
||||
_inwx_add_record "$_domain" "$_sub_domain" "$txtvalue"
|
||||
else
|
||||
_record_id=$(printf '%s' "$response" | _egrep_o '.*(<member><name>record){1}(.*)([0-9]+){1}' | _egrep_o '<name>id<\/name><value><int>[0-9]+' | _egrep_o '[0-9]+')
|
||||
_info "Updating record"
|
||||
_inwx_update_record "$_record_id" "$txtvalue"
|
||||
fi
|
||||
_info "Adding record"
|
||||
_inwx_add_record "$_domain" "$_sub_domain" "$txtvalue"
|
||||
|
||||
}
|
||||
|
||||
@ -147,7 +103,7 @@ dns_inwx_rm() {
|
||||
</methodCall>' "$_domain" "$_sub_domain")
|
||||
response="$(_post "$xml_content" "$INWX_Api" "" "POST")"
|
||||
|
||||
if ! printf "%s" "$response" | grep "Command completed successfully" >/dev/null; then
|
||||
if ! _contains "$response" "Command completed successfully"; then
|
||||
_err "Error could not get txt records"
|
||||
return 1
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user