From 475e6e28eb1eb998f37adcfa09f22faa869a7d9a Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Fri, 12 Oct 2018 19:04:18 +0300
Subject: [PATCH 1/6] Added dns api support for internet.bs

---
 README.md                |   1 +
 dnsapi/dns_internetbs.sh | 173 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100755 dnsapi/dns_internetbs.sh

diff --git a/README.md b/README.md
index b9a5cc59..b0c2d02a 100644
--- a/README.md
+++ b/README.md
@@ -327,6 +327,7 @@ You don't have to do anything manually!
 1. netcup DNS API (https://www.netcup.de)
 1. GratisDNS.dk (https://gratisdns.dk)
 1. Namecheap API (https://www.namecheap.com/)
+1. Internet.bs API (https://internetbs.net/)
 
 And: 
 
diff --git a/dnsapi/dns_internetbs.sh b/dnsapi/dns_internetbs.sh
new file mode 100755
index 00000000..bf227e3a
--- /dev/null
+++ b/dnsapi/dns_internetbs.sh
@@ -0,0 +1,173 @@
+#!/usr/bin/env sh
+
+#This is the Internet.BS api wrapper for acme.sh
+#
+#Author: <alexey@nelexa.ru> Ne-Lexa
+#Report Bugs here: https://github.com/Ne-Lexa/acme.sh
+
+#INTERNETBS_API_KEY="sdfsdfsdfljlbjkljlkjsdfoiwje"
+#INTERNETBS_API_PASSWORD="sdfsdfsdfljlbjkljlkjsdfoiwje"
+INTERNETBS_API_URL="https://api.internet.bs"
+
+########  Public functions #####################
+
+#Usage: dns_myapi_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_internetbs_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  if [ -z "$INTERNETBS_API_KEY" ] || [ -z "$INTERNETBS_API_PASSWORD" ]; then
+    INTERNETBS_API_KEY=""
+    INTERNETBS_API_PASSWORD=""
+    _err "You didn't specify the INTERNET.BS api key and password yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
+
+  _saveaccountconf INTERNETBS_API_KEY "$INTERNETBS_API_KEY"
+  _saveaccountconf INTERNETBS_API_PASSWORD "$INTERNETBS_API_PASSWORD"
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  # https://testapi.internet.bs/Domain/DnsRecord/Add?ApiKey=testapi&Password=testpass&FullRecordName=w3.test-api-domain7.net&Type=CNAME&Value=www.internet.bs%&ResponseFormat=json
+  if _internetbs_rest POST "Domain/DnsRecord/Add" "FullRecordName=${_sub_domain}.${_domain}&Type=TXT&Value=${txtvalue}&ResponseFormat=json"; then
+    if ! _contains "$response" "\"status\":\"SUCCESS\""; then
+      _err "ERROR add TXT record"
+      _err "$response"
+      _clearaccountconf INTERNETBS_API_KEY
+      _clearaccountconf INTERNETBS_API_PASSWORD
+      return 1
+    fi
+
+    _info "txt record add success."
+    return 0
+  fi
+
+  return 1
+}
+
+#Usage: fulldomain txtvalue
+#Remove the txt record after validation.
+dns_internetbs_rm() {
+  fulldomain=$1
+  txtvalue=$2
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _debug "Getting txt records"
+   # https://testapi.internet.bs/Domain/DnsRecord/List?ApiKey=testapi&Password=testpass&Domain=test-api-domain7.net&FilterType=CNAME&ResponseFormat=json
+  _internetbs_rest POST "Domain/DnsRecord/List" "Domain=$_domain&FilterType=TXT&ResponseFormat=json"
+
+  if ! _contains "$response" "\"status\":\"SUCCESS\""; then
+    _err "ERROR list dns records"
+    _err "$response"
+    _clearaccountconf INTERNETBS_API_KEY
+    _clearaccountconf INTERNETBS_API_PASSWORD
+    return 1
+  fi
+
+  if _contains "$response" "\name\":\"${_sub_domain}.${_domain}\""; then
+    _info "txt record find."
+
+    # https://testapi.internet.bs/Domain/DnsRecord/Remove?ApiKey=testapi&Password=testpass&FullRecordName=www.test-api-domain7.net&Type=cname&ResponseFormat=json
+    _internetbs_rest POST "Domain/DnsRecord/Remove" "FullRecordName=${_sub_domain}.${_domain}&Type=TXT&ResponseFormat=json"
+
+    if ! _contains "$response" "\"status\":\"SUCCESS\""; then
+      _err "ERROR remove dns record"
+      _err "$response"
+      _clearaccountconf INTERNETBS_API_KEY
+      _clearaccountconf INTERNETBS_API_PASSWORD
+      return 1
+    fi
+
+    _info "txt record deleted success."
+    return 0
+  fi
+
+  return 1
+}
+
+####################  Private functions below ##################################
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+# _domain_id=12345
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+
+  # https://testapi.internet.bs/Domain/List?ApiKey=testapi&Password=testpass&CompactList=yes&ResponseFormat=json
+  if _internetbs_rest POST "Domain/List" "CompactList=yes&ResponseFormat=json"; then
+
+    if ! _contains "$response" "\"status\":\"SUCCESS\""; then
+      _err "ERROR fetch domain list"
+      _err "$response"
+      _clearaccountconf INTERNETBS_API_KEY
+      _clearaccountconf INTERNETBS_API_PASSWORD
+      return 1
+    fi
+
+    while true; do
+      h=$(printf "%s" "$domain" | cut -d . -f ${i}-100)
+      _debug h "$h"
+      if [ -z "$h" ]; then
+        #not valid
+        return 1
+      fi
+
+      if _contains "$response" "\"$h\""; then
+        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-${p})
+        _domain=${h}
+        return 0
+      fi
+
+      p=i
+      i=$(_math "$i" + 1)
+    done
+  fi
+  return 1
+}
+
+#Usage: method  URI  data
+_internetbs_rest() {
+  m="$1"
+  ep="$2"
+  data="$3"
+  url="${INTERNETBS_API_URL}/${ep}"
+
+  _debug url "$url"
+
+  apiKey="$(printf "%s" "${INTERNETBS_API_KEY}" | _url_encode)"
+  password="$(printf "%s" "${INTERNETBS_API_PASSWORD}" | _url_encode)"
+
+  if [ "$m" = "GET" ]; then
+    response="$(_get "${url}?ApiKey=${apiKey}&Password=${password}&${data}" | tr -d '\r')"
+  else
+    _debug2 data "$data"
+    response="$(_post "$data" "${url}?ApiKey=${apiKey}&Password=${password}" | tr -d '\r')"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $ep"
+    return 1
+  fi
+
+  _debug2 response "$response"
+  return 0
+}

From fdb9d93b1211b673ddf9589f367343256ba677a3 Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Fri, 12 Oct 2018 19:27:41 +0300
Subject: [PATCH 2/6] formatted

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

diff --git a/dnsapi/dns_internetbs.sh b/dnsapi/dns_internetbs.sh
index bf227e3a..ba170836 100755
--- a/dnsapi/dns_internetbs.sh
+++ b/dnsapi/dns_internetbs.sh
@@ -69,7 +69,7 @@ dns_internetbs_rm() {
   _debug _domain "$_domain"
 
   _debug "Getting txt records"
-   # https://testapi.internet.bs/Domain/DnsRecord/List?ApiKey=testapi&Password=testpass&Domain=test-api-domain7.net&FilterType=CNAME&ResponseFormat=json
+  # https://testapi.internet.bs/Domain/DnsRecord/List?ApiKey=testapi&Password=testpass&Domain=test-api-domain7.net&FilterType=CNAME&ResponseFormat=json
   _internetbs_rest POST "Domain/DnsRecord/List" "Domain=$_domain&FilterType=TXT&ResponseFormat=json"
 
   if ! _contains "$response" "\"status\":\"SUCCESS\""; then

From a63dc75b43414d0d553cf89ee3a82e613420739d Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Mon, 15 Oct 2018 18:20:26 +0300
Subject: [PATCH 3/6] Added documentation on using dns api internet.bs

---
 dnsapi/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dnsapi/README.md b/dnsapi/README.md
index 2cecfa5a..0f867580 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -1014,6 +1014,22 @@ Now you can issue a certificate.
 acme.sh --issue --dns dns_namecheap -d example.com -d *.example.com
 ```
 
+## 54. Use Internet.bs
+
+First you need to create/obtain API credentials on your Internet.bs (https://internetbs.net) account. Go to the "Get my API Key" section in the "My Domains" section.
+
+```
+export INTERNETBS_API_KEY="..."
+export INTERNETBS_API_PASSWORD="..."
+```
+
+Ok, let's issue a cert now:
+```
+acme.sh --issue --dns dns_internetbs -d example.com -d www.example.com
+```
+
+The `INTERNETBS_API_KEY` and `INTERNETBS_API_PASSWORD` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
+
 # Use custom API
 
 If your API is not supported yet, you can write your own DNS API.

From a207199879a21c58433273f7461bf4a464d7a8f9 Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Mon, 29 Oct 2018 15:18:43 +0300
Subject: [PATCH 4/6] fixed _get_root() function

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

diff --git a/dnsapi/dns_internetbs.sh b/dnsapi/dns_internetbs.sh
index ba170836..05a1adae 100755
--- a/dnsapi/dns_internetbs.sh
+++ b/dnsapi/dns_internetbs.sh
@@ -137,7 +137,7 @@ _get_root() {
         return 0
       fi
 
-      p=i
+      p=${i}
       i=$(_math "$i" + 1)
     done
   fi

From 0b363a5c98d56df8c45a689ccc55087484f64306 Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Mon, 24 Dec 2018 13:33:25 +0300
Subject: [PATCH 5/6] removed the _clearaccountconf() call for erroneous
 requests

---
 dnsapi/dns_internetbs.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dnsapi/dns_internetbs.sh b/dnsapi/dns_internetbs.sh
index 05a1adae..d25c8324 100755
--- a/dnsapi/dns_internetbs.sh
+++ b/dnsapi/dns_internetbs.sh
@@ -41,8 +41,6 @@ dns_internetbs_add() {
     if ! _contains "$response" "\"status\":\"SUCCESS\""; then
       _err "ERROR add TXT record"
       _err "$response"
-      _clearaccountconf INTERNETBS_API_KEY
-      _clearaccountconf INTERNETBS_API_PASSWORD
       return 1
     fi
 
@@ -75,8 +73,6 @@ dns_internetbs_rm() {
   if ! _contains "$response" "\"status\":\"SUCCESS\""; then
     _err "ERROR list dns records"
     _err "$response"
-    _clearaccountconf INTERNETBS_API_KEY
-    _clearaccountconf INTERNETBS_API_PASSWORD
     return 1
   fi
 
@@ -89,8 +85,6 @@ dns_internetbs_rm() {
     if ! _contains "$response" "\"status\":\"SUCCESS\""; then
       _err "ERROR remove dns record"
       _err "$response"
-      _clearaccountconf INTERNETBS_API_KEY
-      _clearaccountconf INTERNETBS_API_PASSWORD
       return 1
     fi
 
@@ -118,8 +112,6 @@ _get_root() {
     if ! _contains "$response" "\"status\":\"SUCCESS\""; then
       _err "ERROR fetch domain list"
       _err "$response"
-      _clearaccountconf INTERNETBS_API_KEY
-      _clearaccountconf INTERNETBS_API_PASSWORD
       return 1
     fi
 

From b7b94e38ac7c3183d3c6d0bd8709dd9d8fdd589d Mon Sep 17 00:00:00 2001
From: Ne-Lexa <alexey@nelexa.ru>
Date: Mon, 24 Dec 2018 14:59:14 +0300
Subject: [PATCH 6/6] support change account conf from env

---
 dnsapi/dns_internetbs.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_internetbs.sh b/dnsapi/dns_internetbs.sh
index d25c8324..ae6b9e1e 100755
--- a/dnsapi/dns_internetbs.sh
+++ b/dnsapi/dns_internetbs.sh
@@ -7,6 +7,7 @@
 
 #INTERNETBS_API_KEY="sdfsdfsdfljlbjkljlkjsdfoiwje"
 #INTERNETBS_API_PASSWORD="sdfsdfsdfljlbjkljlkjsdfoiwje"
+
 INTERNETBS_API_URL="https://api.internet.bs"
 
 ########  Public functions #####################
@@ -16,6 +17,9 @@ dns_internetbs_add() {
   fulldomain=$1
   txtvalue=$2
 
+  INTERNETBS_API_KEY="${INTERNETBS_API_KEY:-$(_readaccountconf_mutable INTERNETBS_API_KEY)}"
+  INTERNETBS_API_PASSWORD="${INTERNETBS_API_PASSWORD:-$(_readaccountconf_mutable INTERNETBS_API_PASSWORD)}"
+
   if [ -z "$INTERNETBS_API_KEY" ] || [ -z "$INTERNETBS_API_PASSWORD" ]; then
     INTERNETBS_API_KEY=""
     INTERNETBS_API_PASSWORD=""
@@ -24,8 +28,8 @@ dns_internetbs_add() {
     return 1
   fi
 
-  _saveaccountconf INTERNETBS_API_KEY "$INTERNETBS_API_KEY"
-  _saveaccountconf INTERNETBS_API_PASSWORD "$INTERNETBS_API_PASSWORD"
+  _saveaccountconf_mutable INTERNETBS_API_KEY "$INTERNETBS_API_KEY"
+  _saveaccountconf_mutable INTERNETBS_API_PASSWORD "$INTERNETBS_API_PASSWORD"
 
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
@@ -57,6 +61,17 @@ dns_internetbs_rm() {
   fulldomain=$1
   txtvalue=$2
 
+  INTERNETBS_API_KEY="${INTERNETBS_API_KEY:-$(_readaccountconf_mutable INTERNETBS_API_KEY)}"
+  INTERNETBS_API_PASSWORD="${INTERNETBS_API_PASSWORD:-$(_readaccountconf_mutable INTERNETBS_API_PASSWORD)}"
+
+  if [ -z "$INTERNETBS_API_KEY" ] || [ -z "$INTERNETBS_API_PASSWORD" ]; then
+    INTERNETBS_API_KEY=""
+    INTERNETBS_API_PASSWORD=""
+    _err "You didn't specify the INTERNET.BS api key and password yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
+
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"