From e36fbd6af5c56b4672077694e7db9adebcb49d25 Mon Sep 17 00:00:00 2001
From: Grant Millar <grant@cylo.io>
Date: Fri, 20 Apr 2018 09:41:07 +0100
Subject: [PATCH 01/20] Fix DNSimple when zone has > 100 records

The _get_records function currently returns the first 100 records. As our TXT is added most recently, if you have > 100 records it will not be returned.

I've changed the function to sort by ID DESC, so it will always return the latest 100 records.
---
 dnsapi/dns_dnsimple.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index 0dd3918..b2cba58 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -152,7 +152,7 @@ _get_records() {
   sub_domain=$3
 
   _debug "fetching txt records"
-  _dnsimple_rest GET "$account_id/zones/$domain/records?per_page=100"
+  _dnsimple_rest GET "$account_id/zones/$domain/records?per_page=100&sort=id:desc"
 
   if ! _contains "$response" "\"id\":"; then
     _err "failed to retrieve records"

From e19809d5b510ebd466f1abfd9f8ec4feadae3d92 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Fri, 11 Jan 2019 18:17:38 +0800
Subject: [PATCH 02/20] Add deployment for qiniu cdn

Upload certificate and privkey to Qiniu's CDN service with https://developer.qiniu.com/fusion/api/4248/certificate
---
 acme.sh         |  2 +-
 deploy/qiniu.sh | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 deploy/qiniu.sh

diff --git a/acme.sh b/acme.sh
index 872529f..86b555a 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1580,7 +1580,7 @@ _inithttp() {
   fi
 
   if [ -z "$_ACME_CURL" ] && _exists "curl"; then
-    _ACME_CURL="curl -L --silent --dump-header $HTTP_HEADER "
+    _ACME_CURL="curl -L --dump-header $HTTP_HEADER "
     if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ]; then
       _CURL_DUMP="$(_mktemp)"
       _ACME_CURL="$_ACME_CURL --trace-ascii $_CURL_DUMP "
diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
new file mode 100644
index 0000000..4fa66ee
--- /dev/null
+++ b/deploy/qiniu.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env sh
+
+# Script to create certificate to qiniu.com 
+#
+# This deployment required following variables
+# export QINIU_AK="QINIUACCESSKEY"
+# export QINIU_SK="QINIUSECRETKEY"
+
+QINIU_API_BASE="https://api.qiniu.com"
+
+qiniu_deploy() {
+  _cdomain="$1"
+  _ckey="$2"
+  _ccert="$3"
+  _cca="$4"
+  _cfullchain="$5"
+
+  _debug _cdomain "$_cdomain"
+  _debug _ckey "$_ckey"
+  _debug _ccert "$_ccert"
+  _debug _cca "$_cca"
+  _debug _cfullchain "$_cfullchain"
+
+  if [ -z "$QINIU_AK" ]; then
+    if [ -z "$Le_Deploy_Qiniu_AK" ]; then
+      _err "QINIU_AK is not defined."
+      return 1
+    fi
+  else
+    Le_Deploy_Qiniu_AK="$QINIU_AK"
+    _savedomainconf Le_Deploy_Qiniu_AK "$Le_Deploy_Qiniu_AK"
+  fi
+
+  if [ -z "$QINIU_SK" ]; then
+    if [ -z "$Le_Deploy_Qiniu_SK" ]; then
+      _err "QINIU_SK is not defined."
+      return 1
+    fi
+  else
+    Le_Deploy_Qiniu_SK="$QINIU_SK"
+    _savedomainconf Le_Deploy_Qiniu_SK "$Le_Deploy_Qiniu_SK"
+  fi
+
+  string_fullchain=$(awk '{printf "%s\\n", $0}' "$_cfullchain")
+  string_key=$(awk '{printf "%s\\n", $0}' "$_ckey")
+
+  body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\""$string_fullchain"\",\"pri\":\"$string_key\"}"
+
+  create_ssl_url="$QINIU_API_BASE/sslcert"
+
+  ACCESSTOKEN="$(_make_sslcreate_access_token)"
+  export _H1="Authorization: QBox $ACCESSTOKEN"
+
+  _response=$(_post "$body" "$create_ssl_url" 0 "POST" "application/json" | _dbase64 "multiline")
+
+  success_response="certID"
+  if test "${_response#*$success_response}" == "$_response"; then
+    _err "Error in deploying certificate:"
+    _err "$_response"
+    return 1
+  fi
+
+  _debug response "$_response"
+  _info "Certificate successfully deployed"
+
+  return 0
+}
+
+_make_sslcreate_access_token() {
+  _data="/sslcert\\n"
+  _token="$(printf "$_data" | openssl sha1 -hmac $Le_Deploy_Qiniu_SK -binary | openssl base64 -e)"
+  echo "$Le_Deploy_Qiniu_AK:$_token"
+}

From 3bc6628227dcebc1b788ed0676d51b992ee202cc Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Fri, 11 Jan 2019 19:19:07 +0800
Subject: [PATCH 03/20] Update Qiniu's domain settings after uploading
 certificate

---
 acme.sh         |  2 +-
 deploy/qiniu.sh | 41 ++++++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/acme.sh b/acme.sh
index 86b555a..872529f 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1580,7 +1580,7 @@ _inithttp() {
   fi
 
   if [ -z "$_ACME_CURL" ] && _exists "curl"; then
-    _ACME_CURL="curl -L --dump-header $HTTP_HEADER "
+    _ACME_CURL="curl -L --silent --dump-header $HTTP_HEADER "
     if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ]; then
       _CURL_DUMP="$(_mktemp)"
       _ACME_CURL="$_ACME_CURL --trace-ascii $_CURL_DUMP "
diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 4fa66ee..070b7f6 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -44,30 +44,53 @@ qiniu_deploy() {
   string_fullchain=$(awk '{printf "%s\\n", $0}' "$_cfullchain")
   string_key=$(awk '{printf "%s\\n", $0}' "$_ckey")
 
-  body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\""$string_fullchain"\",\"pri\":\"$string_key\"}"
+  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\""$string_fullchain"\",\"pri\":\"$string_key\"}"
 
   create_ssl_url="$QINIU_API_BASE/sslcert"
 
-  ACCESSTOKEN="$(_make_sslcreate_access_token)"
-  export _H1="Authorization: QBox $ACCESSTOKEN"
+  sslcert_access_token="$(_make_sslcreate_access_token "/sslcert\\n")"
+  _debug sslcert_access_token "$sslcert_access_token"
+  export _H1="Authorization: QBox $sslcert_access_token"
 
-  _response=$(_post "$body" "$create_ssl_url" 0 "POST" "application/json" | _dbase64 "multiline")
+  sslcert_response=$(_post "$sslcerl_body" "$create_ssl_url" 0 "POST" "application/json" | _dbase64 "multiline")
 
   success_response="certID"
-  if test "${_response#*$success_response}" == "$_response"; then
-    _err "Error in deploying certificate:"
-    _err "$_response"
+  if test "${sslcert_response#*$success_response}" == "$sslcert_response"; then
+    _err "Error in creating certificate:"
+    _err "$sslcert_response"
     return 1
   fi
 
-  _debug response "$_response"
+  _debug sslcert_response "$sslcert_response"
+  _info "Certificate successfully uploaded, updating domain $_cdomain"
+
+  _certId=$(printf "%s" $sslcert_response | sed -e "s/^.*certID\":\"//" -e "s/\"\}$//")
+  _debug certId "$_certId"
+
+  update_path="/domain/$_cdomain/httpsconf"
+  update_url="$QINIU_API_BASE$update_path"
+  update_body="{\"certid\":\""$_certId"\",\"forceHttps\":true}"
+
+  update_access_token="$(_make_sslcreate_access_token "$update_path\\n")"
+  _debug update_access_token "$update_access_token"
+  export _H1="Authorization: QBox $update_access_token"
+  update_response=$(_post "$update_body" "$update_url" 0 "PUT" "application/json" | _dbase64 "multiline")
+
+  err_response="error"
+  if test "${update_response#*$err_response}" != "$update_response"; then
+    _err "Error in updating domain:"
+    _err "$update_response"
+    return 1
+  fi
+
+  _debug update_response "$update_response"
   _info "Certificate successfully deployed"
 
   return 0
 }
 
 _make_sslcreate_access_token() {
-  _data="/sslcert\\n"
+  _data="$1"
   _token="$(printf "$_data" | openssl sha1 -hmac $Le_Deploy_Qiniu_SK -binary | openssl base64 -e)"
   echo "$Le_Deploy_Qiniu_AK:$_token"
 }

From d2a60f3ca42aead53dedbb7afa841919ac75fc83 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 12 Jan 2019 15:54:42 +0800
Subject: [PATCH 04/20] lint code

---
 deploy/qiniu.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 070b7f6..4f578b2 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -41,18 +41,16 @@ qiniu_deploy() {
     _savedomainconf Le_Deploy_Qiniu_SK "$Le_Deploy_Qiniu_SK"
   fi
 
+  ## upload certificate
   string_fullchain=$(awk '{printf "%s\\n", $0}' "$_cfullchain")
   string_key=$(awk '{printf "%s\\n", $0}' "$_ckey")
 
-  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\""$string_fullchain"\",\"pri\":\"$string_key\"}"
-
-  create_ssl_url="$QINIU_API_BASE/sslcert"
-
-  sslcert_access_token="$(_make_sslcreate_access_token "/sslcert\\n")"
+  sslcert_path="/sslcert"
+  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
+  sslcert_access_token="$(_make_sslcreate_access_token "$sslcert_path")"
   _debug sslcert_access_token "$sslcert_access_token"
   export _H1="Authorization: QBox $sslcert_access_token"
-
-  sslcert_response=$(_post "$sslcerl_body" "$create_ssl_url" 0 "POST" "application/json" | _dbase64 "multiline")
+  sslcert_response=$(_post "$sslcerl_body" "$QINIU_API_BASE$sslcert_path" 0 "POST" "application/json" | _dbase64 "multiline")
 
   success_response="certID"
   if test "${sslcert_response#*$success_response}" == "$sslcert_response"; then
@@ -64,21 +62,21 @@ qiniu_deploy() {
   _debug sslcert_response "$sslcert_response"
   _info "Certificate successfully uploaded, updating domain $_cdomain"
 
-  _certId=$(printf "%s" $sslcert_response | sed -e "s/^.*certID\":\"//" -e "s/\"\}$//")
+  ## extract certId
+  _certId=$(printf "%s" "$sslcert_response" | sed -e "s/^.*certID\":\"//" -e "s/\"\}$//")
   _debug certId "$_certId"
 
+  ## update domain ssl config
   update_path="/domain/$_cdomain/httpsconf"
-  update_url="$QINIU_API_BASE$update_path"
-  update_body="{\"certid\":\""$_certId"\",\"forceHttps\":true}"
-
-  update_access_token="$(_make_sslcreate_access_token "$update_path\\n")"
+  update_body="{\"certid\":\"$_certId\",\"forceHttps\":true}"
+  update_access_token="$(_make_sslcreate_access_token "$update_path")"
   _debug update_access_token "$update_access_token"
   export _H1="Authorization: QBox $update_access_token"
-  update_response=$(_post "$update_body" "$update_url" 0 "PUT" "application/json" | _dbase64 "multiline")
+  update_response=$(_post "$update_body" "$QINIU_API_BASE$update_body" 0 "PUT" "application/json" | _dbase64 "multiline")
 
   err_response="error"
   if test "${update_response#*$err_response}" != "$update_response"; then
-    _err "Error in updating domain:"
+    _err "Error in updating domain httpsconf:"
     _err "$update_response"
     return 1
   fi
@@ -90,7 +88,7 @@ qiniu_deploy() {
 }
 
 _make_sslcreate_access_token() {
-  _data="$1"
-  _token="$(printf "$_data" | openssl sha1 -hmac $Le_Deploy_Qiniu_SK -binary | openssl base64 -e)"
+  _data="$1\\n"
+  _token="$(printf "%s" "$_data" | openssl sha1 -hmac "$Le_Deploy_Qiniu_SK" -binary | openssl base64 -e)"
   echo "$Le_Deploy_Qiniu_AK:$_token"
 }

From 4ec39ab707069e8fe87eccffc289dc0432afcc53 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 12 Jan 2019 19:58:57 +0800
Subject: [PATCH 05/20] replace with functions defined in acme.sh

---
 deploy/qiniu.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 4f578b2..c2306c5 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -72,7 +72,7 @@ qiniu_deploy() {
   update_access_token="$(_make_sslcreate_access_token "$update_path")"
   _debug update_access_token "$update_access_token"
   export _H1="Authorization: QBox $update_access_token"
-  update_response=$(_post "$update_body" "$QINIU_API_BASE$update_body" 0 "PUT" "application/json" | _dbase64 "multiline")
+  update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
 
   err_response="error"
   if test "${update_response#*$err_response}" != "$update_response"; then
@@ -88,7 +88,6 @@ qiniu_deploy() {
 }
 
 _make_sslcreate_access_token() {
-  _data="$1\\n"
-  _token="$(printf "%s" "$_data" | openssl sha1 -hmac "$Le_Deploy_Qiniu_SK" -binary | openssl base64 -e)"
+  _token="$(printf "%s\\n" "$1" | _hmac "sha1" "$(printf "%s" "$Le_Deploy_Qiniu_SK" | _hex_dump | tr -d " ")" | _base64)"
   echo "$Le_Deploy_Qiniu_AK:$_token"
 }

From 82b11da4caf356f418e12ca5c5fd047bbe21d37e Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 12 Jan 2019 21:07:22 +0800
Subject: [PATCH 06/20] replace `awk` with `sed` and `tr`

---
 deploy/qiniu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index c2306c5..559e59c 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -42,8 +42,8 @@ qiniu_deploy() {
   fi
 
   ## upload certificate
-  string_fullchain=$(awk '{printf "%s\\n", $0}' "$_cfullchain")
-  string_key=$(awk '{printf "%s\\n", $0}' "$_ckey")
+  string_fullchain=$(sed 's/$/\\n/' "$_cfullchain" | tr -d '\n')
+  string_key=$(sed 's/$/\\n/' "$_ckey" | tr -d '\n')
 
   sslcert_path="/sslcert"
   sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
@@ -63,12 +63,12 @@ qiniu_deploy() {
   _info "Certificate successfully uploaded, updating domain $_cdomain"
 
   ## extract certId
-  _certId=$(printf "%s" "$sslcert_response" | sed -e "s/^.*certID\":\"//" -e "s/\"\}$//")
+  _certId="$(printf "%s" "$sslcert_response" | _normalizeJson | _egrep_o "certID\":\s*\"[^\"]*\"" | cut -d : -f 2)"
   _debug certId "$_certId"
 
   ## update domain ssl config
   update_path="/domain/$_cdomain/httpsconf"
-  update_body="{\"certid\":\"$_certId\",\"forceHttps\":true}"
+  update_body="{\"certid\":$_certId,\"forceHttps\":true}"
   update_access_token="$(_make_sslcreate_access_token "$update_path")"
   _debug update_access_token "$update_access_token"
   export _H1="Authorization: QBox $update_access_token"

From 0cd6afde6f586a3791952f07a3fe99c5f7e45ed3 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 12 Jan 2019 21:15:16 +0800
Subject: [PATCH 07/20] Add guidance to deploying cert to qiniu.com

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

diff --git a/deploy/README.md b/deploy/README.md
index cec7d77..68c1a27 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -332,3 +332,19 @@ variable to anything (ex: "1") before running `acme.sh`:
 ```sh
 export FABIO="1"
 ```
+
+## 13. Deploy your certificate to Qiniu.com
+
+You should create AccessKey/SecretKey pair in https://portal.qiniu.com/user/key before deploying
+your certificate.
+
+```sh
+$ export QINIU_AK="foo"
+$ export QINIU_SK="bar"
+```
+
+then you can deploy certificate by following command:
+
+```sh
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```

From 96efc8c7f025b6b862c9502abf44434fcd6b0693 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 12 Jan 2019 23:11:19 +0800
Subject: [PATCH 08/20] lint codes

---
 deploy/qiniu.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 559e59c..e0be60f 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -52,8 +52,7 @@ qiniu_deploy() {
   export _H1="Authorization: QBox $sslcert_access_token"
   sslcert_response=$(_post "$sslcerl_body" "$QINIU_API_BASE$sslcert_path" 0 "POST" "application/json" | _dbase64 "multiline")
 
-  success_response="certID"
-  if test "${sslcert_response#*$success_response}" == "$sslcert_response"; then
+  if ! _contains "$sslcert_response" "certID"; then
     _err "Error in creating certificate:"
     _err "$sslcert_response"
     return 1
@@ -63,7 +62,7 @@ qiniu_deploy() {
   _info "Certificate successfully uploaded, updating domain $_cdomain"
 
   ## extract certId
-  _certId="$(printf "%s" "$sslcert_response" | _normalizeJson | _egrep_o "certID\":\s*\"[^\"]*\"" | cut -d : -f 2)"
+  _certId="$(printf "%s" "$sslcert_response" | _normalizeJson | _egrep_o "certID\": *\"[^\"]*\"" | cut -d : -f 2)"
   _debug certId "$_certId"
 
   ## update domain ssl config
@@ -74,8 +73,7 @@ qiniu_deploy() {
   export _H1="Authorization: QBox $update_access_token"
   update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
 
-  err_response="error"
-  if test "${update_response#*$err_response}" != "$update_response"; then
+  if _contains "$update_response" "error"; then
     _err "Error in updating domain httpsconf:"
     _err "$update_response"
     return 1
@@ -88,6 +86,6 @@ qiniu_deploy() {
 }
 
 _make_sslcreate_access_token() {
-  _token="$(printf "%s\\n" "$1" | _hmac "sha1" "$(printf "%s" "$Le_Deploy_Qiniu_SK" | _hex_dump | tr -d " ")" | _base64)"
+  _token="$(printf "%s\n" "$1" | _hmac "sha1" "$(printf "%s" "$Le_Deploy_Qiniu_SK" | _hex_dump | tr -d " ")" | _base64)"
   echo "$Le_Deploy_Qiniu_AK:$_token"
 }

From 3c6b707353007d476e758932dfca1e7125e534b1 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sun, 13 Jan 2019 12:23:15 +0800
Subject: [PATCH 09/20] add `QINIU_CDN_DOMAIN` for wildcard certificate

---
 deploy/README.md | 14 ++++++++++++--
 deploy/qiniu.sh  |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index 68c1a27..fa2d718 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -335,8 +335,9 @@ export FABIO="1"
 
 ## 13. Deploy your certificate to Qiniu.com
 
-You should create AccessKey/SecretKey pair in https://portal.qiniu.com/user/key before deploying
-your certificate.
+You should create AccessKey/SecretKey pair in https://portal.qiniu.com/user/key 
+before deploying your certificate, and please ensure you have enabled HTTPS for
+your domain name. You can enable it in https://portal.qiniu.com/cdn/domain.
 
 ```sh
 $ export QINIU_AK="foo"
@@ -348,3 +349,12 @@ then you can deploy certificate by following command:
 ```sh
 $ acme.sh --deploy -d example.com --deploy-hook qiniu
 ```
+
+(Optional), If you are using wildcard certificate,
+you may need export `QINIU_CDN_DOMAIN` to specify which domain
+you want to update:
+
+```sh
+$ export QINIU_CDN_DOMAIN="cdn.example.com"
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```
diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index e0be60f..dac1866 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -5,6 +5,7 @@
 # This deployment required following variables
 # export QINIU_AK="QINIUACCESSKEY"
 # export QINIU_SK="QINIUSECRETKEY"
+# export QINIU_CDN_DOMAIN="cdn.example.com"
 
 QINIU_API_BASE="https://api.qiniu.com"
 
@@ -14,6 +15,7 @@ qiniu_deploy() {
   _ccert="$3"
   _cca="$4"
   _cfullchain="$5"
+  _cdndomain="${QINIU_CDN_DOMAIN:-$_cdomain}"
 
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
@@ -46,7 +48,7 @@ qiniu_deploy() {
   string_key=$(sed 's/$/\\n/' "$_ckey" | tr -d '\n')
 
   sslcert_path="/sslcert"
-  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdomain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
+  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdndomain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
   sslcert_access_token="$(_make_sslcreate_access_token "$sslcert_path")"
   _debug sslcert_access_token "$sslcert_access_token"
   export _H1="Authorization: QBox $sslcert_access_token"
@@ -66,7 +68,7 @@ qiniu_deploy() {
   _debug certId "$_certId"
 
   ## update domain ssl config
-  update_path="/domain/$_cdomain/httpsconf"
+  update_path="/domain/$_cdndomain/httpsconf"
   update_body="{\"certid\":$_certId,\"forceHttps\":true}"
   update_access_token="$(_make_sslcreate_access_token "$update_path")"
   _debug update_access_token "$update_access_token"

From 4c1fa9c2422143b164448b6e7c327bb293f808a8 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Mon, 14 Jan 2019 22:19:00 +0800
Subject: [PATCH 10/20] save CDN Domain with `_savedomainconf`

---
 deploy/qiniu.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index dac1866..a97dfbb 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -15,7 +15,6 @@ qiniu_deploy() {
   _ccert="$3"
   _cca="$4"
   _cfullchain="$5"
-  _cdndomain="${QINIU_CDN_DOMAIN:-$_cdomain}"
 
   _debug _cdomain "$_cdomain"
   _debug _ckey "$_ckey"
@@ -43,13 +42,20 @@ qiniu_deploy() {
     _savedomainconf Le_Deploy_Qiniu_SK "$Le_Deploy_Qiniu_SK"
   fi
 
+  Le_Deploy_Qiniu_Cdn_Domain="${QINIU_CDN_DOMAIN:-$(_readdomainconf Le_Deploy_Qiniu_Cdn_Domain)}"
+  if [ -z "$Le_Deploy_Qiniu_Cdn_Domain" ]; then
+    Le_Deploy_Qiniu_Cdn_Domain="$_cdomain"
+  fi
+
+  _savedomainconf Le_Deploy_Qiniu_Cdn_Domain "$Le_Deploy_Qiniu_Cdn_Domain"
+
   ## upload certificate
   string_fullchain=$(sed 's/$/\\n/' "$_cfullchain" | tr -d '\n')
   string_key=$(sed 's/$/\\n/' "$_ckey" | tr -d '\n')
 
   sslcert_path="/sslcert"
-  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$_cdndomain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
-  sslcert_access_token="$(_make_sslcreate_access_token "$sslcert_path")"
+  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$Le_Deploy_Qiniu_Cdn_Domain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
+  sslcert_access_token="$(_make_access_token "$sslcert_path")"
   _debug sslcert_access_token "$sslcert_access_token"
   export _H1="Authorization: QBox $sslcert_access_token"
   sslcert_response=$(_post "$sslcerl_body" "$QINIU_API_BASE$sslcert_path" 0 "POST" "application/json" | _dbase64 "multiline")
@@ -68,9 +74,9 @@ qiniu_deploy() {
   _debug certId "$_certId"
 
   ## update domain ssl config
-  update_path="/domain/$_cdndomain/httpsconf"
-  update_body="{\"certid\":$_certId,\"forceHttps\":true}"
-  update_access_token="$(_make_sslcreate_access_token "$update_path")"
+  update_path="/domain/$Le_Deploy_Qiniu_Cdn_Domain/httpsconf"
+  update_body="{\"certid\":$_certId,\"forceHttps\":false}"
+  update_access_token="$(_make_access_token "$update_path")"
   _debug update_access_token "$update_access_token"
   export _H1="Authorization: QBox $update_access_token"
   update_response=$(_post "$update_body" "$QINIU_API_BASE$update_path" 0 "PUT" "application/json" | _dbase64 "multiline")
@@ -87,7 +93,7 @@ qiniu_deploy() {
   return 0
 }
 
-_make_sslcreate_access_token() {
+_make_access_token() {
   _token="$(printf "%s\n" "$1" | _hmac "sha1" "$(printf "%s" "$Le_Deploy_Qiniu_SK" | _hex_dump | tr -d " ")" | _base64)"
   echo "$Le_Deploy_Qiniu_AK:$_token"
 }

From afdb9a63ffa4540dd8d3097492b8940b21b50907 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sat, 19 Jan 2019 23:58:55 +0800
Subject: [PATCH 11/20] chore: replece `Le_Deploy_Qiniu_*` with `QINIU_*`

---
 deploy/qiniu.sh | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index a97dfbb..aadda53 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -23,38 +23,31 @@ qiniu_deploy() {
   _debug _cfullchain "$_cfullchain"
 
   if [ -z "$QINIU_AK" ]; then
-    if [ -z "$Le_Deploy_Qiniu_AK" ]; then
-      _err "QINIU_AK is not defined."
-      return 1
-    fi
+    _err "QINIU_AK is not defined."
+    return 1
   else
-    Le_Deploy_Qiniu_AK="$QINIU_AK"
-    _savedomainconf Le_Deploy_Qiniu_AK "$Le_Deploy_Qiniu_AK"
+    _savedomainconf QINIU_AK "$QINIU_AK"
   fi
 
   if [ -z "$QINIU_SK" ]; then
-    if [ -z "$Le_Deploy_Qiniu_SK" ]; then
-      _err "QINIU_SK is not defined."
-      return 1
-    fi
+    _err "QINIU_SK is not defined."
+    return 1
   else
-    Le_Deploy_Qiniu_SK="$QINIU_SK"
-    _savedomainconf Le_Deploy_Qiniu_SK "$Le_Deploy_Qiniu_SK"
+    _savedomainconf QINIU_SK "$QINIU_SK"
   fi
 
-  Le_Deploy_Qiniu_Cdn_Domain="${QINIU_CDN_DOMAIN:-$(_readdomainconf Le_Deploy_Qiniu_Cdn_Domain)}"
-  if [ -z "$Le_Deploy_Qiniu_Cdn_Domain" ]; then
-    Le_Deploy_Qiniu_Cdn_Domain="$_cdomain"
+  if [ -z "$QINIU_CDN_DOMAIN" ]; then
+    QINIU_CDN_DOMAIN="$_cdomain"
   fi
 
-  _savedomainconf Le_Deploy_Qiniu_Cdn_Domain "$Le_Deploy_Qiniu_Cdn_Domain"
+  _savedomainconf QINIU_CDN_DOMAIN "$QINIU_CDN_DOMAIN"
 
   ## upload certificate
   string_fullchain=$(sed 's/$/\\n/' "$_cfullchain" | tr -d '\n')
   string_key=$(sed 's/$/\\n/' "$_ckey" | tr -d '\n')
 
   sslcert_path="/sslcert"
-  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$Le_Deploy_Qiniu_Cdn_Domain\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
+  sslcerl_body="{\"name\":\"$_cdomain\",\"common_name\":\"$QINIU_CDN_DOMAIN\",\"ca\":\"$string_fullchain\",\"pri\":\"$string_key\"}"
   sslcert_access_token="$(_make_access_token "$sslcert_path")"
   _debug sslcert_access_token "$sslcert_access_token"
   export _H1="Authorization: QBox $sslcert_access_token"
@@ -74,7 +67,7 @@ qiniu_deploy() {
   _debug certId "$_certId"
 
   ## update domain ssl config
-  update_path="/domain/$Le_Deploy_Qiniu_Cdn_Domain/httpsconf"
+  update_path="/domain/$QINIU_CDN_DOMAIN/httpsconf"
   update_body="{\"certid\":$_certId,\"forceHttps\":false}"
   update_access_token="$(_make_access_token "$update_path")"
   _debug update_access_token "$update_access_token"
@@ -94,6 +87,6 @@ qiniu_deploy() {
 }
 
 _make_access_token() {
-  _token="$(printf "%s\n" "$1" | _hmac "sha1" "$(printf "%s" "$Le_Deploy_Qiniu_SK" | _hex_dump | tr -d " ")" | _base64)"
-  echo "$Le_Deploy_Qiniu_AK:$_token"
+  _token="$(printf "%s\n" "$1" | _hmac "sha1" "$(printf "%s" "$QINIU_SK" | _hex_dump | tr -d " ")" | _base64)"
+  echo "$QINIU_AK:$_token"
 }

From dd6fa4af0075248585202eab93ac89f51b652c0e Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Sun, 20 Jan 2019 23:58:10 +0800
Subject: [PATCH 12/20] Save `QINIU_CDN_DOMAIN` only when defined

---
 deploy/qiniu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index aadda53..8410caa 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -36,12 +36,12 @@ qiniu_deploy() {
     _savedomainconf QINIU_SK "$QINIU_SK"
   fi
 
-  if [ -z "$QINIU_CDN_DOMAIN" ]; then
-    QINIU_CDN_DOMAIN="$_cdomain"
+  if [ "$QINIU_CDN_DOMAIN" ]; then
+      _savedomainconf QINIU_CDN_DOMAIN "$QINIU_CDN_DOMAIN"
+  else
+      QINIU_CDN_DOMAIN="$_cdomain"
   fi
 
-  _savedomainconf QINIU_CDN_DOMAIN "$QINIU_CDN_DOMAIN"
-
   ## upload certificate
   string_fullchain=$(sed 's/$/\\n/' "$_cfullchain" | tr -d '\n')
   string_key=$(sed 's/$/\\n/' "$_ckey" | tr -d '\n')

From e8eec2cb41b34bf52fff36647a4861bec23fa653 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Mon, 21 Jan 2019 00:08:23 +0800
Subject: [PATCH 13/20] add chinese readme

---
 deploy/README.md    |  2 ++
 deploy/README_zh.md | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 deploy/README_zh.md

diff --git a/deploy/README.md b/deploy/README.md
index fa2d718..a9e28e9 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -335,6 +335,8 @@ export FABIO="1"
 
 ## 13. Deploy your certificate to Qiniu.com
 
+[中文文档](https://github.com/Neilpang/acme.sh/blob/master/deploy/README_zh.md#13-%E9%83%A8%E7%BD%B2%E5%88%B0%E4%B8%83%E7%89%9B%E5%9F%9F%E5%90%8D%E8%AF%81%E4%B9%A6%E6%9C%8D%E5%8A%A1)
+
 You should create AccessKey/SecretKey pair in https://portal.qiniu.com/user/key 
 before deploying your certificate, and please ensure you have enabled HTTPS for
 your domain name. You can enable it in https://portal.qiniu.com/cdn/domain.
diff --git a/deploy/README_zh.md b/deploy/README_zh.md
new file mode 100644
index 0000000..4132dce
--- /dev/null
+++ b/deploy/README_zh.md
@@ -0,0 +1,24 @@
+# Deploy 使用文档
+
+## 13. 部署到七牛域名证书服务
+
+使用 acme.sh 部署到七牛之前，需要确保部署的域名已打开 HTTPS 功能，您可以访问[融合 CDN - 域名管理](https://portal.qiniu.com/cdn/domain) 设置。
+另外还需要先导出 AK/SK 环境变量，您可以访问[密钥管理](https://portal.qiniu.com/user/key) 获得。
+
+```sh
+$ export QINIU_AK="foo"
+$ export QINIU_SK="bar"
+```
+
+完成准备工作之后，您就可以通过下面的命令开始部署 SSL 证书到七牛上：
+
+```sh
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```
+
+假如您部署的证书为泛域名证书，您还需要设置 `QINIU_CDN_DOMAIN` 变量，指定实际需要部署的域名：
+
+```sh
+$ export QINIU_CDN_DOMAIN="cdn.example.com"
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```

From c445e70cffe326219b8d597867ba28ae85523ba1 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Mon, 21 Jan 2019 14:33:15 +0800
Subject: [PATCH 14/20] fix indent

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

diff --git a/deploy/qiniu.sh b/deploy/qiniu.sh
index 8410caa..158b8db 100644
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -37,9 +37,9 @@ qiniu_deploy() {
   fi
 
   if [ "$QINIU_CDN_DOMAIN" ]; then
-      _savedomainconf QINIU_CDN_DOMAIN "$QINIU_CDN_DOMAIN"
+    _savedomainconf QINIU_CDN_DOMAIN "$QINIU_CDN_DOMAIN"
   else
-      QINIU_CDN_DOMAIN="$_cdomain"
+    QINIU_CDN_DOMAIN="$_cdomain"
   fi
 
   ## upload certificate

From a4a53e1355503efa8a550f954f59cc3a2b763935 Mon Sep 17 00:00:00 2001
From: shonenada <shonenada@gmail.com>
Date: Mon, 21 Jan 2019 17:31:21 +0800
Subject: [PATCH 15/20] Move docs into README.md from README_zh.md

---
 deploy/README.md    | 23 ++++++++++++++++++++++-
 deploy/README_zh.md | 24 ------------------------
 2 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 deploy/README_zh.md

diff --git a/deploy/README.md b/deploy/README.md
index a9e28e9..091e9fe 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -335,7 +335,28 @@ export FABIO="1"
 
 ## 13. Deploy your certificate to Qiniu.com
 
-[中文文档](https://github.com/Neilpang/acme.sh/blob/master/deploy/README_zh.md#13-%E9%83%A8%E7%BD%B2%E5%88%B0%E4%B8%83%E7%89%9B%E5%9F%9F%E5%90%8D%E8%AF%81%E4%B9%A6%E6%9C%8D%E5%8A%A1)
+使用 acme.sh 部署到七牛之前，需要确保部署的域名已打开 HTTPS 功能，您可以访问[融合 CDN - 域名管理](https://portal.qiniu.com/cdn/domain) 设置。
+另外还需要先导出 AK/SK 环境变量，您可以访问[密钥管理](https://portal.qiniu.com/user/key) 获得。
+
+```sh
+$ export QINIU_AK="foo"
+$ export QINIU_SK="bar"
+```
+
+完成准备工作之后，您就可以通过下面的命令开始部署 SSL 证书到七牛上：
+
+```sh
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```
+
+假如您部署的证书为泛域名证书，您还需要设置 `QINIU_CDN_DOMAIN` 变量，指定实际需要部署的域名：
+
+```sh
+$ export QINIU_CDN_DOMAIN="cdn.example.com"
+$ acme.sh --deploy -d example.com --deploy-hook qiniu
+```
+
+### English version
 
 You should create AccessKey/SecretKey pair in https://portal.qiniu.com/user/key 
 before deploying your certificate, and please ensure you have enabled HTTPS for
diff --git a/deploy/README_zh.md b/deploy/README_zh.md
deleted file mode 100644
index 4132dce..0000000
--- a/deploy/README_zh.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Deploy 使用文档
-
-## 13. 部署到七牛域名证书服务
-
-使用 acme.sh 部署到七牛之前，需要确保部署的域名已打开 HTTPS 功能，您可以访问[融合 CDN - 域名管理](https://portal.qiniu.com/cdn/domain) 设置。
-另外还需要先导出 AK/SK 环境变量，您可以访问[密钥管理](https://portal.qiniu.com/user/key) 获得。
-
-```sh
-$ export QINIU_AK="foo"
-$ export QINIU_SK="bar"
-```
-
-完成准备工作之后，您就可以通过下面的命令开始部署 SSL 证书到七牛上：
-
-```sh
-$ acme.sh --deploy -d example.com --deploy-hook qiniu
-```
-
-假如您部署的证书为泛域名证书，您还需要设置 `QINIU_CDN_DOMAIN` 变量，指定实际需要部署的域名：
-
-```sh
-$ export QINIU_CDN_DOMAIN="cdn.example.com"
-$ acme.sh --deploy -d example.com --deploy-hook qiniu
-```

From 56d70e4ea74d2c1274326ec0ac9c93657d9b4e94 Mon Sep 17 00:00:00 2001
From: Oliver Dick <o.dick@hosting.de>
Date: Mon, 21 Jan 2019 15:02:09 +0100
Subject: [PATCH 16/20] Update to latest API Changes

---
 dnsapi/dns_hostingde.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/dnsapi/dns_hostingde.sh b/dnsapi/dns_hostingde.sh
index 74a472d..7c18511 100644
--- a/dnsapi/dns_hostingde.sh
+++ b/dnsapi/dns_hostingde.sh
@@ -59,9 +59,22 @@ _hostingde_getZoneConfig() {
     if _contains "${curResult}" '"totalEntries": 1'; then
       _info "Retrieved zone data."
       _debug "Zone data: '${curResult}'"
-
-      # read ZoneConfigId for later update
       zoneConfigId=$(echo "${curResult}" | _egrep_o '"id":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      zoneConfigName=$(echo "${curResult}" | _egrep_o '"name":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      zoneConfigType=$(echo "${curResult}" | grep -v "FindZoneConfigsResult" | _egrep_o '"type":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      zoneConfigExpire=$(echo "${curResult}" | _egrep_o '"expire":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
+      zoneConfigNegativeTtl=$(echo "${curResult}" | _egrep_o '"negativeTtl":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
+      zoneConfigRefresh=$(echo "${curResult}" | _egrep_o '"refresh":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
+      zoneConfigRetry=$(echo "${curResult}" | _egrep_o '"retry":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
+      zoneConfigTtl=$(echo "${curResult}" | _egrep_o '"ttl":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
+      zoneConfigDnsServerGroupId=$(echo "${curResult}" | _egrep_o '"dnsServerGroupId":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      zoneConfigEmailAddress=$(echo "${curResult}" | _egrep_o '"emailAddress":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      zoneConfigDnsSecMode=$(echo "${curResult}" | _egrep_o '"dnsSecMode":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
+      if [ $zoneConfigType != "NATIVE" ]; then
+        _err "Zone is not native"
+        returnCode=1
+        break
+      fi
       _debug "zoneConfigId '${zoneConfigId}'"
       returnCode=0
       break
@@ -94,7 +107,7 @@ _hostingde_addRecord() {
     _hostingde_getZoneStatus
     _debug "Result of zoneStatus: '${zoneStatus}'"
   done
-  curData="{\"authToken\":\"${HOSTINGDE_APIKEY}\",\"zoneConfig\":{\"id\":\"${zoneConfigId}\"},\"recordsToAdd\":[{\"name\":\"${fulldomain}\",\"type\":\"TXT\",\"content\":\"\\\"${txtvalue}\\\"\",\"ttl\":3600}]}"
+  curData="{\"authToken\":\"${HOSTINGDE_APIKEY}\",\"zoneConfig\":{\"id\":\"${zoneConfigId}\",\"name\":\"${zoneConfigName}\",\"type\":\"${zoneConfigType}\",\"dnsServerGroupId\":\"${zoneConfigDnsServerGroupId}\",\"dnsSecMode\":\"${zoneConfigDnsSecMode}\",\"emailAddress\":\"${zoneConfigEmailAddress}\",\"soaValues\":{\"expire\":${zoneConfigExpire},\"negativeTtl\":${zoneConfigNegativeTtl},\"refresh\":${zoneConfigRefresh},\"retry\":${zoneConfigRetry},\"ttl\":${zoneConfigTtl}}},\"recordsToAdd\":[{\"name\":\"${fulldomain}\",\"type\":\"TXT\",\"content\":\"\\\"${txtvalue}\\\"\",\"ttl\":3600}]}"
   curResult="$(_post "${curData}" "${HOSTINGDE_ENDPOINT}/api/dns/v1/json/zoneUpdate")"
   _debug "Calling zoneUpdate: '${curData}' '${HOSTINGDE_ENDPOINT}/api/dns/v1/json/zoneUpdate'"
   _debug "Result of zoneUpdate: '$curResult'"
@@ -118,7 +131,7 @@ _hostingde_removeRecord() {
     _hostingde_getZoneStatus
     _debug "Result of zoneStatus: '$zoneStatus'"
   done
-  curData="{\"authToken\":\"${HOSTINGDE_APIKEY}\",\"zoneConfig\":{\"id\":\"${zoneConfigId}\"},\"recordsToDelete\":[{\"name\":\"${fulldomain}\",\"type\":\"TXT\",\"content\":\"\\\"${txtvalue}\\\"\"}]}"
+  curData="{\"authToken\":\"${HOSTINGDE_APIKEY}\",\"zoneConfig\":{\"id\":\"${zoneConfigId}\",\"name\":\"${zoneConfigName}\",\"type\":\"${zoneConfigType}\",\"dnsServerGroupId\":\"${zoneConfigDnsServerGroupId}\",\"dnsSecMode\":\"${zoneConfigDnsSecMode}\",\"emailAddress\":\"${zoneConfigEmailAddress}\",\"soaValues\":{\"expire\":${zoneConfigExpire},\"negativeTtl\":${zoneConfigNegativeTtl},\"refresh\":${zoneConfigRefresh},\"retry\":${zoneConfigRetry},\"ttl\":${zoneConfigTtl}}},\"recordsToDelete\":[{\"name\":\"${fulldomain}\",\"type\":\"TXT\",\"content\":\"\\\"${txtvalue}\\\"\"}]}"
   curResult="$(_post "${curData}" "${HOSTINGDE_ENDPOINT}/api/dns/v1/json/zoneUpdate")"
   _debug "Calling zoneUpdate: '${curData}' '${HOSTINGDE_ENDPOINT}/api/dns/v1/json/zoneUpdate'"
   _debug "Result of zoneUpdate: '$curResult'"

From 2dc50e66330c291fafee95d1b8d7183e413df647 Mon Sep 17 00:00:00 2001
From: Oliver Dick <o.dick@hosting.de>
Date: Mon, 21 Jan 2019 15:45:32 +0100
Subject: [PATCH 17/20] making shfmt happy

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

diff --git a/dnsapi/dns_hostingde.sh b/dnsapi/dns_hostingde.sh
index 7c18511..7f29d62 100644
--- a/dnsapi/dns_hostingde.sh
+++ b/dnsapi/dns_hostingde.sh
@@ -64,9 +64,9 @@ _hostingde_getZoneConfig() {
       zoneConfigType=$(echo "${curResult}" | grep -v "FindZoneConfigsResult" | _egrep_o '"type":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
       zoneConfigExpire=$(echo "${curResult}" | _egrep_o '"expire":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
       zoneConfigNegativeTtl=$(echo "${curResult}" | _egrep_o '"negativeTtl":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
-      zoneConfigRefresh=$(echo "${curResult}" | _egrep_o '"refresh":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
-      zoneConfigRetry=$(echo "${curResult}" | _egrep_o '"retry":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
-      zoneConfigTtl=$(echo "${curResult}" | _egrep_o '"ttl":.*' | cut -d ':' -f 2 | cut -d '"' -f 2| cut -d ',' -f 1)
+      zoneConfigRefresh=$(echo "${curResult}" | _egrep_o '"refresh":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
+      zoneConfigRetry=$(echo "${curResult}" | _egrep_o '"retry":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
+      zoneConfigTtl=$(echo "${curResult}" | _egrep_o '"ttl":.*' | cut -d ':' -f 2 | cut -d '"' -f 2 | cut -d ',' -f 1)
       zoneConfigDnsServerGroupId=$(echo "${curResult}" | _egrep_o '"dnsServerGroupId":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
       zoneConfigEmailAddress=$(echo "${curResult}" | _egrep_o '"emailAddress":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
       zoneConfigDnsSecMode=$(echo "${curResult}" | _egrep_o '"dnsSecMode":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)

From b0775f7a580ac534ad2443cd9308fab5b339749f Mon Sep 17 00:00:00 2001
From: Oliver Dick <o.dick@hosting.de>
Date: Mon, 21 Jan 2019 16:32:45 +0100
Subject: [PATCH 18/20] making shftm really happy

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

diff --git a/dnsapi/dns_hostingde.sh b/dnsapi/dns_hostingde.sh
index 7f29d62..b61acb7 100644
--- a/dnsapi/dns_hostingde.sh
+++ b/dnsapi/dns_hostingde.sh
@@ -70,7 +70,7 @@ _hostingde_getZoneConfig() {
       zoneConfigDnsServerGroupId=$(echo "${curResult}" | _egrep_o '"dnsServerGroupId":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
       zoneConfigEmailAddress=$(echo "${curResult}" | _egrep_o '"emailAddress":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
       zoneConfigDnsSecMode=$(echo "${curResult}" | _egrep_o '"dnsSecMode":.*' | cut -d ':' -f 2 | cut -d '"' -f 2)
-      if [ $zoneConfigType != "NATIVE" ]; then
+      if [ "${zoneConfigType}" != "NATIVE" ]; then
         _err "Zone is not native"
         returnCode=1
         break

From 572adbaad2c8531870753c18c2b313c70faa9a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A1la?= <milan.pala@email.cz>
Date: Mon, 31 Dec 2018 20:05:08 +0100
Subject: [PATCH 19/20] Add support for Active24.cz

---
 README.md              |   1 +
 dnsapi/README.md       |  18 ++++++
 dnsapi/dns_active24.sh | 141 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+)
 create mode 100755 dnsapi/dns_active24.sh

diff --git a/README.md b/README.md
index 41ffb69..70abcc6 100644
--- a/README.md
+++ b/README.md
@@ -349,6 +349,7 @@ You don't have to do anything manually!
 1. Neodigit.net API (https://www.neodigit.net)
 1. Exoscale.com API (https://www.exoscale.com/)
 1. PointDNS API (https://pointhq.com/)
+1. Active24.cz API (https://www.active24.cz/)
 
 And:
 
diff --git a/dnsapi/README.md b/dnsapi/README.md
index fc65748..0a9c492 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -1139,6 +1139,24 @@ You can then issue certs by using:
 ```acme.sh --issue --dns dns_pointhq -d example.com -d www.example.com
 ```
 
+## 59. Use Active24 API
+
+Create an API token in the Active24 account section, documentation on https://faq.active24.com/cz/790131-REST-API-rozhran%C3%AD.
+
+Set your API token:
+
+```
+export ACTIVE24_Token='xxx'
+```
+
+Now, let's issue a cert, set `dnssleep` for propagation new DNS record:
+```
+acme.sh --issue --dns dns_active24 -d example.com -d www.example.com --dnssleep 1000
+```
+
+The `ACTIVE24_Token` 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.
diff --git a/dnsapi/dns_active24.sh b/dnsapi/dns_active24.sh
new file mode 100755
index 0000000..90ffaf6
--- /dev/null
+++ b/dnsapi/dns_active24.sh
@@ -0,0 +1,141 @@
+#!/usr/bin/env sh
+
+#ACTIVE24_Token="sdfsdfsdfljlbjkljlkjsdfoiwje"
+
+ACTIVE24_Api="https://api.active24.com"
+
+########  Public functions #####################
+
+# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+# Used to add txt record
+dns_active24_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  _active24_init
+
+  _info "Adding txt record"
+  if _active24_rest POST "dns/$_domain/txt/v1" "{\"name\":\"$_sub_domain\",\"text\":\"$txtvalue\",\"ttl\":0}"; then
+    if _contains "$response" "errors"; then
+      _err "Add txt record error."
+      return 1
+    else
+      _info "Added, OK"
+      return 0
+    fi
+  fi
+  _err "Add txt record error."
+  return 1
+}
+
+# Usage: fulldomain txtvalue
+# Used to remove the txt record after validation
+dns_active24_rm() {
+  fulldomain=$1
+  txtvalue=$2
+
+  _active24_init
+
+  _debug "Getting txt records"
+  _active24_rest GET "dns/$_domain/records/v1"
+
+  if _contains "$response" "errors"; then
+    _err "Error"
+    return 1
+  fi
+
+  hash_ids=$(echo "$response" | _egrep_o "[^{]+${txtvalue}[^}]+" | _egrep_o "hashId\":\"[^\"]+" | cut -c10-)
+
+  for hash_id in $hash_ids; do
+    _debug "Removing hash_id" "$hash_id"
+    if _active24_rest DELETE "dns/$_domain/$hash_id/v1" ""; then
+      if _contains "$response" "errors"; then
+        _err "Unable to remove txt record."
+        return 1
+      else
+        _info "Removed txt record."
+        return 0
+      fi
+    fi
+  done
+
+  _err "No txt records found."
+  return 1
+}
+
+####################  Private functions below ##################################
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+# _domain_id=sdjkglgdfewsdfg
+_get_root() {
+  domain=$1
+
+  if ! _active24_rest GET "dns/domains/v1"; then
+    return 1
+  fi
+
+  i=2
+  p=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
+
+    if _contains "$response" "\"$h\"" >/dev/null; then
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+      _domain=$h
+      return 0
+    fi
+    p=$i
+    i=$(_math "$i" + 1)
+  done
+  return 1
+}
+
+_active24_rest() {
+  m=$1
+  ep="$2"
+  data="$3"
+  _debug "$ep"
+
+  export _H1="Authorization: Bearer $ACTIVE24_Token"
+
+  if [ "$m" != "GET" ]; then
+    _debug "data" "$data"
+    response="$(_post "$data" "$ACTIVE24_Api/$ep" "" "$m" "application/json")"
+  else
+    response="$(_get "$ACTIVE24_Api/$ep")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $ep"
+    return 1
+  fi
+  _debug2 response "$response"
+  return 0
+}
+
+_active24_init() {
+  ACTIVE24_Token="${ACTIVE24_Token:-$(_readaccountconf_mutable ACTIVE24_Token)}"
+  if [ -z "$ACTIVE24_Token" ]; then
+    ACTIVE24_Token=""
+    _err "You didn't specify a Active24 api token yet."
+    _err "Please create the token and try again."
+    return 1
+  fi
+
+  _saveaccountconf_mutable ACTIVE24_Token "ACTIVE24_Token"
+
+  _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"
+}

From c1ec2afeca11ad8afdb8feec5e6e3bba1bf113da Mon Sep 17 00:00:00 2001
From: Grant Millar <grant@cylo.io>
Date: Fri, 25 Jan 2019 09:27:30 +0000
Subject: [PATCH 20/20] Changed records per page to 5000

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

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index b2cba58..d831eb2 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -152,7 +152,7 @@ _get_records() {
   sub_domain=$3
 
   _debug "fetching txt records"
-  _dnsimple_rest GET "$account_id/zones/$domain/records?per_page=100&sort=id:desc"
+  _dnsimple_rest GET "$account_id/zones/$domain/records?per_page=5000&sort=id:desc"
 
   if ! _contains "$response" "\"id\":"; then
     _err "failed to retrieve records"