From 79920a753510b9663d4cfb1aea1936d0529452d1 Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Mon, 11 Oct 2021 09:42:35 +0300 Subject: [PATCH 1/6] JE-60186 [LE] Check https protocol while invalid response from custom domain --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 1388bb3a..4c541948 100644 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -73,7 +73,7 @@ do [[ -z $error ]] && { error=$(sed -rn 's/.*\s(.*)(Invalid response from http:\/\/.*)\\\"".*/\2/p' $LOG_FILE | sed '$!d') - [[ ! -z $error ]] && invalid_domain=$(echo $error | sed -rn 's/Invalid response from http:\/\/([^/]*)\/\.well-known.*/\1/p') + [[ ! -z $error ]] && invalid_domain=$(echo $error | sed -rn 's/Invalid response from https:\/\/([^/]*)\/\.well-known.*/\1/p') } [[ -z $error ]] && { From 2eb152410c1da97a2d3ea953dab44a5b99b0e6da Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Mon, 11 Oct 2021 09:44:00 +0300 Subject: [PATCH 2/6] JE-60186 [LE] Check https protocol while invalid response from custom domain --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 4c541948..222f5cde 100644 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -73,7 +73,7 @@ do [[ -z $error ]] && { error=$(sed -rn 's/.*\s(.*)(Invalid response from http:\/\/.*)\\\"".*/\2/p' $LOG_FILE | sed '$!d') - [[ ! -z $error ]] && invalid_domain=$(echo $error | sed -rn 's/Invalid response from https:\/\/([^/]*)\/\.well-known.*/\1/p') + [[ ! -z $error ]] && invalid_domain=$(echo $error | sed -rn 's/Invalid response from https?:\/\/([^/]*)\/\.well-known.*/\1/p') } [[ -z $error ]] && { From 8b58b4305f223f7158a7ba815e0ba6f61231c50c Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Thu, 4 Nov 2021 11:24:08 +0200 Subject: [PATCH 3/6] JE-58821 [LE] updatefromcontainer-> message can be informative --- scripts/create-installation-script.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/create-installation-script.js b/scripts/create-installation-script.js index 40f0ddc9..3a8d3163 100644 --- a/scripts/create-installation-script.js +++ b/scripts/create-installation-script.js @@ -52,7 +52,15 @@ function run() { function use(script, config) { var Transport = com.hivext.api.core.utils.Transport, + error, + body; + + try { body = new Transport().get(baseUrl + "/" + script + "?_r=" + Math.random()); + } catch (e) { + error = !body ? "Unable to download 'ssl-manager' script from GitHub. Error: " + e : ""; + if (error) return error; + } return new (new Function("return " + body)())(config); } From e09f901a8b9a86893b1da87a95f302faa6ef2c7c Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Thu, 4 Nov 2021 11:24:30 +0200 Subject: [PATCH 4/6] JE-58821 [LE] updatefromcontainer-> message can be informative --- scripts/install-ssl.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install-ssl.js b/scripts/install-ssl.js index 8cae7499..ef500228 100644 --- a/scripts/install-ssl.js +++ b/scripts/install-ssl.js @@ -51,7 +51,15 @@ function run() { function use(script, config) { var Transport = com.hivext.api.core.utils.Transport, + error, + body; + + try { body = new Transport().get(baseUrl + "/" + script + "?_r=" + Math.random()); + } catch (e) { + error = !body ? "Unable to download 'ssl-manager' script from GitHub. Error: " + e : ""; + if (error) return error; + } return new (new Function("return " + body)())(config); } From 59cd6855780bdaa0e9052c6b36a27dec0db22f3b Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Thu, 4 Nov 2021 13:38:15 +0200 Subject: [PATCH 5/6] JE-58821 [LE] updatefromcontainer-> message can be informative --- scripts/generate-ssl-cert.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 222f5cde..fa2d1817 100644 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -126,10 +126,11 @@ sed -i "s|^domain=.*|domain='${domain}'|g" ${SETTINGS}; if [ "$result_code" != "0" ]; then [[ $resp == *"does not exist or is not a directory"* ]] && invalid_webroot_dir=true [[ $resp == *"Read timed out"* ]] && timed_out=true + [[ $resp == *"Error retrieving account"* ]] && error_retrieve=true fi [[ $invalid_webroot_dir == true ]] && exit $WRONG_WEBROOT_ERROR; -[[ $timed_out == true ]] && exit $TIME_OUT_ERROR; +[[ $timed_out == true || error_retrieve == true ]] && exit $TIME_OUT_ERROR; [[ $rate_limit_exceeded == true ]] && { echo "$error"; exit $TOO_MANY_CERTS; } [[ $result_code != "0" ]] && { echo "$all_invalid_domains_errors"; exit $GENERAL_RESULT_ERROR; } From 6accd990c0572e599d52e4326214b9b01b16947c Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Thu, 4 Nov 2021 13:39:08 +0200 Subject: [PATCH 6/6] JE-58821 [LE] updatefromcontainer-> message can be informative --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index fa2d1817..6cca2cee 100644 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -130,7 +130,7 @@ if [ "$result_code" != "0" ]; then fi [[ $invalid_webroot_dir == true ]] && exit $WRONG_WEBROOT_ERROR; -[[ $timed_out == true || error_retrieve == true ]] && exit $TIME_OUT_ERROR; +[[ $timed_out == true || $error_retrieve == true ]] && exit $TIME_OUT_ERROR; [[ $rate_limit_exceeded == true ]] && { echo "$error"; exit $TOO_MANY_CERTS; } [[ $result_code != "0" ]] && { echo "$all_invalid_domains_errors"; exit $GENERAL_RESULT_ERROR; }