From 0499e2dc937509021cf7737824836ba463c8d2f8 Mon Sep 17 00:00:00 2001
From: Serb <34104558+SBohomolov@users.noreply.github.com>
Date: Fri, 5 Apr 2024 13:41:29 +0300
Subject: [PATCH 1/4] fix(): changing logic and requests in the script for
 Fornex Public API (2.0.0)

---
 dnsapi/dns_fornex.sh | 109 +++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 57 deletions(-)

diff --git a/dnsapi/dns_fornex.sh b/dnsapi/dns_fornex.sh
index 53be307a..7488be22 100644
--- a/dnsapi/dns_fornex.sh
+++ b/dnsapi/dns_fornex.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env sh
 
-#Author: Timur Umarov <inbox@tumarov.com>
-
-FORNEX_API_URL="https://fornex.com/api/dns/v0.1"
+FORNEX_API_URL="https://fornex.com/api/dns/domain"
 
 ########  Public functions #####################
 
@@ -15,60 +13,60 @@ dns_fornex_add() {
     return 1
   fi
 
-  if ! _get_root "$fulldomain"; then
-    _err "Unable to determine root domain"
+  domain=$(echo "$fulldomain" | sed 's/^\*\.//')
+
+  if ! _get_domain_id "$domain"; then
+    _err "Unable to determine domain ID"
     return 1
   else
-    _debug _domain "$_domain"
+    _debug _domain_id "$_domain_id"
   fi
 
-  _info "Adding record"
-  if _rest POST "$_domain/entry_set/add/" "host=$fulldomain&type=TXT&value=$txtvalue&apikey=$FORNEX_API_KEY"; then
-    _debug _response "$response"
-    if _contains "$response" '"ok": true' || _contains "$response" 'Такая запись уже существует.'; then
-      _info "Added, OK"
-      return 0
-    fi
+  _info "Adding TXT record for $fulldomain"
+  # Add the TXT record
+  if ! _rest POST "$domain/entry_set/" "type=TXT&host=_acme-challenge&value=$txtvalue"; then
+    _err "Failed to add TXT record"
+    return 1
   fi
-  _err "Add txt record error."
-  return 1
+
+  _info "TXT record added successfully"
+  return 0
 }
 
-#Usage: dns_fornex_rm   _acme-challenge.www.domain.com
 dns_fornex_rm() {
   fulldomain=$1
-  txtvalue=$2
 
   if ! _Fornex_API; then
     return 1
   fi
 
-  if ! _get_root "$fulldomain"; then
-    _err "Unable to determine root domain"
+  domain=$(echo "$fulldomain" | sed 's/^\*\.//')
+
+  if ! _get_domain_id "$domain"; then
+    _err "Unable to determine domain ID"
     return 1
   else
-    _debug _domain "$_domain"
+    _debug _domain_id "$_domain_id"
   fi
 
-  _debug "Getting txt records"
-  _rest GET "$_domain/entry_set.json?apikey=$FORNEX_API_KEY"
+  _info "Removing TXT records for domain: _acme-challenge.$domain"
 
-  if ! _contains "$response" "$txtvalue"; then
-    _err "Txt record not found"
-    return 1
+  txt_ids=$(curl -X GET -H "Authorization: Api-Key $FORNEX_API_KEY" "https://fornex.com/api/dns/domain/$domain/entry_set/" | jq -r '.[] | select(.type == "TXT") | .id')
+
+  if [ -z "$txt_ids" ]; then
+    _info "No TXT records found for domain: _acme-challenge.$domain"
+    return 0
   fi
 
-  _record_id="$(echo "$response" | _egrep_o "{[^{]*\"value\"*:*\"$txtvalue\"[^}]*}" | sed -n -e 's#.*"id": \([0-9]*\).*#\1#p')"
-  _debug "_record_id" "$_record_id"
-  if [ -z "$_record_id" ]; then
-    _err "can not find _record_id"
-    return 1
-  fi
+  for txt_id in $txt_ids; do
+    _info "Removing TXT record with ID: $txt_id"
+    if ! _rest DELETE "$domain/entry_set/$txt_id"; then
+      _err "Failed to remove TXT record with ID: $txt_id"
+    else
+      _info "TXT record with ID $txt_id removed successfully"
+    fi
+  done
 
-  if ! _rest POST "$_domain/entry_set/$_record_id/delete/" "apikey=$FORNEX_API_KEY"; then
-    _err "Delete record error."
-    return 1
-  fi
   return 0
 }
 
@@ -78,34 +76,27 @@ dns_fornex_rm() {
 #returns
 # _sub_domain=_acme-challenge.www
 # _domain=domain.com
-_get_root() {
+_get_domain_id() {
   domain=$1
 
-  i=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
+  _debug "Getting domain ID for $domain"
 
-    if ! _rest GET "domain_list.json?q=$h&apikey=$FORNEX_API_KEY"; then
-      return 1
-    fi
+  if echo "$domain" | grep -q "_acme-challenge"; then
+    # If yes, remove "_acme-challenge" from the domain name
+    domain=$(echo "$domain" | sed 's/_acme-challenge\.//')
+  fi
 
-    if _contains "$response" "\"$h\"" >/dev/null; then
-      _domain=$h
-      return 0
-    else
-      _debug "$h not found"
-    fi
-    i=$(_math "$i" + 1)
-  done
+  if ! _rest GET "$domain/entry_set/"; then
+    _err "Failed to get domain ID for $domain"
+    return 1
+  fi
 
-  return 1
+  _domain_id="$response"
+  _debug "Domain ID for $domain is $_domain_id"
+  return 0
 }
 
+
 _Fornex_API() {
   FORNEX_API_KEY="${FORNEX_API_KEY:-$(_readaccountconf_mutable FORNEX_API_KEY)}"
   if [ -z "$FORNEX_API_KEY" ]; then
@@ -128,11 +119,15 @@ _rest() {
   _debug "$ep"
 
   export _H1="Accept: application/json"
+  export _H2="Authorization: Api-Key $FORNEX_API_KEY"
 
   if [ "$m" != "GET" ]; then
     _debug data "$data"
-    response="$(_post "$data" "$FORNEX_API_URL/$ep" "" "$m")"
+    url="$FORNEX_API_URL/$ep"
+    echo "curl -X $m -H 'Authorization: Api-Key $FORNEX_API_KEY' -d '$data' \"$url\""
+    response="$(_post "$data" "$url" "" "$m")"
   else
+    echo "curl -X GET -H 'Authorization: Api-Key $FORNEX_API_KEY' $FORNEX_API_URL/$ep"
     response="$(_get "$FORNEX_API_URL/$ep" | _normalizeJson)"
   fi
 

From 67c579434a9e7ffcc344b641c0ebc3c3545b2eb9 Mon Sep 17 00:00:00 2001
From: zer0init1 <66873187+zer0init1@users.noreply.github.com>
Date: Thu, 30 May 2024 13:16:40 +0300
Subject: [PATCH 2/4] Update dns_fornex.sh

Add descriptions
---
 dnsapi/dns_fornex.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dnsapi/dns_fornex.sh b/dnsapi/dns_fornex.sh
index 7488be22..ee0c2613 100644
--- a/dnsapi/dns_fornex.sh
+++ b/dnsapi/dns_fornex.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env sh
 
+# Author: @SBohomolov <noc@fornex.com>
+# Site: Fornex.com
+# Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_fornex
+# Bugs: https://github.com/fornex-com/acme.sh/issues/
+
 FORNEX_API_URL="https://fornex.com/api/dns/domain"
 
 ########  Public functions #####################

From 0b1f5afaafd47f6ff12e48841d3af065905d72f7 Mon Sep 17 00:00:00 2001
From: zer0init1 <66873187+zer0init1@users.noreply.github.com>
Date: Thu, 30 May 2024 13:21:00 +0300
Subject: [PATCH 3/4] Update dns_fornex.sh

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

diff --git a/dnsapi/dns_fornex.sh b/dnsapi/dns_fornex.sh
index ee0c2613..5ffcdf02 100644
--- a/dnsapi/dns_fornex.sh
+++ b/dnsapi/dns_fornex.sh
@@ -3,7 +3,7 @@
 # Author: @SBohomolov <noc@fornex.com>
 # Site: Fornex.com
 # Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_fornex
-# Bugs: https://github.com/fornex-com/acme.sh/issues/
+# Bugs: https://github.com/acmesh-official/acme.sh/issues/5161
 
 FORNEX_API_URL="https://fornex.com/api/dns/domain"
 

From a73c767cd70887717bdaa72a017f0d15746724e1 Mon Sep 17 00:00:00 2001
From: sbogomolov <sergey.bogomolow@gmail.com>
Date: Tue, 4 Jun 2024 17:17:42 +0300
Subject: [PATCH 4/4] fix:(changed function  and added install jq)

---
 dnsapi/dns_fornex.sh | 64 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/dnsapi/dns_fornex.sh b/dnsapi/dns_fornex.sh
index f812efb8..81d975c1 100644
--- a/dnsapi/dns_fornex.sh
+++ b/dnsapi/dns_fornex.sh
@@ -6,11 +6,50 @@
 # Bugs: https://github.com/acmesh-official/acme.sh/issues/5161
 
 
+## install jq ##
+
+# Check the operating system
+if [ "$(uname)" = "Darwin" ]; then
+    # macOS - install jq using Homebrew
+    if ! command -v brew >/dev/null 2>&1; then
+        echo "Error: Homebrew is not installed. Please install Homebrew first." >&2
+        exit 1
+    fi
+    brew install jq
+elif [ -f "/etc/redhat-release" ] || [ -f "/etc/centos-release" ] || [ -f "/etc/fedora-release" ]; then
+    # RedHat/CentOS/Fedora - install jq using yum or dnf
+    if command -v dnf >/dev/null 2>&1; then
+        dnf install -y jq
+    elif command -v yum >/dev/null 2>&1; then
+        yum install -y jq
+    else
+        echo "Error: Neither yum nor dnf package manager found." >&2
+        exit 1
+    fi
+elif [ -f "/etc/lsb-release" ] || [ -f "/etc/debian_version" ]; then
+    # Debian/Ubuntu - install jq using apt
+    if command -v apt >/dev/null 2>&1; then
+        apt update
+        apt install -y jq
+    else
+        echo "Error: apt package manager not found." >&2
+        exit 1
+    fi
+else
+    echo "Error: Unsupported operating system." >&2
+    exit 1
+fi
+
+# jq installed successfully
+echo "jq installed successfully."
+
+#######################################################
+
 FORNEX_API_URL="https://fornex.com/api/dns/domain"
 
-########  Public functions #####################
+########  Public functions ###########################
 
-#Usage: dns_fornex_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+# Usage: dns_fornex_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_fornex_add() {
   fulldomain=$1
   txtvalue=$2
@@ -57,7 +96,10 @@ dns_fornex_rm() {
 
   _info "Removing TXT records for domain: _acme-challenge.$domain"
 
-  txt_ids=$(curl -X GET -H "Authorization: Api-Key $FORNEX_API_KEY" "https://fornex.com/api/dns/domain/$domain/entry_set/" | jq -r '.[] | select(.type == "TXT") | .id')
+  response=$(curl -X GET -H "Authorization: Api-Key $FORNEX_API_KEY" "https://fornex.com/api/dns/domain/$domain/entry_set/")
+  
+  # Extract TXT record IDs using jq
+  txt_ids=$(echo "$response" | jq -r '.[] | select(.type == "TXT") | .id')
 
   if [ -z "$txt_ids" ]; then
     _info "No TXT records found for domain: _acme-challenge.$domain"
@@ -66,7 +108,7 @@ dns_fornex_rm() {
 
   for txt_id in $txt_ids; do
     _info "Removing TXT record with ID: $txt_id"
-    if ! _rest DELETE "$domain/entry_set/$txt_id"; then
+    if ! curl -X DELETE -H "Authorization: Api-Key $FORNEX_API_KEY" "https://fornex.com/api/dns/domain/$domain/entry_set/$txt_id/"; then
       _err "Failed to remove TXT record with ID: $txt_id"
     else
       _info "TXT record with ID $txt_id removed successfully"
@@ -78,8 +120,8 @@ dns_fornex_rm() {
 
 ####################  Private functions below ##################################
 
-#_acme-challenge.www.domain.com
-#returns
+# _acme-challenge.www.domain.com
+# returns
 # _sub_domain=_acme-challenge.www
 # _domain=domain.com
 _get_domain_id() {
@@ -102,7 +144,6 @@ _get_domain_id() {
   return 0
 }
 
-
 _Fornex_API() {
   FORNEX_API_KEY="${FORNEX_API_KEY:-$(_readaccountconf_mutable FORNEX_API_KEY)}"
   if [ -z "$FORNEX_API_KEY" ]; then
@@ -117,7 +158,7 @@ _Fornex_API() {
   _saveaccountconf_mutable FORNEX_API_KEY "$FORNEX_API_KEY"
 }
 
-#method method action data
+# method method action data
 _rest() {
   m=$1
   ep="$2"
@@ -130,11 +171,10 @@ _rest() {
   if [ "$m" != "GET" ]; then
     _debug data "$data"
     url="$FORNEX_API_URL/$ep"
-    echo "curl -X $m -H 'Authorization: Api-Key $FORNEX_API_KEY' -d '$data' \"$url\""
-    response="$(_post "$data" "$url" "" "$m")"
+    response=$(curl -X "$m" -H "Authorization: Api-Key $FORNEX_API_KEY" -d "$data" "$url")
   else
-    echo "curl -X GET -H 'Authorization: Api-Key $FORNEX_API_KEY' $FORNEX_API_URL/$ep"
-    response="$(_get "$FORNEX_API_URL/$ep" | _normalizeJson)"
+    url="$FORNEX_API_URL/$ep"
+    response=$(curl -X GET -H "Authorization: Api-Key $FORNEX_API_KEY" "$url")
   fi
 
   _ret="$?"