Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Je 58821 #197

Open
wants to merge 8 commits into
base: stage
Choose a base branch
from
Open

Je 58821 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6248f6f
Merge pull request #188 from jelastic-jps/stage
SlavaKatiukha Aug 3, 2021
79920a7
JE-60186 [LE] Check https protocol while invalid response from custom…
lazarenkoalexey Oct 11, 2021
2eb1524
JE-60186 [LE] Check https protocol while invalid response from custom…
lazarenkoalexey Oct 11, 2021
8e4db9e
Merge pull request #193 from lazarenkoalexey/JE-60186
SlavaKatiukha Oct 11, 2021
8b58b43
JE-58821 [LE] updatefromcontainer-> message can be informative
lazarenkoalexey Nov 4, 2021
e09f901
JE-58821 [LE] updatefromcontainer-> message can be informative
lazarenkoalexey Nov 4, 2021
59cd685
JE-58821 [LE] updatefromcontainer-> message can be informative
lazarenkoalexey Nov 4, 2021
6accd99
JE-58821 [LE] updatefromcontainer-> message can be informative
lazarenkoalexey Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions scripts/create-installation-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 3 additions & 2 deletions scripts/generate-ssl-cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]] && {
Expand Down Expand Up @@ -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; }

Expand Down
8 changes: 8 additions & 0 deletions scripts/install-ssl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down