From 228c835466b41448897c23c41350dc07a29fe9e1 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Wed, 20 Mar 2019 03:03:10 +0300
Subject: [PATCH 01/11] gcore_cdn_deploy

---
 deploy/README.md    |  15 +++++
 deploy/gcore_cdn.sh | 130 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 deploy/gcore_cdn.sh

diff --git a/deploy/README.md b/deploy/README.md
index 44d53225..e89add80 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -391,3 +391,18 @@ acme.sh --deploy --deploy-hook mydevil -d example.com
 ```
 
 That will remove old certificate and install new one.
+
+## 15. Deploy the cert to G-Core CDN servise
+
+Deploy the cert to G-Core CDN servise (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+Uses command line curl for send requests and jq for parse responses.
+
+Then you can deploy now:
+
+```sh
+export DEPLOY_GCORE_CDN_USERNAME=myusername
+export DEPLOY_GCORE_CDN_PASSWORD=mypassword
+acme.sh --deploy -d example.com --deploy-hook gcore_cdn
+```
+
+Please note, need installed jq.
diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
new file mode 100644
index 00000000..051226d9
--- /dev/null
+++ b/deploy/gcore_cdn.sh
@@ -0,0 +1,130 @@
+#!/usr/bin/env sh
+
+# Here is the script to deploy the cert to G-Core CDN servise (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+# Uses command line curl for send requests and jq for parse responses.
+# Returns 0 when success.
+#
+# Written by temoffey <temofffey@gmail.com>
+# Public domain, 2019
+
+#export DEPLOY_GCORE_CDN_USERNAME=myusername
+#export DEPLOY_GCORE_CDN_PASSWORD=mypassword
+
+########  Public functions #####################
+
+#domain keyfile certfile cafile fullchain
+
+gcore_cdn_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"
+
+  _fullchain=$(awk 1 ORS='\\n' "$_cfullchain")
+  _key=$(awk 1 ORS='\\n' "$_ckey")
+
+  _debug _fullchain "$_fullchain"
+  _debug _key "$_key"
+
+  if [ -z "$DEPLOY_GCORE_CDN_USERNAME" ]; then
+    if [ -z "$Le_Deploy_gcore_cdn_username" ]; then
+      _err "Please define the target username: export DEPLOY_GCORE_CDN_USERNAME=username"
+      return 1
+    else
+      DEPLOY_GCORE_CDN_USERNAME="$Le_Deploy_gcore_cdn_username"
+    fi
+  else
+  	_savedomainconf Le_Deploy_gcore_cdn_username "$DEPLOY_GCORE_CDN_USERNAME"
+  fi
+
+  if [ -z "$DEPLOY_GCORE_CDN_PASSWORD" ]; then
+    if [ -z "$Le_Deploy_gcore_cdn_password" ]; then
+      _err "Please define the target password: export DEPLOY_GCORE_CDN_PASSWORD=password"
+      return 1
+    else
+      DEPLOY_GCORE_CDN_PASSWORD="$Le_Deploy_gcore_cdn_password"
+    fi
+  else
+  	_savedomainconf Le_Deploy_gcore_cdn_password "$DEPLOY_GCORE_CDN_PASSWORD"
+  fi
+
+  if ! [ -x "$(command -v jq)" ]; then
+    _err "Please install the package jq: sudo apt-get install jq"
+    return 1
+  fi
+
+  _info "Get authorization token"
+  _request="{ \"username\": \"$DEPLOY_GCORE_CDN_USERNAME\", \"password\": \"$DEPLOY_GCORE_CDN_PASSWORD\" }"
+  _debug _request "$_request"
+  _response=$(curl -s -X POST https://api.gcdn.co/auth/signin -H "Content-Type:application/json" -d "$_request")
+  _debug _response "$_response"
+  _token=$(echo "$_response" | jq -r '.token')
+  _debug _token "$_token"
+  
+  if [ "$_token" == "null" ]; then
+    _err "Error G-Core Labs API authorization"
+    return 1
+  fi
+
+  _info "Find CDN resource with cname $_cdomain"
+  _response=$(curl -s -X GET https://api.gcdn.co/resources -H "Authorization:Token $_token")
+  _debug _response "$_response"
+  _resource=$(echo "$_response" | jq -r ".[] | select(.cname == \"$_cdomain\")")
+  _debug _resource "$_resource"
+  _resourceId=$(echo "$_resource" | jq -r '.id')
+  _sslDataOld=$(echo "$_resource" | jq -r '.sslData')
+  _originGroup=$(echo "$_resource" | jq -r '.originGroup')
+  _debug _resourceId "$_resourceId"
+  _debug _sslDataOld "$_sslDataOld"
+  _debug _originGroup "$_originGroup"
+
+  if [ -z "$_resourceId" ] || [ "$_resourceId" == "null" ] || [ -z "$_originGroup" ] || [ "$_originGroup" == "null" ]; then
+    _err "Not found CDN resource with cname $_cdomain"
+    return 1
+  fi
+
+  _info "Add new SSL certificate"
+  _date=$(date "+%d.%m.%Y %H:%M:%S")
+  _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\n\", \"sslPrivateKey\": \"$_key\n\" }"
+  _debug _request "$_request"
+  _response=$(curl -s -X POST https://api.gcdn.co/sslData -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
+  _debug _response "$_response"
+  _sslDataAdd=$(echo "$_response" | jq -r '.id')
+  _debug _sslDataAdd "$_sslDataAdd"
+
+  if [ "$_sslDataAdd" == "null" ]; then
+    _err "Error new SSL certificate add"
+    return 1
+  fi
+
+  _info "Update CDN resource"
+  _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
+  _debug _request "$_request"
+  _response=$(curl -s -X PUT https://api.gcdn.co/resources/$_resourceId -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
+  _debug _response "$_response"
+  _sslDataNew=$(echo "$_response" | jq -r '.sslData')
+  _debug _sslDataNew "$_sslDataNew"
+
+  if [ "$_sslDataNew" != "$_sslDataAdd" ]; then
+    _err "Error CDN resource update"
+    return 1
+  fi
+
+  if [ -z "$_sslDataOld" ] || [ "$_sslDataOld" = "null" ]; then
+  	_info "Not found old SSL certificate"
+  else
+    _info "Delete old SSL certificate"
+    _response=$(curl -s -X DELETE https://api.gcdn.co/sslData/$_sslDataOld -H "Authorization:Token $_token")
+    _debug _response "$_response"
+  fi
+
+  _info "Certificate successfully deployed"
+  return 0
+}
\ No newline at end of file

From 95cdb4b2bc606e1641850359e9bf55abce2d46f4 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Wed, 20 Mar 2019 14:02:11 +0300
Subject: [PATCH 02/11] fix syntax

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

diff --git a/deploy/README.md b/deploy/README.md
index e89add80..76a6cc94 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -392,9 +392,9 @@ acme.sh --deploy --deploy-hook mydevil -d example.com
 
 That will remove old certificate and install new one.
 
-## 15. Deploy the cert to G-Core CDN servise
+## 15. Deploy the cert to G-Core CDN service
 
-Deploy the cert to G-Core CDN servise (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+Deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
 Uses command line curl for send requests and jq for parse responses.
 
 Then you can deploy now:
diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 051226d9..621d445b 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Here is the script to deploy the cert to G-Core CDN servise (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+# Here is the script to deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
 # Uses command line curl for send requests and jq for parse responses.
 # Returns 0 when success.
 #
@@ -37,22 +37,20 @@ gcore_cdn_deploy() {
     if [ -z "$Le_Deploy_gcore_cdn_username" ]; then
       _err "Please define the target username: export DEPLOY_GCORE_CDN_USERNAME=username"
       return 1
-    else
-      DEPLOY_GCORE_CDN_USERNAME="$Le_Deploy_gcore_cdn_username"
     fi
   else
-  	_savedomainconf Le_Deploy_gcore_cdn_username "$DEPLOY_GCORE_CDN_USERNAME"
+    Le_Deploy_gcore_cdn_username="$DEPLOY_GCORE_CDN_USERNAME"
+    _savedomainconf Le_Deploy_gcore_cdn_username "$Le_Deploy_gcore_cdn_username"
   fi
 
   if [ -z "$DEPLOY_GCORE_CDN_PASSWORD" ]; then
     if [ -z "$Le_Deploy_gcore_cdn_password" ]; then
       _err "Please define the target password: export DEPLOY_GCORE_CDN_PASSWORD=password"
       return 1
-    else
-      DEPLOY_GCORE_CDN_PASSWORD="$Le_Deploy_gcore_cdn_password"
     fi
   else
-  	_savedomainconf Le_Deploy_gcore_cdn_password "$DEPLOY_GCORE_CDN_PASSWORD"
+    Le_Deploy_gcore_cdn_password="$DEPLOY_GCORE_CDN_PASSWORD"
+    _savedomainconf Le_Deploy_gcore_cdn_password "$Le_Deploy_gcore_cdn_password"
   fi
 
   if ! [ -x "$(command -v jq)" ]; then
@@ -61,14 +59,14 @@ gcore_cdn_deploy() {
   fi
 
   _info "Get authorization token"
-  _request="{ \"username\": \"$DEPLOY_GCORE_CDN_USERNAME\", \"password\": \"$DEPLOY_GCORE_CDN_PASSWORD\" }"
+  _request="{ \"username\": \"$Le_Deploy_gcore_cdn_username\", \"password\": \"$Le_Deploy_gcore_cdn_password\" }"
   _debug _request "$_request"
   _response=$(curl -s -X POST https://api.gcdn.co/auth/signin -H "Content-Type:application/json" -d "$_request")
   _debug _response "$_response"
   _token=$(echo "$_response" | jq -r '.token')
   _debug _token "$_token"
   
-  if [ "$_token" == "null" ]; then
+  if [ "$_token" = "null" ]; then
     _err "Error G-Core Labs API authorization"
     return 1
   fi
@@ -85,7 +83,7 @@ gcore_cdn_deploy() {
   _debug _sslDataOld "$_sslDataOld"
   _debug _originGroup "$_originGroup"
 
-  if [ -z "$_resourceId" ] || [ "$_resourceId" == "null" ] || [ -z "$_originGroup" ] || [ "$_originGroup" == "null" ]; then
+  if [ -z "$_resourceId" ] || [ "$_resourceId" = "null" ] || [ -z "$_originGroup" ] || [ "$_originGroup" = "null" ]; then
     _err "Not found CDN resource with cname $_cdomain"
     return 1
   fi
@@ -107,7 +105,7 @@ gcore_cdn_deploy() {
   _info "Update CDN resource"
   _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
   _debug _request "$_request"
-  _response=$(curl -s -X PUT https://api.gcdn.co/resources/$_resourceId -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
+  _response=$(curl -s -X PUT "https://api.gcdn.co/resources/$_resourceId" -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
   _debug _response "$_response"
   _sslDataNew=$(echo "$_response" | jq -r '.sslData')
   _debug _sslDataNew "$_sslDataNew"
@@ -118,13 +116,13 @@ gcore_cdn_deploy() {
   fi
 
   if [ -z "$_sslDataOld" ] || [ "$_sslDataOld" = "null" ]; then
-  	_info "Not found old SSL certificate"
+    _info "Not found old SSL certificate"
   else
     _info "Delete old SSL certificate"
-    _response=$(curl -s -X DELETE https://api.gcdn.co/sslData/$_sslDataOld -H "Authorization:Token $_token")
+    _response=$(curl -s -X DELETE "https://api.gcdn.co/sslData/$_sslDataOld" -H "Authorization:Token $_token")
     _debug _response "$_response"
   fi
 
   _info "Certificate successfully deployed"
   return 0
-}
\ No newline at end of file
+}

From 89989adcadd31cbd162beff2ca7ab746c3928324 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Wed, 20 Mar 2019 14:05:18 +0300
Subject: [PATCH 03/11] fix syntax

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

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 621d445b..18d137a6 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -65,7 +65,7 @@ gcore_cdn_deploy() {
   _debug _response "$_response"
   _token=$(echo "$_response" | jq -r '.token')
   _debug _token "$_token"
-  
+
   if [ "$_token" = "null" ]; then
     _err "Error G-Core Labs API authorization"
     return 1
@@ -97,7 +97,7 @@ gcore_cdn_deploy() {
   _sslDataAdd=$(echo "$_response" | jq -r '.id')
   _debug _sslDataAdd "$_sslDataAdd"
 
-  if [ "$_sslDataAdd" == "null" ]; then
+  if [ "$_sslDataAdd" = "null" ]; then
     _err "Error new SSL certificate add"
     return 1
   fi

From 16b0704acc635a5e43033d199c3f7ba0208cfbaa Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Wed, 20 Mar 2019 18:10:53 +0300
Subject: [PATCH 04/11] remove readme

---
 deploy/README.md | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index 76a6cc94..44d53225 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -391,18 +391,3 @@ acme.sh --deploy --deploy-hook mydevil -d example.com
 ```
 
 That will remove old certificate and install new one.
-
-## 15. Deploy the cert to G-Core CDN service
-
-Deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
-Uses command line curl for send requests and jq for parse responses.
-
-Then you can deploy now:
-
-```sh
-export DEPLOY_GCORE_CDN_USERNAME=myusername
-export DEPLOY_GCORE_CDN_PASSWORD=mypassword
-acme.sh --deploy -d example.com --deploy-hook gcore_cdn
-```
-
-Please note, need installed jq.

From b8489464b3d9600d9f06f363c484256f97140d09 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 03:41:26 +0300
Subject: [PATCH 05/11] remove use awk, jq, curl

---
 deploy/gcore_cdn.sh | 52 +++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 18d137a6..31f8db68 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -27,8 +27,8 @@ gcore_cdn_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _fullchain=$(awk 1 ORS='\\n' "$_cfullchain")
-  _key=$(awk 1 ORS='\\n' "$_ckey")
+  _fullchain=$(while read line; do printf "%s" "$line\n"; done < "$_cfullchain")
+  _key=$(while read line; do printf "%s" "$line\n"; done < "$_ckey")
 
   _debug _fullchain "$_fullchain"
   _debug _key "$_key"
@@ -61,43 +61,57 @@ gcore_cdn_deploy() {
   _info "Get authorization token"
   _request="{ \"username\": \"$Le_Deploy_gcore_cdn_username\", \"password\": \"$Le_Deploy_gcore_cdn_password\" }"
   _debug _request "$_request"
-  _response=$(curl -s -X POST https://api.gcdn.co/auth/signin -H "Content-Type:application/json" -d "$_request")
+  _H1="Content-Type:application/json"
+  _response=$(_post "$_request" "https://api.gcdn.co/auth/signin")
   _debug _response "$_response"
-  _token=$(echo "$_response" | jq -r '.token')
+  _regex="\"token\":\"([^\"]+)\""
+  _debug _regex "$_regex"
+  _token=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _token "$_token"
 
-  if [ "$_token" = "null" ]; then
+  if [ -z "$_token" ]; then
     _err "Error G-Core Labs API authorization"
     return 1
   fi
 
   _info "Find CDN resource with cname $_cdomain"
-  _response=$(curl -s -X GET https://api.gcdn.co/resources -H "Authorization:Token $_token")
+  _H2="Authorization:Token $_token"
+  _response=$(_get "https://api.gcdn.co/resources")
   _debug _response "$_response"
-  _resource=$(echo "$_response" | jq -r ".[] | select(.cname == \"$_cdomain\")")
+  _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
+  _debug _regex "$_regex"
+  _resource=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _resource "$_resource"
-  _resourceId=$(echo "$_resource" | jq -r '.id')
-  _sslDataOld=$(echo "$_resource" | jq -r '.sslData')
-  _originGroup=$(echo "$_resource" | jq -r '.originGroup')
+  _regex="\"id\":([0-9]+)"
+  _debug _regex "$_regex"
+  _resourceId=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _resourceId "$_resourceId"
+  _regex="\"sslData\":([0-9]+|null)"
+  _debug _regex "$_regex"
+  _sslDataOld=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataOld "$_sslDataOld"
+  _regex="\"originGroup\":([0-9]+)"
+  _debug _regex "$_regex"
+  _originGroup=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _originGroup "$_originGroup"
 
-  if [ -z "$_resourceId" ] || [ "$_resourceId" = "null" ] || [ -z "$_originGroup" ] || [ "$_originGroup" = "null" ]; then
+  if [ -z "$_resourceId" ] || [ -z "$_originGroup" ]; then
     _err "Not found CDN resource with cname $_cdomain"
     return 1
   fi
 
   _info "Add new SSL certificate"
   _date=$(date "+%d.%m.%Y %H:%M:%S")
-  _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\n\", \"sslPrivateKey\": \"$_key\n\" }"
+  _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\", \"sslPrivateKey\": \"$_key\" }"
   _debug _request "$_request"
-  _response=$(curl -s -X POST https://api.gcdn.co/sslData -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
+  _response=$(_post "$_request" "https://api.gcdn.co/sslData")
   _debug _response "$_response"
-  _sslDataAdd=$(echo "$_response" | jq -r '.id')
+  _regex="\"id\":([0-9]+)"
+  _debug _regex "$_regex"
+  _sslDataAdd=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataAdd "$_sslDataAdd"
 
-  if [ "$_sslDataAdd" = "null" ]; then
+  if [ -z "$_sslDataAdd" ]; then
     _err "Error new SSL certificate add"
     return 1
   fi
@@ -105,9 +119,11 @@ gcore_cdn_deploy() {
   _info "Update CDN resource"
   _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
   _debug _request "$_request"
-  _response=$(curl -s -X PUT "https://api.gcdn.co/resources/$_resourceId" -H "Content-Type:application/json" -H "Authorization:Token $_token" -d "$_request")
+  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
   _debug _response "$_response"
-  _sslDataNew=$(echo "$_response" | jq -r '.sslData')
+  _regex="\"sslData\":([0-9]+)"
+  _debug _regex "$_regex"
+  _sslDataNew=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataNew "$_sslDataNew"
 
   if [ "$_sslDataNew" != "$_sslDataAdd" ]; then
@@ -119,7 +135,7 @@ gcore_cdn_deploy() {
     _info "Not found old SSL certificate"
   else
     _info "Delete old SSL certificate"
-    _response=$(curl -s -X DELETE "https://api.gcdn.co/sslData/$_sslDataOld" -H "Authorization:Token $_token")
+    _response=$(_post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
     _debug _response "$_response"
   fi
 

From d289b0b450a3c4c3a4645ddefb136560f9125deb Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 04:21:41 +0300
Subject: [PATCH 06/11] fix syntax

---
 deploy/gcore_cdn.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 31f8db68..439508c2 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -27,8 +27,8 @@ gcore_cdn_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _fullchain=$(while read line; do printf "%s" "$line\n"; done < "$_cfullchain")
-  _key=$(while read line; do printf "%s" "$line\n"; done < "$_ckey")
+  _fullchain=$(while read -r line; do printf "%s" "$line\n"; done <"$_cfullchain")
+  _key=$(while read -r line; do printf "%s" "$line\n"; done <"$_ckey")
 
   _debug _fullchain "$_fullchain"
   _debug _key "$_key"
@@ -66,7 +66,7 @@ gcore_cdn_deploy() {
   _debug _response "$_response"
   _regex="\"token\":\"([^\"]+)\""
   _debug _regex "$_regex"
-  _token=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _token=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _token "$_token"
 
   if [ -z "$_token" ]; then
@@ -80,19 +80,19 @@ gcore_cdn_deploy() {
   _debug _response "$_response"
   _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
   _debug _regex "$_regex"
-  _resource=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _resource=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _resource "$_resource"
   _regex="\"id\":([0-9]+)"
   _debug _regex "$_regex"
-  _resourceId=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _resourceId=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _resourceId "$_resourceId"
   _regex="\"sslData\":([0-9]+|null)"
   _debug _regex "$_regex"
-  _sslDataOld=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _sslDataOld=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataOld "$_sslDataOld"
   _regex="\"originGroup\":([0-9]+)"
   _debug _regex "$_regex"
-  _originGroup=$(if [[ $_resource =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _originGroup=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _originGroup "$_originGroup"
 
   if [ -z "$_resourceId" ] || [ -z "$_originGroup" ]; then
@@ -108,7 +108,7 @@ gcore_cdn_deploy() {
   _debug _response "$_response"
   _regex="\"id\":([0-9]+)"
   _debug _regex "$_regex"
-  _sslDataAdd=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _sslDataAdd=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataAdd "$_sslDataAdd"
 
   if [ -z "$_sslDataAdd" ]; then
@@ -123,7 +123,7 @@ gcore_cdn_deploy() {
   _debug _response "$_response"
   _regex="\"sslData\":([0-9]+)"
   _debug _regex "$_regex"
-  _sslDataNew=$(if [[ $_response =~ $_regex ]]; then printf "${BASH_REMATCH[1]}"; fi)
+  _sslDataNew=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
   _debug _sslDataNew "$_sslDataNew"
 
   if [ "$_sslDataNew" != "$_sslDataAdd" ]; then

From 0ecb5a3fec0b14e410ac4cc6682eae7051651510 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 04:31:58 +0300
Subject: [PATCH 07/11] fix syntax

---
 deploy/gcore_cdn.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 439508c2..2655cbc4 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -61,8 +61,7 @@ gcore_cdn_deploy() {
   _info "Get authorization token"
   _request="{ \"username\": \"$Le_Deploy_gcore_cdn_username\", \"password\": \"$Le_Deploy_gcore_cdn_password\" }"
   _debug _request "$_request"
-  _H1="Content-Type:application/json"
-  _response=$(_post "$_request" "https://api.gcdn.co/auth/signin")
+  _response=$(_H1="Content-Type:application/json" && _post "$_request" "https://api.gcdn.co/auth/signin")
   _debug _response "$_response"
   _regex="\"token\":\"([^\"]+)\""
   _debug _regex "$_regex"
@@ -75,8 +74,7 @@ gcore_cdn_deploy() {
   fi
 
   _info "Find CDN resource with cname $_cdomain"
-  _H2="Authorization:Token $_token"
-  _response=$(_get "https://api.gcdn.co/resources")
+  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _get "https://api.gcdn.co/resources")
   _debug _response "$_response"
   _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
   _debug _regex "$_regex"
@@ -104,7 +102,7 @@ gcore_cdn_deploy() {
   _date=$(date "+%d.%m.%Y %H:%M:%S")
   _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\", \"sslPrivateKey\": \"$_key\" }"
   _debug _request "$_request"
-  _response=$(_post "$_request" "https://api.gcdn.co/sslData")
+  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post "$_request" "https://api.gcdn.co/sslData")
   _debug _response "$_response"
   _regex="\"id\":([0-9]+)"
   _debug _regex "$_regex"
@@ -119,7 +117,7 @@ gcore_cdn_deploy() {
   _info "Update CDN resource"
   _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
   _debug _request "$_request"
-  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
+  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
   _debug _response "$_response"
   _regex="\"sslData\":([0-9]+)"
   _debug _regex "$_regex"
@@ -135,7 +133,7 @@ gcore_cdn_deploy() {
     _info "Not found old SSL certificate"
   else
     _info "Delete old SSL certificate"
-    _response=$(_post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
+    _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
     _debug _response "$_response"
   fi
 

From 8896642e2541265a4627792b922204129d6c9cca Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 20:01:39 +0300
Subject: [PATCH 08/11] fix syntax

---
 deploy/gcore_cdn.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 2655cbc4..f9ed6c7d 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -61,7 +61,8 @@ gcore_cdn_deploy() {
   _info "Get authorization token"
   _request="{ \"username\": \"$Le_Deploy_gcore_cdn_username\", \"password\": \"$Le_Deploy_gcore_cdn_password\" }"
   _debug _request "$_request"
-  _response=$(_H1="Content-Type:application/json" && _post "$_request" "https://api.gcdn.co/auth/signin")
+  export _H1="Content-Type:application/json"
+  _response=$(_post "$_request" "https://api.gcdn.co/auth/signin")
   _debug _response "$_response"
   _regex="\"token\":\"([^\"]+)\""
   _debug _regex "$_regex"
@@ -74,7 +75,8 @@ gcore_cdn_deploy() {
   fi
 
   _info "Find CDN resource with cname $_cdomain"
-  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _get "https://api.gcdn.co/resources")
+  export _H2="Authorization:Token $_token"
+  _response=$(_get "https://api.gcdn.co/resources")
   _debug _response "$_response"
   _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
   _debug _regex "$_regex"
@@ -102,7 +104,7 @@ gcore_cdn_deploy() {
   _date=$(date "+%d.%m.%Y %H:%M:%S")
   _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\", \"sslPrivateKey\": \"$_key\" }"
   _debug _request "$_request"
-  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post "$_request" "https://api.gcdn.co/sslData")
+  _response=$(_post "$_request" "https://api.gcdn.co/sslData")
   _debug _response "$_response"
   _regex="\"id\":([0-9]+)"
   _debug _regex "$_regex"
@@ -117,7 +119,7 @@ gcore_cdn_deploy() {
   _info "Update CDN resource"
   _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
   _debug _request "$_request"
-  _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
+  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
   _debug _response "$_response"
   _regex="\"sslData\":([0-9]+)"
   _debug _regex "$_regex"
@@ -133,7 +135,7 @@ gcore_cdn_deploy() {
     _info "Not found old SSL certificate"
   else
     _info "Delete old SSL certificate"
-    _response=$(_H1="Content-Type:application/json" && _H2="Authorization:Token $_token" && _post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
+    _response=$(_post '' "https://api.gcdn.co/sslData/$_sslDataOld" '' "DELETE")
     _debug _response "$_response"
   fi
 

From 4b6e7e6c371a7945e2b3304ff7241bf05691d453 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 20:02:59 +0300
Subject: [PATCH 09/11] remove use while, [[ ]], array

---
 deploy/gcore_cdn.sh | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index f9ed6c7d..f0cc43ec 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -27,8 +27,8 @@ gcore_cdn_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _fullchain=$(while read -r line; do printf "%s" "$line\n"; done <"$_cfullchain")
-  _key=$(while read -r line; do printf "%s" "$line\n"; done <"$_ckey")
+  _fullchain=$(cat "$_cfullchain" | tr '\n\r' '@#' | sed 's/@/\\n/g;s/#/\\r/g')
+  _key=$(cat "$_ckey" | tr '\n\r' '@#' | sed 's/@/\\n/g;s/#/\\r/g')
 
   _debug _fullchain "$_fullchain"
   _debug _key "$_key"
@@ -59,14 +59,14 @@ gcore_cdn_deploy() {
   fi
 
   _info "Get authorization token"
-  _request="{ \"username\": \"$Le_Deploy_gcore_cdn_username\", \"password\": \"$Le_Deploy_gcore_cdn_password\" }"
+  _request="{\"username\":\"$Le_Deploy_gcore_cdn_username\",\"password\":\"$Le_Deploy_gcore_cdn_password\"}"
   _debug _request "$_request"
   export _H1="Content-Type:application/json"
   _response=$(_post "$_request" "https://api.gcdn.co/auth/signin")
   _debug _response "$_response"
-  _regex="\"token\":\"([^\"]+)\""
+  _regex=".*\"token\":\"\([-._0-9A-Za-z]*\)\".*$"
   _debug _regex "$_regex"
-  _token=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _token=$(echo "$_response" | sed -n "s/$_regex/\1/p")
   _debug _token "$_token"
 
   if [ -z "$_token" ]; then
@@ -79,20 +79,21 @@ gcore_cdn_deploy() {
   _response=$(_get "https://api.gcdn.co/resources")
   _debug _response "$_response"
   _regex=".*(\"id\".*?\"cname\":\"$_cdomain\".*?})"
+  _regex="\"cname\":\"$_cdomain\""
   _debug _regex "$_regex"
-  _resource=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _resource=$(echo "$_response" | sed 's/},{/},\n{/g' | grep -E "$_regex")
   _debug _resource "$_resource"
-  _regex="\"id\":([0-9]+)"
+  _regex=".*\"id\":\([0-9]*\),.*$"
   _debug _regex "$_regex"
-  _resourceId=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _resourceId=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
   _debug _resourceId "$_resourceId"
-  _regex="\"sslData\":([0-9]+|null)"
+  _regex=".*\"sslData\":\([0-9]*\)}.*$"
   _debug _regex "$_regex"
-  _sslDataOld=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _sslDataOld=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
   _debug _sslDataOld "$_sslDataOld"
-  _regex="\"originGroup\":([0-9]+)"
+  _regex=".*\"originGroup\":\([0-9]*\),.*$"
   _debug _regex "$_regex"
-  _originGroup=$(if [[ $_resource =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _originGroup=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
   _debug _originGroup "$_originGroup"
 
   if [ -z "$_resourceId" ] || [ -z "$_originGroup" ]; then
@@ -102,13 +103,13 @@ gcore_cdn_deploy() {
 
   _info "Add new SSL certificate"
   _date=$(date "+%d.%m.%Y %H:%M:%S")
-  _request="{ \"name\": \"$_cdomain ($_date)\", \"sslCertificate\": \"$_fullchain\", \"sslPrivateKey\": \"$_key\" }"
+  _request="{\"name\":\"$_cdomain ($_date)\",\"sslCertificate\":\"$_fullchain\",\"sslPrivateKey\":\"$_key\"}"
   _debug _request "$_request"
   _response=$(_post "$_request" "https://api.gcdn.co/sslData")
   _debug _response "$_response"
-  _regex="\"id\":([0-9]+)"
+  _regex=".*\"id\":\([0-9]*\),.*$"
   _debug _regex "$_regex"
-  _sslDataAdd=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _sslDataAdd=$(echo "$_response" | sed -n "s/$_regex/\1/p")
   _debug _sslDataAdd "$_sslDataAdd"
 
   if [ -z "$_sslDataAdd" ]; then
@@ -117,13 +118,13 @@ gcore_cdn_deploy() {
   fi
 
   _info "Update CDN resource"
-  _request="{ \"originGroup\": $_originGroup, \"sslData\": $_sslDataAdd }"
+  _request="{\"originGroup\":$_originGroup,\"sslData\":$_sslDataAdd}"
   _debug _request "$_request"
   _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
   _debug _response "$_response"
-  _regex="\"sslData\":([0-9]+)"
+  _regex=".*\"sslData\":\([0-9]*\)}.*$"
   _debug _regex "$_regex"
-  _sslDataNew=$(if [[ $_response =~ $_regex ]]; then printf "%s" "${BASH_REMATCH[1]}"; fi)
+  _sslDataNew=$(echo "$_response" | sed -n "s/$_regex/\1/p")
   _debug _sslDataNew "$_sslDataNew"
 
   if [ "$_sslDataNew" != "$_sslDataAdd" ]; then

From bd1bb7a71bf79daa70db446995c9ca54517f57e2 Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 20:08:35 +0300
Subject: [PATCH 10/11] fix syntax

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

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index f0cc43ec..40fbf480 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -27,8 +27,8 @@ gcore_cdn_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _fullchain=$(cat "$_cfullchain" | tr '\n\r' '@#' | sed 's/@/\\n/g;s/#/\\r/g')
-  _key=$(cat "$_ckey" | tr '\n\r' '@#' | sed 's/@/\\n/g;s/#/\\r/g')
+  _fullchain=$(tr '\n\r' '@#' <"$_cfullchain" | sed 's/@/\\n/g;s/#/\\r/g')
+  _key=$(tr '\n\r' '@#' <"$_ckey" | sed 's/@/\\n/g;s/#/\\r/g')
 
   _debug _fullchain "$_fullchain"
   _debug _key "$_key"

From df9174577a503811973c5d185abc5f3000736a2a Mon Sep 17 00:00:00 2001
From: temoffey <temofffey@gmail.com>
Date: Fri, 22 Mar 2019 23:00:47 +0300
Subject: [PATCH 11/11] remove check jq

---
 deploy/gcore_cdn.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/deploy/gcore_cdn.sh b/deploy/gcore_cdn.sh
index 40fbf480..b38226f4 100644
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -53,11 +53,6 @@ gcore_cdn_deploy() {
     _savedomainconf Le_Deploy_gcore_cdn_password "$Le_Deploy_gcore_cdn_password"
   fi
 
-  if ! [ -x "$(command -v jq)" ]; then
-    _err "Please install the package jq: sudo apt-get install jq"
-    return 1
-  fi
-
   _info "Get authorization token"
   _request="{\"username\":\"$Le_Deploy_gcore_cdn_username\",\"password\":\"$Le_Deploy_gcore_cdn_password\"}"
   _debug _request "$_request"