aboutsummaryrefslogtreecommitdiffstats
path: root/global-functions
diff options
context:
space:
mode:
Diffstat (limited to 'global-functions')
-rw-r--r--global-functions45
1 files changed, 28 insertions, 17 deletions
diff --git a/global-functions b/global-functions
index 10eeac6..0d490df 100644
--- a/global-functions
+++ b/global-functions
@@ -17,6 +17,7 @@
# global functions
:global UrlEncode;
:global CharacterReplace;
+:global CertificateDownload;
:global CertificateAvailable;
:global SendEMail;
:global SendTelegram;
@@ -79,8 +80,8 @@
:return ($Return . $String);
}
-# check and import required certificates
-:set CertificateAvailable do={
+# download and import certificate
+:set CertificateDownload do={
:local CommonName [ :tostr $1 ];
:global ScriptUpdatesBaseUrl;
@@ -89,22 +90,32 @@
:global UrlEncode;
:global WaitForFile;
+ :log info ("Downloading and importing certificate with " . \
+ "CommonName " . $CommonName . ".");
+ :do {
+ :local LocalFileName ($CommonName . ".pem");
+ :local UrlFileName ([ $UrlEncode $CommonName ] . ".pem");
+ / tool fetch check-certificate=yes-without-crl \
+ ($ScriptUpdatesBaseUrl . "certs/" . \
+ $UrlFileName . $ScriptUpdatesUrlSuffix) \
+ dst-path=$LocalFileName;
+ $WaitForFile $LocalFileName;
+ / certificate import file-name=$LocalFileName passphrase="";
+ / file remove $LocalFileName;
+ } on-error={
+ :log warning "Failed imprting certificate!";
+ }
+}
+
+# check and download required certificate
+:set CertificateAvailable do={
+ :local CommonName [ :tostr $1 ];
+
+ :global CertificateDownload;
+
:if ([ / certificate print count-only where common-name=$CommonName ] = 0) do={
- :log info ("Certificate with CommonName " . $CommonName . \
- " not available, downloading and importing.");
- :do {
- :local LocalFileName ($CommonName . ".pem");
- :local UrlFileName ([ $UrlEncode $CommonName ] . ".pem");
- / tool fetch check-certificate=yes-without-crl \
- ($ScriptUpdatesBaseUrl . "certs/" . \
- $UrlFileName . $ScriptUpdatesUrlSuffix) \
- dst-path=$LocalFileName;
- $WaitForFile $LocalFileName;
- / certificate import file-name=$LocalFileName passphrase="";
- / file remove $LocalFileName;
- } on-error={
- :log warning "Failed imprting certificate!";
- }
+ :log info ("Certificate with CommonName " . $CommonName . " not available.");
+ $CertificateDownload $CommonName;
}
}