Merge pull request #3208 from cusae/dev

[mirror_acme.sh.git] / dnsapi / dns_nm.sh

diff --git a/dnsapi/dns_nm.sh b/dnsapi/dns_nm.sh
index ec0e2d88864034c9d6ac53c4cfdd110358bafce3..4dfcc777a252eaae4b48cf28de630921ccc12543 100644 (file)
--- a/dnsapi/dns_nm.sh
+++ b/dnsapi/dns_nm.sh
@@ -6,7 +6,7 @@
 # Environment variables:
 #
 #  - $NM_user      (your namemaster.de API username)
-#  - $NM_md5       (your namemaster.de API password_as_md5hash)
+#  - $NM_sha256       (your namemaster.de API password_as_sha256hash)
 #
 # Author: Thilo Gass <thilo.gass@gmail.com>
 # Git repo: https://github.com/ThiloGa/acme.sh
@@ -14,79 +14,75 @@
 #-- dns_nm_add() - Add TXT record --------------------------------------
 # Usage: dns_nm_add _acme-challenge.subdomain.domain.com "XyZ123..."
 
+namemaster_api="https://namemaster.de/api/api.php"
+
 dns_nm_add() {
   fulldomain=$1
   txt_value=$2
   _info "Using DNS-01 namemaster hook"
 
   NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
-  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
-  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
+  NM_sha256="${NM_sha256:-$(_readaccountconf_mutable NM_sha256)}"
+  if [ -z "$NM_user" ] || [ -z "$NM_sha256" ]; then
     NM_user=""
-    NM_md5=""
-    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
+    NM_sha256=""
+    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_sha256 environment variables."
     return 1
   fi
-  #save the api user and md5 password to the account conf file.
+  #save the api user and sha256 password to the account conf file.
   _debug "Save user and hash"
   _saveaccountconf_mutable NM_user "$NM_user"
-  _saveaccountconf_mutable NM_md5 "$NM_md5"
+  _saveaccountconf_mutable NM_sha256 "$NM_sha256"
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain" "$fulldomain"
+    return 1
+  fi
+
+  _info "die Zone lautet:" "$zone"
 
-  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
-  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=ACME&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
-  erg="$(_get "$get")"
+  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Antwort=csv&Typ=ACME&zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Auto&Lifetime=3600"
 
-  exit_code="$?"
-  if [ "$exit_code" != 0 ]; then
-    _err "error Ading $zone TXT: $txt_value"
-    _err "Error $exit_code"
+  if ! erg="$(_get "$get")"; then
+    _err "error Adding $fulldomain TXT: $txt_value"
     return 1
   fi
 
   if _contains "$erg" "Success"; then
     _info "Success, TXT Added, OK"
   else
-    _err "error Adding $zone TXT: $txt_value erg: $erg"
+    _err "error Adding $fulldomain TXT: $txt_value erg: $erg"
     return 1
   fi
 
-  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
+  _debug "ok Auto $fulldomain TXT: $txt_value erg: $erg"
   return 0
 }
 
 dns_nm_rm() {
 
   fulldomain=$1
-  txt_value=$2
+  txtvalue=$2
+  _info "TXT enrty in $fulldomain is deleted automatically"
+  _debug fulldomain "$fulldomain"
+  _debug txtvalue "$txtvalue"
 
-  NM_user="${NM_user:-$(_readaccountconf_mutable NM_user)}"
-  NM_md5="${NM_md5:-$(_readaccountconf_mutable NM_md5)}"
-  if [ -z "$NM_user" ] || [ -z "$NM_md5" ]; then
-    NM_user=""
-    NM_md5=""
-    _err "No auth details provided. Please set user credentials using the \$NM_user and \$NM_md5 environment variables."
-    return 1
-  fi
+}
 
-  zone="$(echo $fulldomain | _egrep_o "[^.]+.[^.]+$")"
-  get="https://namemaster.de/api/api.php?User=$NM_user&Password=$NM_md5&Antwort=csv&Int=0&Typ=TXT&Zone=$zone&hostname=$fulldomain&TXT=$txt_value&Action=Delete_IN&TTL=0"
-  erg="$(_get "$get")"
+_get_root() {
 
-  exit_code="$?"
-  if [ "$exit_code" != "0" ]; then
-    _err "error Deleting $zone TXT: $txt_value"
-    _err "Error $exit_code"
-    return 1
-  fi
+  domain=$1
 
-  if _contains "$erg" "Success"; then
-    _info "Success, TXT removed, OK"
-  else
-    _err "error Auto $zone TXT: $txt_value erg: $erg"
+  get="$namemaster_api?User=$NM_user&Password=$NM_sha256&Typ=acme&hostname=$domain&Action=getzone&antwort=csv"
+
+  if ! zone="$(_get "$get")"; then
+    _err "error getting Zone"
     return 1
+  else
+    if _contains "$zone" "hostname not found"; then
+      return 1
+    fi
   fi
 
-  _debug "ok Auto $zone TXT: $txt_value erg: $erg"
-  return 0
-
 }