From 8494ac8f3dbe88123db60ab4441f27574d13f46e Mon Sep 17 00:00:00 2001
From: Nick Stepa <hired777@gmail.com>
Date: Sun, 12 Jan 2020 13:29:09 +0100
Subject: [PATCH 1/4] Fix dns records removing after usage.

---
 dnsapi/dns_yandex.sh | 128 ++++++++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/dnsapi/dns_yandex.sh b/dnsapi/dns_yandex.sh
index a4f3978..90bbf74 100755
--- a/dnsapi/dns_yandex.sh
+++ b/dnsapi/dns_yandex.sh
@@ -6,83 +6,91 @@
 # Values to export:
 # export PDD_Token="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
+# Sometimes cloudflare / google doesn't pick new dns recods fast enough.
+# You can add --dnssleep XX to params as workaround.
+
 ########  Public functions #####################
 
 #Usage: dns_myapi_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_yandex_add() {
-  fulldomain="${1}"
-  txtvalue="${2}"
-  _debug "Calling: dns_yandex_add() '${fulldomain}' '${txtvalue}'"
+  local fulldomain="${1}"
+  local txtvalue="${2}"
+  _debug "Calling: dns_yandex_add() '${fulldomain}' '$txtvalue'"
+
   _PDD_credentials || return 1
-  export _H1="PddToken: $PDD_Token"
 
   _PDD_get_domain "$fulldomain" || return 1
-  _debug "Found suitable domain in pdd: $curDomain"
-  curData="domain=${curDomain}&type=TXT&subdomain=${curSubdomain}&ttl=360&content=${txtvalue}"
-  curUri="https://pddimp.yandex.ru/api2/admin/dns/add"
-  curResult="$(_post "${curData}" "${curUri}")"
-  _debug "Result: $curResult"
+  _debug "Found suitable domain: $domain"
+
+  _PDD_get_record_ids "${domain}" "${subdomain}" || return 1
+  _debug "Record_ids: $record_ids"
+
+  if [ ! -z "$record_ids" ]; then
+      _err "Remove all existing $subdomain records from $domain"
+      return 1
+  fi
+
+  local data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
+  local uri="https://pddimp.yandex.ru/api2/admin/dns/add"
+  local result="$(_post "${data}" "${uri}" | _normalizeJson)"
+  _debug "Result: $result"
+
+  if ! _contains "$result" '"success":"ok"'; then
+      _err "Can't add $subdomain to $domain"
+      return 1
+  fi
 }
 
 #Usage: dns_myapi_rm   _acme-challenge.www.domain.com
 dns_yandex_rm() {
-  fulldomain="${1}"
+  local fulldomain="${1}"
   _debug "Calling: dns_yandex_rm() '${fulldomain}'"
+
   _PDD_credentials || return 1
-  export _H1="PddToken: $PDD_Token"
 
   _PDD_get_domain "$fulldomain" || return 1
-  _debug "Found suitable domain in pdd: $curDomain"
+  _debug "Found suitable domain: $domain"
 
-  record_id=$(pdd_get_record_id "${fulldomain}")
-  _debug "Result: $record_id"
+  _PDD_get_record_ids "${domain}" "${subdomain}" || return 1
+  _debug "Record_ids: $record_ids"
 
-  for rec_i in $record_id; do
-    curUri="https://pddimp.yandex.ru/api2/admin/dns/del"
-    curData="domain=${curDomain}&record_id=${rec_i}"
-    curResult="$(_post "${curData}" "${curUri}")"
-    _debug "Result: $curResult"
+  for record_id in $record_ids; do
+    local data="domain=${domain}&record_id=${record_id}"
+    local uri="https://pddimp.yandex.ru/api2/admin/dns/del"
+    local result="$(_post "${data}" "${uri}" | _normalizeJson)"
+    _debug "Result: $result"
+
+    if ! _contains "$result" '"success":"ok"'; then
+      _info "Can't remove $subdomain from $domain"
+    fi
   done
 }
 
 ####################  Private functions below ##################################
 
 _PDD_get_domain() {
-  fulldomain="${1}"
-  __page=1
-  __last=0
-  while [ $__last -eq 0 ]; do
-    uri1="https://pddimp.yandex.ru/api2/admin/domain/domains?page=${__page}&on_page=20"
-    res1="$(_get "$uri1" | _normalizeJson)"
-    _debug2 "res1" "$res1"
-    __found="$(echo "$res1" | sed -n -e 's#.* "found": \([^,]*\),.*#\1#p')"
-    _debug "found: $__found results on page"
-    if [ "0$__found" -lt 20 ]; then
-      _debug "last page: $__page"
-      __last=1
-    fi
+  local fulldomain=${1}
 
-    __all_domains="$__all_domains $(echo "$res1" | tr "," "\n" | grep '"name"' | cut -d: -f2 | sed -e 's@"@@g')"
+  local subdomain_start=1
+  while true; do
+    local domain_start=$(_math $subdomain_start + 1)
+    domain=$(echo "$fulldomain" | cut -d . -f $domain_start-)
+    subdomain=$(echo "$fulldomain" | cut -d . -f -$subdomain_start)
 
-    __page=$(_math $__page + 1)
-  done
+    _debug "Checking domain $domain"
+    if [ -z "$domain" ]; then
+      return 1
+    fi
+
+    local uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=$domain"
+    local result="$(_get "${uri}" | _normalizeJson)"
+    _debug "Result: $result"
 
-  k=2
-  while [ $k -lt 10 ]; do
-    __t=$(echo "$fulldomain" | cut -d . -f $k-100)
-    _debug "finding zone for domain $__t"
-    for d in $__all_domains; do
-      if [ "$d" = "$__t" ]; then
-        p=$(_math $k - 1)
-        curSubdomain="$(echo "$fulldomain" | cut -d . -f "1-$p")"
-        curDomain="$__t"
+    if _contains "$result" '"success":"ok"'; then
         return 0
-      fi
-    done
-    k=$(_math $k + 1)
+    fi
+    subdomain_start=$(_math $subdomain_start + 1)
   done
-  _err "No suitable domain found in your account"
-  return 1
 }
 
 _PDD_credentials() {
@@ -94,16 +102,22 @@ _PDD_credentials() {
   else
     _saveaccountconf PDD_Token "${PDD_Token}"
   fi
+  export _H1="PddToken: $PDD_Token"
 }
 
-pdd_get_record_id() {
-  fulldomain="${1}"
+_PDD_get_record_ids() {
+  local domain="${1}"
+  local subdomain="${2}"
+
+  _debug "Check existing records for $subdomain"
 
-  _PDD_get_domain "$fulldomain"
-  _debug "Found suitable domain in pdd: $curDomain"
+  local uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"
+  local result="$(_get "${uri}" | _normalizeJson)"
+  _debug "Result: $result"
+
+  if ! _contains "$result" '"success":"ok"'; then
+      return 1
+  fi
 
-  curUri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${curDomain}"
-  curResult="$(_get "${curUri}" | _normalizeJson)"
-  _debug "Result: $curResult"
-  echo "$curResult" | _egrep_o "{[^{]*\"content\":[^{]*\"subdomain\":\"${curSubdomain}\"" | sed -n -e 's#.* "record_id": \(.*\),[^,]*#\1#p'
+  record_ids=$(echo "$result" | _egrep_o "{[^{]*\"subdomain\":\"${subdomain}\"[^}]*}" | sed -n -e 's#.*"record_id": \([0-9]*\).*#\1#p')
 }

From ef7b51beb7d7c0e6607efca377e1089531aeb435 Mon Sep 17 00:00:00 2001
From: Nick Stepa <hired777@gmail.com>
Date: Sun, 12 Jan 2020 13:54:18 +0100
Subject: [PATCH 2/4] Remove local keyword.

---
 dnsapi/dns_yandex.sh | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/dnsapi/dns_yandex.sh b/dnsapi/dns_yandex.sh
index 90bbf74..fc693d6 100755
--- a/dnsapi/dns_yandex.sh
+++ b/dnsapi/dns_yandex.sh
@@ -6,15 +6,15 @@
 # Values to export:
 # export PDD_Token="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
-# Sometimes cloudflare / google doesn't pick new dns recods fast enough.
+# Sometimes cloudflare / google doesn't pick new dns records fast enough.
 # You can add --dnssleep XX to params as workaround.
 
 ########  Public functions #####################
 
 #Usage: dns_myapi_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_yandex_add() {
-  local fulldomain="${1}"
-  local txtvalue="${2}"
+  fulldomain="${1}"
+  txtvalue="${2}"
   _debug "Calling: dns_yandex_add() '${fulldomain}' '$txtvalue'"
 
   _PDD_credentials || return 1
@@ -30,9 +30,9 @@ dns_yandex_add() {
       return 1
   fi
 
-  local data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
-  local uri="https://pddimp.yandex.ru/api2/admin/dns/add"
-  local result="$(_post "${data}" "${uri}" | _normalizeJson)"
+  data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
+  uri="https://pddimp.yandex.ru/api2/admin/dns/add"
+  result="$(_post "${data}" "${uri}" | _normalizeJson)"
   _debug "Result: $result"
 
   if ! _contains "$result" '"success":"ok"'; then
@@ -43,7 +43,7 @@ dns_yandex_add() {
 
 #Usage: dns_myapi_rm   _acme-challenge.www.domain.com
 dns_yandex_rm() {
-  local fulldomain="${1}"
+  fulldomain="${1}"
   _debug "Calling: dns_yandex_rm() '${fulldomain}'"
 
   _PDD_credentials || return 1
@@ -55,9 +55,9 @@ dns_yandex_rm() {
   _debug "Record_ids: $record_ids"
 
   for record_id in $record_ids; do
-    local data="domain=${domain}&record_id=${record_id}"
-    local uri="https://pddimp.yandex.ru/api2/admin/dns/del"
-    local result="$(_post "${data}" "${uri}" | _normalizeJson)"
+    data="domain=${domain}&record_id=${record_id}"
+    uri="https://pddimp.yandex.ru/api2/admin/dns/del"
+    result="$(_post "${data}" "${uri}" | _normalizeJson)"
     _debug "Result: $result"
 
     if ! _contains "$result" '"success":"ok"'; then
@@ -69,21 +69,21 @@ dns_yandex_rm() {
 ####################  Private functions below ##################################
 
 _PDD_get_domain() {
-  local fulldomain=${1}
+  fulldomain=${1}
 
-  local subdomain_start=1
+  subdomain_start=1
   while true; do
-    local domain_start=$(_math $subdomain_start + 1)
-    domain=$(echo "$fulldomain" | cut -d . -f $domain_start-)
-    subdomain=$(echo "$fulldomain" | cut -d . -f -$subdomain_start)
+    domain_start=$(_math $subdomain_start + 1)
+    domain=$(echo "$fulldomain" | cut -d . -f "$domain_start"-)
+    subdomain=$(echo "$fulldomain" | cut -d . -f -"$subdomain_start")
 
     _debug "Checking domain $domain"
     if [ -z "$domain" ]; then
       return 1
     fi
 
-    local uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=$domain"
-    local result="$(_get "${uri}" | _normalizeJson)"
+    uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=$domain"
+    result="$(_get "${uri}" | _normalizeJson)"
     _debug "Result: $result"
 
     if _contains "$result" '"success":"ok"'; then
@@ -106,13 +106,13 @@ _PDD_credentials() {
 }
 
 _PDD_get_record_ids() {
-  local domain="${1}"
-  local subdomain="${2}"
+  domain="${1}"
+  subdomain="${2}"
 
   _debug "Check existing records for $subdomain"
 
-  local uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"
-  local result="$(_get "${uri}" | _normalizeJson)"
+  uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"
+  result="$(_get "${uri}" | _normalizeJson)"
   _debug "Result: $result"
 
   if ! _contains "$result" '"success":"ok"'; then

From e5f69f0815b39d37e49188e659f3b0b6f4d9b58f Mon Sep 17 00:00:00 2001
From: Nick Stepa <hired777@gmail.com>
Date: Sun, 12 Jan 2020 14:07:49 +0100
Subject: [PATCH 3/4] Fix indentation.

---
 dnsapi/dns_yandex.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dnsapi/dns_yandex.sh b/dnsapi/dns_yandex.sh
index fc693d6..cf702ba 100755
--- a/dnsapi/dns_yandex.sh
+++ b/dnsapi/dns_yandex.sh
@@ -26,8 +26,8 @@ dns_yandex_add() {
   _debug "Record_ids: $record_ids"
 
   if [ ! -z "$record_ids" ]; then
-      _err "Remove all existing $subdomain records from $domain"
-      return 1
+    _err "Remove all existing $subdomain records from $domain"
+    return 1
   fi
 
   data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
@@ -36,8 +36,8 @@ dns_yandex_add() {
   _debug "Result: $result"
 
   if ! _contains "$result" '"success":"ok"'; then
-      _err "Can't add $subdomain to $domain"
-      return 1
+    _err "Can't add $subdomain to $domain"
+    return 1
   fi
 }
 
@@ -87,7 +87,7 @@ _PDD_get_domain() {
     _debug "Result: $result"
 
     if _contains "$result" '"success":"ok"'; then
-        return 0
+      return 0
     fi
     subdomain_start=$(_math $subdomain_start + 1)
   done
@@ -116,7 +116,7 @@ _PDD_get_record_ids() {
   _debug "Result: $result"
 
   if ! _contains "$result" '"success":"ok"'; then
-      return 1
+    return 1
   fi
 
   record_ids=$(echo "$result" | _egrep_o "{[^{]*\"subdomain\":\"${subdomain}\"[^}]*}" | sed -n -e 's#.*"record_id": \([0-9]*\).*#\1#p')

From 4eff3b6a24efd9cae60183cbbde4b89eef8f391c Mon Sep 17 00:00:00 2001
From: Nick Stepa <hired777@gmail.com>
Date: Sun, 12 Jan 2020 15:16:48 +0100
Subject: [PATCH 4/4] Change error to info in case record already exists.

---
 dnsapi/dns_yandex.sh | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/dnsapi/dns_yandex.sh b/dnsapi/dns_yandex.sh
index cf702ba..5721f99 100755
--- a/dnsapi/dns_yandex.sh
+++ b/dnsapi/dns_yandex.sh
@@ -15,19 +15,18 @@
 dns_yandex_add() {
   fulldomain="${1}"
   txtvalue="${2}"
-  _debug "Calling: dns_yandex_add() '${fulldomain}' '$txtvalue'"
+  _debug "Calling: dns_yandex_add() '${fulldomain}' '${txtvalue}'"
 
   _PDD_credentials || return 1
 
-  _PDD_get_domain "$fulldomain" || return 1
+  _PDD_get_domain || return 1
   _debug "Found suitable domain: $domain"
 
-  _PDD_get_record_ids "${domain}" "${subdomain}" || return 1
+  _PDD_get_record_ids || return 1
   _debug "Record_ids: $record_ids"
 
   if [ ! -z "$record_ids" ]; then
-    _err "Remove all existing $subdomain records from $domain"
-    return 1
+    _info "All existing $subdomain records from $domain will be removed at the very end."
   fi
 
   data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
@@ -36,8 +35,12 @@ dns_yandex_add() {
   _debug "Result: $result"
 
   if ! _contains "$result" '"success":"ok"'; then
-    _err "Can't add $subdomain to $domain"
-    return 1
+    if _contains "$result" '"success":"error"' && _contains "$result" '"error":"record_exists"'; then
+      _info "Record already exists."
+    else
+      _err "Can't add $subdomain to $domain."
+      return 1
+    fi
   fi
 }
 
@@ -61,7 +64,7 @@ dns_yandex_rm() {
     _debug "Result: $result"
 
     if ! _contains "$result" '"success":"ok"'; then
-      _info "Can't remove $subdomain from $domain"
+      _info "Can't remove $subdomain from $domain."
     fi
   done
 }
@@ -69,8 +72,6 @@ dns_yandex_rm() {
 ####################  Private functions below ##################################
 
 _PDD_get_domain() {
-  fulldomain=${1}
-
   subdomain_start=1
   while true; do
     domain_start=$(_math $subdomain_start + 1)
@@ -96,8 +97,8 @@ _PDD_get_domain() {
 _PDD_credentials() {
   if [ -z "${PDD_Token}" ]; then
     PDD_Token=""
-    _err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx"
-    _err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token"
+    _err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx."
+    _err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token."
     return 1
   else
     _saveaccountconf PDD_Token "${PDD_Token}"
@@ -106,9 +107,6 @@ _PDD_credentials() {
 }
 
 _PDD_get_record_ids() {
-  domain="${1}"
-  subdomain="${2}"
-
   _debug "Check existing records for $subdomain"
 
   uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"