From f5f0680ec768e5978d90aa1a63f1e4c91d04ff06 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Sun, 31 May 2020 18:49:39 +0200
Subject: [PATCH 01/11] Added support for custom domains

---
 dnsapi/dns_dynv6.sh | 66 +++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index cf39282b..4ffd7009 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -13,14 +13,18 @@ dns_dynv6_add() {
   _debug txtvalue "$txtvalue"
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
-  _get_domain "$fulldomain"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-  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
+  
+  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"
@@ -44,14 +48,17 @@ dns_dynv6_rm() {
   _debug txtvalue "$txtvalue"
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
-  _get_domain "$fulldomain"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-  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
+  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
@@ -72,29 +79,30 @@ _generate_new_key() {
     return 1
   fi
 }
-#Usage: _acme-challenge.www.example.dynv6.net
+
+#Usage: _acme-challenge.www.example.dynv6.net "$_your_hosts"
+#where _your_hosts is the output of ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts
 #returns
 #_host= example.dynv6.net
 #_record=_acme-challenge.www
 #aborts if not a valid domain
 _get_domain() {
+  #_your_hosts="$(ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts)"
   _full_domain="$1"
-  _debug "getting domain for $_full_domain"
-  if ! _contains "$_full_domain" 'dynv6.net' && ! _contains "$_full_domain" 'dns.army' && ! _contains "$_full_domain" 'dns.navy'; then
-    _err "The hosts does not seem to be a dynv6 host"
-    return 1
-  fi
-  _record="${_full_domain%.*}"
-  _record="${_record%.*}"
-  _record="${_record%.*}"
-  _debug "The record we are ging to use is $_record"
-  _host="$_full_domain"
-  while [ "$(echo "$_host" | grep -o '\.' | wc -l)" != "2" ]; do
-    _host="${_host#*.}"
-  done
-  _debug "And the host is $_host"
-  return 0
+  _your_hosts="$2"
 
+  _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
+  done
+  _err "Either their is no such host on your dnyv6 account or it cannot be accessed with this key"
+  return 1
 }
 
 # Usage: No input required
@@ -103,7 +111,7 @@ _get_domain() {
 _get_keyfile() {
   _debug "get keyfile method called"
   dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
-  _debug Your key is "$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"

From 6cc9f49d975a10ea41951de3efad0c2b5a1e2cc0 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Sun, 31 May 2020 19:09:27 +0200
Subject: [PATCH 02/11] first attempt to make travis happy

---
 dnsapi/dns_dynv6.sh | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 4ffd7009..dce7ce5f 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -14,17 +14,10 @@ dns_dynv6_add() {
   _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
+    _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"
@@ -50,19 +43,12 @@ dns_dynv6_rm() {
   _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
+    _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
@@ -93,13 +79,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

From f5411ac9ab9f40b0501d99132a561605a9e8d714 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 15:42:45 +0200
Subject: [PATCH 03/11] no supporting HTTP API as well

---
 dnsapi/dns_dynv6.sh | 263 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 219 insertions(+), 44 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index dce7ce5f..0fd6fa4c 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -1,32 +1,41 @@
 #!/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_myapi_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+#Usage: dns_dynv6_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_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
-  _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
-    _err "Something went wrong! it does not seem like the record was added succesfully"
+  _get_authentication
+  if [ "$dynv6_token" ]; then
+    _dns_dynv6_add_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"
+    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
     return 1
   fi
   return 1
@@ -36,24 +45,29 @@ 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_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
+  _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
   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 keyfile that has been generated
+#dynv6_keyfile the path to the new key file that has been generated
 _generate_new_key() {
   dynv6_keyfile="$(eval echo ~"$USER")/.ssh/dynv6"
   _info "Path to key file used: $dynv6_keyfile"
@@ -94,22 +108,183 @@ _get_domain() {
 # Usage: No input required
 #returns
 #dynv6_keyfile path to the key that will be used
-_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"
+_get_authentication() {
+	if [ "$DYNV6_TOKEN" ]; then
+		_debug "Going to use the HTTP Token you specifed and saving it for futur use"
+		_saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
+		dynv6_token="$DYNV6_TOKEN"
+	elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
+		_debug "Found a previously used HTTP token going to use that"
+		dynv6_token="$(_readaccountconf_mutable dynv6_token)"
+	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"
     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
+}
+

From f8c8330258da736f7deb9b5bbdda0f8e734b65a3 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 15:49:25 +0200
Subject: [PATCH 04/11] formatting

---
 dnsapi/dns_dynv6.sh | 206 ++++++++++++++++++++++----------------------
 1 file changed, 101 insertions(+), 105 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 0fd6fa4c..c41aef3a 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -18,7 +18,7 @@ dns_dynv6_add() {
   if [ "$dynv6_token" ]; then
     _dns_dynv6_add_http
     return $?
-  else 
+  else
     _info "using key file $dynv6_keyfile"
     _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
     if ! _get_domain "$fulldomain" "$_your_hosts"; then
@@ -49,10 +49,10 @@ dns_dynv6_rm() {
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
   _get_authentication
-   if [ "$dynv6_token" ]; then
+  if [ "$dynv6_token" ]; then
     _dns_dynv6_rm_http
     return $?
-  else 
+  else
     _info "using key file $dynv6_keyfile"
     _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
     if ! _get_domain "$fulldomain" "$_your_hosts"; then
@@ -109,14 +109,14 @@ _get_domain() {
 #returns
 #dynv6_keyfile path to the key that will be used
 _get_authentication() {
-	if [ "$DYNV6_TOKEN" ]; then
-		_debug "Going to use the HTTP Token you specifed and saving it for futur use"
-		_saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
-		dynv6_token="$DYNV6_TOKEN"
-	elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
-		_debug "Found a previously used HTTP token going to use that"
-		dynv6_token="$(_readaccountconf_mutable dynv6_token)"
-	else
+  if [ "$DYNV6_TOKEN" ]; then
+    _debug "Going to use the HTTP Token you specifed and saving it for futur use"
+    _saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
+    dynv6_token="$DYNV6_TOKEN"
+  elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
+    _debug "Found a previously used HTTP token going to use that"
+    dynv6_token="$(_readaccountconf_mutable dynv6_token)"
+  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"
@@ -137,142 +137,139 @@ _get_authentication() {
   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(){
+_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}"
-		_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
+  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(){
+_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"
+  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:}"
+_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(){
+_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	
+  _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(){
+_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
+  _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"	
+_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(){
+_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
+  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")"
@@ -287,4 +284,3 @@ _dynv6_rest() {
   _debug2 response "$response"
   return 0
 }
-

From 65aa7b10844eeb9b2692e5e2731a4d4eda99d36e Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 16:01:46 +0200
Subject: [PATCH 05/11] formatting

---
 dnsapi/dns_dynv6.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index c41aef3a..e51e118a 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -109,13 +109,12 @@ _get_domain() {
 #returns
 #dynv6_keyfile path to the key that will be used
 _get_authentication() {
-  if [ "$DYNV6_TOKEN" ]; then
-    _debug "Going to use the HTTP Token you specifed and saving it for futur use"
-    _saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
-    dynv6_token="$DYNV6_TOKEN"
-  elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
-    _debug "Found a previously used HTTP token going to use that"
-    dynv6_token="$(_readaccountconf_mutable dynv6_token)"
+  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)}"

From 395fdc9d61701bd3a9fb4b1bb812663461a579ae Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Sun, 31 May 2020 18:49:39 +0200
Subject: [PATCH 06/11] Added support for custom domains

---
 dnsapi/dns_dynv6.sh | 66 +++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 3c222d3a..f1471643 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -13,14 +13,18 @@ dns_dynv6_add() {
   _debug txtvalue "$txtvalue"
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
-  _get_domain "$fulldomain"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-  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 exist on your dynv6 account"
-    return 1
+
+  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"
@@ -44,14 +48,17 @@ dns_dynv6_rm() {
   _debug txtvalue "$txtvalue"
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
-  _get_domain "$fulldomain"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-  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 exist on your dynv6 account"
-    return 1
+  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
@@ -72,29 +79,30 @@ _generate_new_key() {
     return 1
   fi
 }
-#Usage: _acme-challenge.www.example.dynv6.net
+
+#Usage: _acme-challenge.www.example.dynv6.net "$_your_hosts"
+#where _your_hosts is the output of ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts
 #returns
 #_host= example.dynv6.net
 #_record=_acme-challenge.www
 #aborts if not a valid domain
 _get_domain() {
+  #_your_hosts="$(ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts)"
   _full_domain="$1"
-  _debug "getting domain for $_full_domain"
-  if ! _contains "$_full_domain" 'dynv6.net' && ! _contains "$_full_domain" 'dns.army' && ! _contains "$_full_domain" 'dns.navy' && ! _contains "$_full_domain" 'v6.rocks'; then
-    _err "The hosts does not seem to be a dynv6 host"
-    return 1
-  fi
-  _record="${_full_domain%.*}"
-  _record="${_record%.*}"
-  _record="${_record%.*}"
-  _debug "The record we are ging to use is $_record"
-  _host="$_full_domain"
-  while [ "$(echo "$_host" | grep -o '\.' | wc -l)" != "2" ]; do
-    _host="${_host#*.}"
-  done
-  _debug "And the host is $_host"
-  return 0
+  _your_hosts="$2"
 
+  _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
+  done
+  _err "Either their is no such host on your dnyv6 account or it cannot be accessed with this key"
+  return 1
 }
 
 # Usage: No input required
@@ -103,7 +111,7 @@ _get_domain() {
 _get_keyfile() {
   _debug "get keyfile method called"
   dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
-  _debug Your key is "$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"

From 0b539a597710a69e8aa2521fc8d0f4c48c6f1a0c Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Sun, 31 May 2020 19:09:27 +0200
Subject: [PATCH 07/11] first attempt to make travis happy

---
 dnsapi/dns_dynv6.sh | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index f1471643..473bb243 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -14,17 +14,14 @@ dns_dynv6_add() {
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+<<<<<<< HEAD
 
+=======
+>>>>>>> first attempt to make travis happy
   if ! _get_domain "$fulldomain" "$_your_hosts"; then
-  	_err "Host not found on your account"
-  	return 1
+    _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"
@@ -50,19 +47,12 @@ dns_dynv6_rm() {
   _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
+    _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
@@ -93,13 +83,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

From 0d4904f05dd9356a72caf7f5941bdcbdd975c654 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 15:42:45 +0200
Subject: [PATCH 08/11] no supporting HTTP API as well

---
 dnsapi/dns_dynv6.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 473bb243..dce7ce5f 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -14,10 +14,6 @@ dns_dynv6_add() {
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-<<<<<<< HEAD
-
-=======
->>>>>>> first attempt to make travis happy
   if ! _get_domain "$fulldomain" "$_your_hosts"; then
     _err "Host not found on your account"
     return 1

From 3cd7a2e6d6f6f6babee36e087abf98510c897f39 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 15:49:25 +0200
Subject: [PATCH 09/11] formatting

---
 dnsapi/dns_dynv6.sh | 212 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index dce7ce5f..5f36cef8 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -11,6 +11,7 @@ dns_dynv6_add() {
   _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
+<<<<<<< HEAD
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
@@ -27,6 +28,30 @@ dns_dynv6_add() {
     return 0
   else
     _err "Something went wrong! it does not seem like the record was added succesfully"
+=======
+  _get_authentication
+  if [ "$dynv6_token" ]; then
+    _dns_dynv6_add_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"
+    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
+>>>>>>> formatting
     return 1
   fi
   return 1
@@ -39,12 +64,29 @@ dns_dynv6_rm() {
   _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
+<<<<<<< HEAD
   _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
+=======
+  _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
+>>>>>>> formatting
   fi
   _debug "found host on your account"
   _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
@@ -94,6 +136,7 @@ _get_domain() {
 # Usage: No input required
 #returns
 #dynv6_keyfile path to the key that will be used
+<<<<<<< HEAD
 _get_keyfile() {
   _debug "get keyfile method called"
   dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
@@ -111,5 +154,174 @@ _get_keyfile() {
       dynv6_keyfile="$KEY"
     fi
     _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
+=======
+_get_authentication() {
+  if [ "$DYNV6_TOKEN" ]; then
+    _debug "Going to use the HTTP Token you specifed and saving it for futur use"
+    _saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
+    dynv6_token="$DYNV6_TOKEN"
+  elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
+    _debug "Found a previously used HTTP token going to use that"
+    dynv6_token="$(_readaccountconf_mutable dynv6_token)"
+  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"
+    fi
+  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")"
+>>>>>>> formatting
   fi
 }

From c849738c6fbd15524e8e2047ffe10203101aa2a8 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 16:01:46 +0200
Subject: [PATCH 10/11] formatting

---
 dnsapi/dns_dynv6.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 5f36cef8..5ccab1a4 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -156,13 +156,12 @@ _get_keyfile() {
     _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
 =======
 _get_authentication() {
-  if [ "$DYNV6_TOKEN" ]; then
-    _debug "Going to use the HTTP Token you specifed and saving it for futur use"
-    _saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN"
-    dynv6_token="$DYNV6_TOKEN"
-  elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then
-    _debug "Found a previously used HTTP token going to use that"
-    dynv6_token="$(_readaccountconf_mutable dynv6_token)"
+  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)}"

From 185b558561f8cbeef9598f97f6b8b18d2cdfe099 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Fri, 28 Aug 2020 19:46:45 +0200
Subject: [PATCH 11/11] fix shfmt error

---
 dnsapi/dns_dynv6.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index e51e118a..9efc9aeb 100644
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -260,7 +260,7 @@ _del_record() {
 
 _dynv6_rest() {
   m=$1    #method GET,POST,DELETE or PUT
-  ep="$2" #the endpoint 
+  ep="$2" #the endpoint
   data="$3"
   _debug "$ep"