mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-03 06:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

check-certificates: use $ParseKeyValueStore

Browse source
This commit is contained in:
Christian Hesse 2019-07-17 16:28:22 +02:00
parent 047c0989d8
commit beb2e70097
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
check-certificates
View file

@ -8,19 +8,11 @@
:global CertRenewUrl; :global CertRenewUrl;
:global CertRenewPass; :global CertRenewPass;
:global ParseKeyValueStore;
:global SendNotification; :global SendNotification;
:global UrlEncode; :global UrlEncode;
:global WaitForFile; :global WaitForFile;
:local GetIssuerCN do={
:foreach IssuerI in=$1 do={
:if ([ :pick $IssuerI 0 3 ] = "CN=") do={
:return [ :pick $IssuerI 3 99 ];
}
}
:return "";
}
:local FormatExpire do={ :local FormatExpire do={
:global CharacterReplace; :global CharacterReplace;
:return [ $CharacterReplace [ $CharacterReplace [ :tostr $1 ] "w" "w " ] "d" "d " ]; :return [ $CharacterReplace [ $CharacterReplace [ :tostr $1 ] "w" "w " ] "d" "d " ];
@ -76,7 +68,7 @@
"Name: " . ($CertVal->"name") . "\n" . \ "Name: " . ($CertVal->"name") . "\n" . \
"CommonName: " . ($CertNewVal->"common-name") . "\n" . \ "CommonName: " . ($CertNewVal->"common-name") . "\n" . \
"Fingerprint: " . ($CertNewVal->"fingerprint") . "\n" . \ "Fingerprint: " . ($CertNewVal->"fingerprint") . "\n" . \
"Issuer: " . [ $GetIssuerCN ($CertNewVal->"issuer") ] . "\n" . \ "Issuer: " . ([ $ParseKeyValueStore ($CertNewVal->"issuer") ]->"CN") . "\n" . \
"Validity: " . ($CertNewVal->"invalid-before") . " to " . ($CertNewVal->"invalid-after") . "\n" . \ "Validity: " . ($CertNewVal->"invalid-before") . " to " . ($CertNewVal->"invalid-after") . "\n" . \
"Expires in: " . [ $FormatExpire ($CertNewVal->"expires-after") ]); "Expires in: " . [ $FormatExpire ($CertNewVal->"expires-after") ]);
:log info ("The certificate " . ($CertVal->"name") . " has been renewed."); :log info ("The certificate " . ($CertVal->"name") . " has been renewed.");
@ -100,7 +92,7 @@
"Name: " . ($CertVal->"name") . "\n" . \ "Name: " . ($CertVal->"name") . "\n" . \
"CommonName: " . ($CertVal->"common-name") . "\n" . \ "CommonName: " . ($CertVal->"common-name") . "\n" . \
"Fingerprint: " . ($CertVal->"fingerprint") . "\n" . \ "Fingerprint: " . ($CertVal->"fingerprint") . "\n" . \
"Issuer: " . ($CertVal->"ca") . [ $GetIssuerCN ($CertVal->"issuer") ] . "\n" . \ "Issuer: " . ($CertVal->"ca") . ([ $ParseKeyValueStore ($CertVal->"issuer") ]->"CN") . "\n" . \
"Validity: " . ($CertVal->"invalid-before") . " to " . ($CertVal->"invalid-after") . "\n" . \ "Validity: " . ($CertVal->"invalid-before") . " to " . ($CertVal->"invalid-after") . "\n" . \
"Expires in: " . $ExpiresAfter); "Expires in: " . $ExpiresAfter);
:log warning ("The certificate " . ($CertVal->"name") . " " . $State . \ :log warning ("The certificate " . ($CertVal->"name") . " " . $State . \