From 0241552c0d5475d10e8e1a4f455d3c247b25c0c3 Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Thu, 2 Jan 2025 00:26:47 +0100
Subject: [PATCH 1/7] update dns_cyon for updated field names and add
 validation

---
 dnsapi/dns_cyon.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 04a515aab4..b5ab836957 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -232,7 +232,7 @@ _cyon_add_txt() {
   _info "  - Adding DNS TXT entry..."
 
   add_txt_url="https://my.cyon.ch/domain/dnseditor/add-record-async"
-  add_txt_data="zone=${fulldomain_idn}.&ttl=900&type=TXT&value=${txtvalue}"
+  add_txt_data="name=${fulldomain_idn}.&ttl=900&type=TXT&dnscontent=${txtvalue}"
 
   add_txt_response="$(_post "$add_txt_data" "$add_txt_url")"
   _debug add_txt_response "${add_txt_response}"
@@ -241,9 +241,10 @@ _cyon_add_txt() {
 
   add_txt_message="$(printf "%s" "${add_txt_response}" | _cyon_get_response_message)"
   add_txt_status="$(printf "%s" "${add_txt_response}" | _cyon_get_response_status)"
+  add_txt_validation="$(printf "%s" "${add_txt_response}" | _cyon_get_validation_status)"
 
   # Bail if adding TXT entry fails.
-  if [ "${add_txt_status}" != "true" ]; then
+  if [ "${add_txt_status}" != "true" ] || [ "${add_txt_validation}" != "true" ] ; then
     _err "    ${add_txt_message}"
     _err ""
     return 1
@@ -308,6 +309,10 @@ _cyon_get_response_status() {
   _egrep_o '"status":\w*' | cut -d : -f 2
 }
 
+_cyon_get_validation_status() {
+  _egrep_o '"valid":\w*' | cut -d : -f 2
+}
+
 _cyon_get_response_success() {
   _egrep_o '"onSuccess":"[^"]*"' | cut -d : -f 2 | tr -d '"'
 }

From 524b40b75ff46f875ddd754d4bdd0715b212b752 Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Thu, 2 Jan 2025 00:36:28 +0100
Subject: [PATCH 2/7] adhere to shell formatting

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

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index b5ab836957..9a95d31734 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -244,7 +244,7 @@ _cyon_add_txt() {
   add_txt_validation="$(printf "%s" "${add_txt_response}" | _cyon_get_validation_status)"
 
   # Bail if adding TXT entry fails.
-  if [ "${add_txt_status}" != "true" ] || [ "${add_txt_validation}" != "true" ] ; then
+  if [ "${add_txt_status}" != "true" ] || [ "${add_txt_validation}" != "true" ]; then
     _err "    ${add_txt_message}"
     _err ""
     return 1

From 6328496bfb13716cd44b4371d1309fa71c49a452 Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Thu, 2 Jan 2025 00:41:59 +0100
Subject: [PATCH 3/7] run tests

---
 dnsapi/dns_cyon.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 9a95d31734..5510bfc27d 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -228,6 +228,7 @@ _cyon_change_domain_env() {
   _info ""
 }
 
+
 _cyon_add_txt() {
   _info "  - Adding DNS TXT entry..."
 

From 0e4fd5269b4b25ade954ce0648069e2c317f611c Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Thu, 2 Jan 2025 00:49:20 +0100
Subject: [PATCH 4/7] run tests

---
 dnsapi/dns_cyon.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 5510bfc27d..9a95d31734 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -228,7 +228,6 @@ _cyon_change_domain_env() {
   _info ""
 }
 
-
 _cyon_add_txt() {
   _info "  - Adding DNS TXT entry..."
 

From 04aefbf28da6ceb27a3cece5484fc0b2ecca9988 Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Fri, 3 Jan 2025 00:31:27 +0100
Subject: [PATCH 5/7] moved the env change check to its own function

---
 dnsapi/dns_cyon.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 9a95d31734..175877c69a 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -215,10 +215,8 @@ _cyon_change_domain_env() {
 
   if ! _cyon_check_if_2fa_missed "${domain_env_response}"; then return 1; fi
 
-  domain_env_success="$(printf "%s" "${domain_env_response}" | _egrep_o '"authenticated":\w*' | cut -d : -f 2)"
-
   # Bail if domain environment change fails.
-  if [ "${domain_env_success}" != "true" ]; then
+  if [ "$(printf "%s" "${domain_env_response}" | _cyon_get_envchange_success)" != "true" ]; then
     _err "    $(printf "%s" "${domain_env_response}" | _cyon_get_response_message)"
     _err ""
     return 1
@@ -317,6 +315,10 @@ _cyon_get_response_success() {
   _egrep_o '"onSuccess":"[^"]*"' | cut -d : -f 2 | tr -d '"'
 }
 
+_cyon_get_envchange_success() {
+  _egrep_o '"authenticated":\w*' | cut -d : -f 2
+}
+
 _cyon_check_if_2fa_missed() {
   # Did we miss the 2FA?
   if test "${1#*multi_factor_form}" != "${1}"; then

From b29d17f5228b15d1fae005adcf326a25b46c974d Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Fri, 3 Jan 2025 13:04:04 +0100
Subject: [PATCH 6/7] changed char class for compatibility with openbsd

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

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 175877c69a..4b0dbfc04f 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -216,7 +216,7 @@ _cyon_change_domain_env() {
   if ! _cyon_check_if_2fa_missed "${domain_env_response}"; then return 1; fi
 
   # Bail if domain environment change fails.
-  if [ "$(printf "%s" "${domain_env_response}" | _cyon_get_envchange_success)" != "true" ]; then
+  if [ "$(printf "%s" "${domain_env_response}" | _cyon_get_environment_change_status)" != "true" ]; then
     _err "    $(printf "%s" "${domain_env_response}" | _cyon_get_response_message)"
     _err ""
     return 1
@@ -315,8 +315,8 @@ _cyon_get_response_success() {
   _egrep_o '"onSuccess":"[^"]*"' | cut -d : -f 2 | tr -d '"'
 }
 
-_cyon_get_envchange_success() {
-  _egrep_o '"authenticated":\w*' | cut -d : -f 2
+_cyon_get_environment_change_status() {
+  _egrep_o '"authenticated":[a-zA-z0-9]*' | cut -d : -f 2
 }
 
 _cyon_check_if_2fa_missed() {

From 1b123054b36fe3acdad6f871ec6f9f8b30caba17 Mon Sep 17 00:00:00 2001
From: Markus Schenk <ms@theschenks.ch>
Date: Fri, 3 Jan 2025 13:08:18 +0100
Subject: [PATCH 7/7] also updated the other validation functions

---
 dnsapi/dns_cyon.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 4b0dbfc04f..a585e77202 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -304,11 +304,11 @@ _cyon_get_response_message() {
 }
 
 _cyon_get_response_status() {
-  _egrep_o '"status":\w*' | cut -d : -f 2
+  _egrep_o '"status":[a-zA-z0-9]*' | cut -d : -f 2
 }
 
 _cyon_get_validation_status() {
-  _egrep_o '"valid":\w*' | cut -d : -f 2
+  _egrep_o '"valid":[a-zA-z0-9]*' | cut -d : -f 2
 }
 
 _cyon_get_response_success() {