Adds dnsapi support for Simply.com

.github/workflows/DNS.yml

@@ -1,6 +1,8 @@
 name: DNS
 on:
   push:
+    branches:
+      - 'dev'
     paths:
       - 'dnsapi/*.sh'
       - '.github/workflows/DNS.yml'
@@ -36,10 +38,10 @@ jobs:
     steps:
     - name: "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
       run: |
-        echo "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
-        if [ "${{github.actor}}" != "Neilpang" ]; then
-          false
-        fi
+        echo "Plese see this page to fix the error: https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
+    - name: Fail
+      if: "github.actor != 'Neilpang'"
+      run: false
 
   Docker:
     runs-on: ubuntu-latest
@@ -149,64 +151,25 @@ jobs:
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
-      shell: bash
+      shell: cmd
       run: |
         if [ "${{ secrets.TokenName1}}" ] ; then
-          export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
+          set ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
         fi
         if [ "${{ secrets.TokenName2}}" ] ; then
-          export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
+          set ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
         fi
         if [ "${{ secrets.TokenName3}}" ] ; then
-          export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
+          set ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
         fi
         if [ "${{ secrets.TokenName4}}" ] ; then
-          export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
+          set ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
         fi
         if [ "${{ secrets.TokenName5}}" ] ; then
-          export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
+          set ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
         fi
         cd ../acmetest
-        ./letest.sh
-
-  FreeBSD:
-    runs-on: macos-latest
-    needs: Windows
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v0.0.7
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: pkg install -y socat curl
-        usesh: true
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
-          fi
-          cd ../acmetest
-          ./letest.sh
+        bash.exe -c ./letest.sh
 
   Solaris:
     runs-on: macos-latest
@@ -246,4 +209,3 @@ jobs:
           cd ../acmetest
           ./letest.sh
 
-        

.github/workflows/LetsEncrypt.yml

@@ -58,7 +58,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install tools
-      run:  brew install socat
+      run:  brew update && brew install socat;
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
@@ -111,11 +111,10 @@ jobs:
     - uses: actions/checkout@v2
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v0.0.7
+    - uses: vmactions/freebsd@main
       with:
         envs: 'NGROK_TOKEN TEST_LOCAL'
-        prepare: pkg install -y socat curl
-        usesh: true
+        prepare: pkg install -y socat
         run: |
           cd ../acmetest && ./letest.sh
 

acme.sh

@@ -4152,20 +4152,32 @@ issue() {
     _debug "_saved_account_key_hash is not changed, skip register account."
   fi
 
+  export Le_Pre_Generated_Key="$CERT_KEY_PATH.prekey"
   if [ -f "$CSR_PATH" ] && [ ! -f "$CERT_KEY_PATH" ]; then
     _info "Signing from existing CSR."
   else
     _key=$(_readdomainconf Le_Keylength)
     _debug "Read key length:$_key"
     if [ ! -f "$CERT_KEY_PATH" ] || [ "$_key_length" != "$_key" ] || [ "$Le_ForceNewDomainKey" = "1" ]; then
-      if ! createDomainKey "$_main_domain" "$_key_length"; then
-        _err "Create domain key error."
-        _clearup
-        _on_issue_err "$_post_hook"
+      if [ "$Le_ForceNewDomainKey" = "1" ] && [ -f "$Le_Pre_Generated_Key" ]; then
+        _info "Using pre generated key: $Le_Pre_Generated_Key"
+        cat "$Le_Pre_Generated_Key" >"$CERT_KEY_PATH" && rm -f "$Le_Pre_Generated_Key"
+      else
+        if ! createDomainKey "$_main_domain" "$_key_length"; then
+          _err "Create domain key error."
+          _clearup
+          _on_issue_err "$_post_hook"
+          return 1
+        fi
+      fi
+    fi
+    if [ "$Le_ForceNewDomainKey" ]; then
+      _info "Generate next pre-generate key."
+      if ! _createkey "$_key_length" "$Le_Pre_Generated_Key"; then
+        _err "Can not pre generate domain key"
         return 1
       fi
     fi
-
     if ! _createcsr "$_main_domain" "$_alt_domains" "$CERT_KEY_PATH" "$CSR_PATH" "$DOMAIN_SSL_CONF"; then
       _err "Create CSR error."
       _clearup
@@ -5437,7 +5449,8 @@ installcert() {
   _savedomainconf "Le_RealKeyPath" "$_real_key"
   _savedomainconf "Le_ReloadCmd" "$_reload_cmd" "base64"
   _savedomainconf "Le_RealFullChainPath" "$_real_fullchain"
-
+  export Le_ForceNewDomainKey="$(_readdomainconf Le_ForceNewDomainKey)"
+  export Le_Pre_Generated_Key="$CERT_KEY_PATH.prekey"
   _installcert "$_main_domain" "$_real_cert" "$_real_key" "$_real_ca" "$_real_fullchain" "$_reload_cmd"
 }
 
@@ -5520,6 +5533,8 @@ _installcert() {
       export CA_CERT_PATH
       export CERT_FULLCHAIN_PATH
       export Le_Domain="$_main_domain"
+      export Le_ForceNewDomainKey
+      export Le_Pre_Generated_Key
       cd "$DOMAIN_PATH" && eval "$_reload_cmd"
     ); then
       _info "$(__green "Reload success")"

dnsapi/dns_dynv6.sh

@@ -1,41 +1,39 @@
 #!/usr/bin/env sh
 #Author StefanAbl
 #Usage specify a private keyfile to use with dynv6 'export KEY="path/to/keyfile"'
-#or use the HTTP REST API by by specifying a token 'export DYNV6_TOKEN="value"
 #if no keyfile is specified, you will be asked if you want to create one in /home/$USER/.ssh/dynv6 and /home/$USER/.ssh/dynv6.pub
-
-dynv6_api="https://dynv6.com/api/v2"
 ########  Public functions #####################
 # Please Read this guide first: https://github.com/Neilpang/acme.sh/wiki/DNS-API-Dev-Guide
-#Usage: dns_dynv6_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+#Usage: dns_myapi_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_dynv6_add() {
   fulldomain=$1
   txtvalue=$2
   _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
-  if [ "$dynv6_token" ]; then
-    _dns_dynv6_add_http
-    return $?
+  _get_keyfile
+  _info "using keyfile $dynv6_keyfile"
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+
+  if ! _get_domain "$fulldomain" "$_your_hosts"; then
+  	_err "Host not found on your account"
+  	return 1
+  fi
+#  if ! _contains "$_your_hosts" "$_host"; then
+#    _debug "The host is $_host and the record $_record"
+#    _debug "Dynv6 returned $_your_hosts"
+#    _err "The host $_host does not exists on your dynv6 account"
+#    return 1
+#  fi
+  _debug "found host on your account"
+  returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
+  _debug "Dynv6 returend this after record was added: $returnval"
+  if _contains "$returnval" "created"; then
+    return 0
+  elif _contains "$returnval" "updated"; then
+    return 0
   else
-    _info "using key file $dynv6_keyfile"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
-      _err "Host not found on your account"
-      return 1
-    fi
-    _debug "found host on your account"
-    returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
-    _debug "Dynv6 returned this after record was added: $returnval"
-    if _contains "$returnval" "created"; then
-      return 0
-    elif _contains "$returnval" "updated"; then
-      return 0
-    else
-      _err "Something went wrong! it does not seem like the record was added successfully"
-      return 1
-    fi
+    _err "Something went wrong! it does not seem like the record was added succesfully"
     return 1
   fi
   return 1
@@ -45,29 +43,31 @@ dns_dynv6_add() {
 dns_dynv6_rm() {
   fulldomain=$1
   txtvalue=$2
-  _info "Using dynv6 API"
+  _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
-  if [ "$dynv6_token" ]; then
-    _dns_dynv6_rm_http
-    return $?
-  else
-    _info "using key file $dynv6_keyfile"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
-      _err "Host not found on your account"
-      return 1
-    fi
-    _debug "found host on your account"
-    _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
-    return 0
+  _get_keyfile
+  _info "using keyfile $dynv6_keyfile"
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+  if ! _get_domain "$fulldomain" "$_your_hosts"; then
+  	_err "Host not found on your account"
+  	return 1
   fi
+#  if ! _contains "$_your_hosts" "$_host"; then
+#    _debug "The host is $_host and the record $_record"
+#   _debug "Dynv6 returned $_your_hosts"
+#    _err "The host $_host does not exists on your dynv6 account"
+#    return 1
+#  fi
+  _debug "found host on your account"
+  _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
+  return 0
+
 }
 #################### Private functions below ##################################
 #Usage: No Input required
 #returns
-#dynv6_keyfile the path to the new key file that has been generated
+#dynv6_keyfile the path to the new keyfile that has been generated
 _generate_new_key() {
   dynv6_keyfile="$(eval echo ~"$USER")/.ssh/dynv6"
   _info "Path to key file used: $dynv6_keyfile"
@@ -93,13 +93,13 @@ _get_domain() {
 
   _your_hosts="$(echo "$_your_hosts" | awk '/\./ {print $1}')"
   for l in $_your_hosts; do
-    #echo "host: $l"
-    if test "${_full_domain#*$l}" != "$_full_domain"; then
-      _record="${_full_domain%.$l}"
-      _host=$l
-      _debug "The host is $_host and the record $_record"
-      return 0
-    fi
+  	#echo "host: $l"
+  	if test "${_full_domain#*$l}" != "$_full_domain"; then
+  	  _record="${_full_domain%.$l}"
+  	  _host=$l
+  	  _debug "The host is $_host and the record $_record"
+  	  return 0
+  	fi
   done
   _err "Either their is no such host on your dnyv6 account or it cannot be accessed with this key"
   return 1
@@ -108,178 +108,22 @@ _get_domain() {
 # Usage: No input required
 #returns
 #dynv6_keyfile path to the key that will be used
-_get_authentication() {
-  dynv6_token="${DYNV6_TOKEN:-$(_readaccountconf_mutable dynv6_token)}"
-  if [ "$dynv6_token" ]; then
-    _debug "Found HTTP Token. Going to use the HTTP API and not the SSH API"
-    if [ "$DYNV6_TOKEN" ]; then
-      _saveaccountconf_mutable dynv6_token "$dynv6_token"
-    fi
-  else
-    _debug "no HTTP token found. Looking for an SSH key"
-    dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
-    _debug "Your key is $dynv6_keyfile"
-    if [ -z "$dynv6_keyfile" ]; then
-      if [ -z "$KEY" ]; then
-        _err "You did not specify a key to use with dynv6"
-        _info "Creating new dynv6 API key to add to dynv6.com"
-        _generate_new_key
-        _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
-        _info "Hit Enter to continue"
-        read -r _
-        #save the credentials to the account conf file.
-      else
-        dynv6_keyfile="$KEY"
-      fi
-      _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
+_get_keyfile() {
+  _debug "get keyfile method called"
+  dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
+  _debug "Your key is $dynv6_keyfile"
+  if [ -z "$dynv6_keyfile" ]; then
+    if [ -z "$KEY" ]; then
+      _err "You did not specify a key to use with dynv6"
+      _info "Creating new dynv6 api key to add to dynv6.com"
+      _generate_new_key
+      _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
+      _info "Hit Enter to contiue"
+      read -r _
+      #save the credentials to the account conf file.
+    else
+      dynv6_keyfile="$KEY"
     fi
+    _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
   fi
 }
-
-_dns_dynv6_add_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
-  _set_record TXT "$record" "$txtvalue"
-  if _contains "$response" "$txtvalue"; then
-    _info "Successfully added record"
-    return 0
-  else
-    _err "Something went wrong while adding the record"
-    return 1
-  fi
-}
-
-_dns_dynv6_rm_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
-  _get_record_id "$_zone_id" "$record" "$txtvalue"
-  _del_record "$_zone_id" "$_record_id"
-  if [ -z "$response" ]; then
-    _info "Successfully deleted record"
-    return 0
-  else
-    _err "Something went wrong while deleting the record"
-    return 1
-  fi
-}
-
-#get the zoneid for a specifc record or zone
-#usage: _get_zone_id §record
-#where $record is the record to get the id for
-#returns _zone_id the id of the zone
-_get_zone_id() {
-  record="$1"
-  _debug "getting zone id for $record"
-  _dynv6_rest GET zones
-
-  zones="$(echo "$response" | tr '}' '\n' | tr ',' '\n' | grep name | sed 's/\[//g' | tr -d '{' | tr -d '"')"
-  #echo $zones
-
-  selected=""
-  for z in $zones; do
-    z="${z#name:}"
-    _debug zone: "$z"
-    if _contains "$record" "$z"; then
-      _debug "$z found in $record"
-      selected="$z"
-    fi
-  done
-  if [ -z "$selected" ]; then
-    _err "no zone found"
-    return 1
-  fi
-
-  zone_id="$(echo "$response" | tr '}' '\n' | grep "$selected" | tr ',' '\n' | grep id | tr -d '"')"
-  _zone_id="${zone_id#id:}"
-  _debug "zone id: $_zone_id"
-}
-
-_get_zone_name() {
-  _zone_id="$1"
-  _dynv6_rest GET zones/"$_zone_id"
-  _zone_name="$(echo "$response" | tr ',' '\n' | tr -d '{' | grep name | tr -d '"')"
-  _zone_name="${_zone_name#name:}"
-}
-
-#usaage _get_record_id $zone_id $record
-# where zone_id is thevalue returned by _get_zone_id
-# and record ist in the form _acme.www for an fqdn of _acme.www.example.com
-# returns _record_id
-_get_record_id() {
-  _zone_id="$1"
-  record="$2"
-  value="$3"
-  _dynv6_rest GET "zones/$_zone_id/records"
-  if ! _get_record_id_from_response "$response"; then
-    _err "no such record $record found in zone $_zone_id"
-    return 1
-  fi
-}
-
-_get_record_id_from_response() {
-  response="$1"
-  _record_id="$(echo "$response" | tr '}' '\n' | grep "\"name\":\"$record\"" | grep "\"data\":\"$value\"" | tr ',' '\n' | grep id | tr -d '"' | tr -d 'id:')"
-  #_record_id="${_record_id#id:}"
-  if [ -z "$_record_id" ]; then
-    _err "no such record: $record found in zone $_zone_id"
-    return 1
-  fi
-  _debug "record id: $_record_id"
-  return 0
-}
-#usage: _set_record TXT _acme_challenge.www longvalue 12345678
-#zone id is optional can also be set as vairable bevor calling this method
-_set_record() {
-  type="$1"
-  record="$2"
-  value="$3"
-  if [ "$4" ]; then
-    _zone_id="$4"
-  fi
-  data="{\"name\": \"$record\", \"data\": \"$value\", \"type\": \"$type\"}"
-  #data='{ "name": "acme.test.thorn.dynv6.net", "type": "A", "data": "192.168.0.1"}'
-  echo "$data"
-  #"{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"ttl\":120}"
-  _dynv6_rest POST "zones/$_zone_id/records" "$data"
-}
-_del_record() {
-  _zone_id=$1
-  _record_id=$2
-  _dynv6_rest DELETE zones/"$_zone_id"/records/"$_record_id"
-}
-
-_dynv6_rest() {
-  m=$1    #method GET,POST,DELETE or PUT
-  ep="$2" #the endpoint
-  data="$3"
-  _debug "$ep"
-
-  token_trimmed=$(echo "$dynv6_token" | tr -d '"')
-
-  export _H1="Authorization: Bearer $token_trimmed"
-  export _H2="Content-Type: application/json"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$dynv6_api/$ep" "" "$m")"
-  else
-    response="$(_get "$dynv6_api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_infomaniak.sh

@@ -85,7 +85,7 @@ dns_infomaniak_add() {
 
   # API call
   response=$(_post "$data" "${INFOMANIAK_API_URL}/1/domain/$domain_id/dns/record")
-  if [ -n "$response" ] && echo "$response" | _contains '"result":"success"'; then
+  if [ -n "$response" ] && echo "$response" | grep -qF '"result":"success"'; then
     _info "Record added"
     _debug "Response: $response"
     return 0
@@ -165,7 +165,7 @@ dns_infomaniak_rm() {
 
   # API call
   response=$(_post "" "${INFOMANIAK_API_URL}/1/domain/$domain_id/dns/record/$record_id" "" DELETE)
-  if [ -n "$response" ] && echo "$response" | _contains '"result":"success"'; then
+  if [ -n "$response" ] && echo "$response" | grep -qF '"result":"success"'; then
     _info "Record deleted"
     return 0
   fi
@@ -187,7 +187,7 @@ _find_zone() {
   zone="$1"
 
   # find domain in list, removing . parts sequentialy
-  while _contains "$zone" '\.'; do
+  while echo "$zone" | grep -q '\.'; do
     _debug "testing $zone"
     id=$(_get_domain_id "$zone")
     if [ -n "$id" ]; then

dnsapi/dns_simply.sh

@@ -7,9 +7,9 @@
 #
 #SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
 
-SIMPLY_Api_Default="https://api.simply.com/1"
-
+SIMPLY_Api="https://api.simply.com/1"
 ########  Public functions #####################
+
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_simply_add() {
   fulldomain=$1
@@ -26,23 +26,24 @@ dns_simply_add() {
     _err "invalid domain"
     return 1
   fi
-
+  
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
   _info "Adding record"
 
-  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then
+  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then  
     _err "Could not add DNS record"
     return 1
   fi
+  
   return 0
 }
 
 dns_simply_rm() {
   fulldomain=$1
   txtvalue=$2
-
+  
   if ! _simply_load_config; then
     return 1
   fi
@@ -50,7 +51,7 @@ dns_simply_rm() {
   _simply_save_config
 
   _debug "First detect the root zone"
-
+  
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
     return 1
@@ -58,59 +59,52 @@ dns_simply_rm() {
 
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
-  _debug txtvalue "$txtvalue"
-
-  _info "Getting all existing records"
+  _debug "$txtvalue"
 
+  _debug "Getting existing records"
+  
   if ! _simply_get_all_records "$_domain"; then
     _err "invalid domain"
     return 1
   fi
-
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' ' | tr -d ' ' | tr ';' ' ')
-
+  
+  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/')
+  record_array=(`echo $records |tr -d ' ' | tr ';' ' '`)
   nr_of_deleted_records=0
-  _info "Fetching txt record"
 
-  for record in $records; do
-    _debug record "$record"
-
-    record_data=$(echo "$record" | cut -d "," -f 3 | sed 's/"//g' | grep "data" | cut -d ":" -f 2)
-    record_type=$(echo "$record" | cut -d "," -f 4 | sed 's/"//g' | grep "type" | cut -d ":" -f 2)
-
-    _debug2 record_data "$record_data"
-    _debug2 record_type "$record_type"
-
-    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
-
-      record_id=$(echo "$record" | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2)
-
-      _info "Deleting record $record"
-      _debug2 record_id "$record_id"
-
-      if [ "$record_id" -gt 0 ]; then
-
-        if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
-          _err "Record with id $record_id could not be deleted"
-          return 1
-        fi
-
-        nr_of_deleted_records=1
-        break
-      else
-        _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
-        break
+  for (( i=0; i<=${#record_array[@]}; i++ )); do
+  
+  record="${record_array[$i]}"
+  
+  if [[ "$record" == *"$txtvalue"* && "$record" == *"TXT"* ]]; then
+  
+    _info "Deleting record: $record"
+    
+    record_id=`echo $record | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2`
+    
+    if [[ $record_id -gt 0 ]]; then
+      
+      if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
+        _err "Record with id $record_id could not be deleted"
+        return 1
       fi
+      
+      nr_of_deleted_records=1
+      break
+    else  
+      _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
+      break
     fi
-
+  fi
+  
   done
 
-  if [ "$nr_of_deleted_records" -eq 0 ]; then
-    _err "No record deleted, the DNS record needs to be removed manually."
+  if [[ $nr_of_deleted_records -eq 0 ]]; then
+    _err "No record deleted, the DNS record needs to be removed manually." 
   else
     _info "Deleted $nr_of_deleted_records record"
   fi
-
+  
   return 0
 }
 
@@ -124,7 +118,7 @@ _simply_load_config() {
   if [ -z "$SIMPLY_Api" ]; then
     SIMPLY_Api="$SIMPLY_Api_Default"
   fi
-
+  
   if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
     SIMPLY_AccountName=""
     SIMPLY_ApiKey=""
@@ -147,8 +141,8 @@ _simply_save_config() {
 }
 
 _simply_get_all_records() {
-  domain=$1
-
+  domain=$1  
+      
   if ! _simply_rest GET "my/products/$domain/dns/records"; then
     return 1
   fi
@@ -188,14 +182,14 @@ _simply_add_record() {
   domain=$1
   sub_domain=$2
   txtval=$3
-
+  
   data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
 
   if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
     _err "Adding record not successfull!"
     return 1
   fi
-
+  
   return 0
 }
 
@@ -203,14 +197,14 @@ _simply_delete_record() {
   domain=$1
   sub_domain=$2
   record_id=$3
-
-  _debug record_id "Delete record with id $record_id"
-
+  
+  _debug "Delete record with id $record_id"
+  
   if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
     _err "Deleting record not successfull!"
     return 1
   fi
-
+  
   return 0
 }
 
@@ -218,10 +212,10 @@ _simply_rest() {
   m=$1
   ep="$2"
   data="$3"
-
-  _debug2 data "$data"
-  _debug2 ep "$ep"
-  _debug2 m "$m"
+    
+  _debug "Data: $data"
+  _debug "Methodcall: $ep"
+  _debug "Call type: $m"
 
   export _H1="Content-Type: application/json"
 
@@ -235,13 +229,12 @@ _simply_rest() {
     _err "error $ep"
     return 1
   fi
-
+  
   _debug2 response "$response"
-
+  
   if _contains "$response" "Invalid account authorization"; then
     _err "It seems that your api key or accountnumber is not correct."
     return 1
   fi
-
   return 0
 }