diff --git a/INITIAL-COMMANDS.md b/INITIAL-COMMANDS.md index b805a90e..a5ddd480 100644 --- a/INITIAL-COMMANDS.md +++ b/INITIAL-COMMANDS.md @@ -18,9 +18,9 @@ Run the complete base installation: { :local BaseUrl "https://rsc.eworm.de/main/"; - :local CertCommonName "Root YE"; - :local CertFileName "Root-YE.pem"; - :local CertFingerprint "e14ffcad5b0025731006caa43a121a22d8e9700f4fb9cf852f02a708aa5d5666"; + :local CertCommonName "ISRG Root X2"; + :local CertFileName "ISRG-Root-X2.pem"; + :local CertFingerprint "69729b8e15a86efc177a57afb7171dfc64add28c2fca8cf1507e34453ccb1470"; :local CertSettings [ /certificate/settings/get ]; :if (!((($CertSettings->"builtin-trust-store") ~ "fetch" || \ diff --git a/README.d/01-download-certs.avif b/README.d/01-download-certs.avif index e4d8755c..f2afeb54 100644 Binary files a/README.d/01-download-certs.avif and b/README.d/01-download-certs.avif differ diff --git a/README.d/03-check-certs.avif b/README.d/03-check-certs.avif index 6610ac47..1f03ad2c 100644 Binary files a/README.d/03-check-certs.avif and b/README.d/03-check-certs.avif differ diff --git a/README.md b/README.md index e739756b..43b204e6 100644 --- a/README.md +++ b/README.md @@ -122,18 +122,18 @@ If you intend to download the scripts from a different location (for example from github.com) install the corresponding certificate chain. - /tool/fetch "https://rsc.eworm.de/main/certs/Root-YE.pem" dst-path="root-ye.pem"; + /tool/fetch "https://rsc.eworm.de/main/certs/ISRG-Root-X2.pem" dst-path="isrg-root-x2.pem"; ![screenshot: download certs](README.d/01-download-certs.avif) > ℹ️ **Info**: Note that the command above does *not* verify server > certificate, so if you want to be safe download with your workstations's > browser from CA's website and transfer the file to your MikroTik device: -> *Let's Encrypt* / *ISRG* [Root YE ↗️](https://letsencrypt.org/certs/gen-y/root-ye.pem) +> *Let's Encrypt* / *ISRG* [ISRG Root X2 ↗️](https://letsencrypt.org/certs/isrg-root-x2.pem) Then we import the certificate. - /certificate/import file-name="root-ye.pem" passphrase=""; + /certificate/import file-name="isrg-root-x2.pem" passphrase=""; Do not worry that the command is not shown - that happens because it contains a sensitive property, the passphrase. @@ -141,11 +141,11 @@ a sensitive property, the passphrase. ![screenshot: import certs](README.d/02-import-certs.avif) For basic verification we rename the certificate and print it by -fingerprint. Make sure exactly this one certificate ("*Root-YE*") +fingerprint. Make sure exactly this one certificate ("*ISRG-Root-X2*") is shown. - /certificate/set name="Root-YE" [ find where common-name="Root YE" ]; - /certificate/print proplist=name,fingerprint where fingerprint="e14ffcad5b0025731006caa43a121a22d8e9700f4fb9cf852f02a708aa5d5666"; + /certificate/set name="ISRG-Root-X2" [ find where common-name="ISRG Root X2" ]; + /certificate/print proplist=name,fingerprint where fingerprint="69729b8e15a86efc177a57afb7171dfc64add28c2fca8cf1507e34453ccb1470"; ![screenshot: check certs](README.d/03-check-certs.avif) diff --git a/certs/Makefile b/certs/Makefile index c9a33798..8b516e4d 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -12,12 +12,12 @@ DOMAINS_DUAL = \ cloudflare-dns.com/SSL-com-Root-Certification-Authority-ECC \ dns.google/GTS-Root-RX \ dns.quad9.net/DigiCert-Global-Root-G3 \ - git.eworm.de/Root-YE \ + git.eworm.de/ISRG-Root-X2 \ gitlab.com/USERTrust-RSA-Certification-Authority \ lists.blocklist.de/GTS-Root-R4 \ matrix.org/GTS-Root-R4 \ raw.githubusercontent.com/ISRG-Root-X1 \ - rsc.eworm.de/Root-YE \ + rsc.eworm.de/ISRG-Root-X2 \ upgrade.mikrotik.com/ISRG-Root-X1 DOMAINS_IPV4 = \ 1.1.1.1/SSL-com-Root-Certification-Authority-ECC \ diff --git a/check-health.d/temperature.rsc b/check-health.d/temperature.rsc index 9ad35ae0..1869946d 100644 --- a/check-health.d/temperature.rsc +++ b/check-health.d/temperature.rsc @@ -30,8 +30,7 @@ } :local TempToNum do={ - :global CharacterReplace; - :local T [ :toarray [ $CharacterReplace $1 "." "," ] ]; + :local T [ :toarray delimiter="." $1 ]; :return ($T->0 * 10 + $T->1); } diff --git a/check-health.rsc b/check-health.rsc index c82d8351..973de595 100644 --- a/check-health.rsc +++ b/check-health.rsc @@ -30,8 +30,7 @@ :global ValidateSyntax; :local TempToNum do={ - :global CharacterReplace; - :local T [ :toarray [ $CharacterReplace $1 "." "," ] ]; + :local T [ :toarray delimiter="." $1 ]; :return ($T->0 * 10 + $T->1); } diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index 55276138..1c3fe355 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -70,11 +70,13 @@ :local Data false; :local TimeOut [ $EitherOr [ :totime ($List->"timeout") ] $FwAddrListTimeOut ]; - :if ([ :len ($List->"cert") ] > 0) do={ - :set CheckCertificate true; - :if ([ $CertificateAvailable ($List->"cert") "fetch" ] = false) do={ - $LogPrint warning $ScriptName ("Downloading required certificate (" . $FwListName . \ - " / " . $List->"url" . ") failed, trying anyway."); + :foreach Cert in=[ :toarray delimiter=":" ($List->"cert") ] do={ + :if ([ :len ($Cert) ] > 0) do={ + :set CheckCertificate true; + :if ([ $CertificateAvailable $Cert "fetch" ] = false) do={ + $LogPrint warning $ScriptName ("Downloading required certificate (" . $FwListName . \ + " / " . $List->"url" . ") failed, trying anyway."); + } } } diff --git a/global-config.rsc b/global-config.rsc index 0bb572b5..86187431 100644 --- a/global-config.rsc +++ b/global-config.rsc @@ -112,11 +112,11 @@ :global FwAddrLists { # "allow"={ # { url="https://rsc.eworm.de/main/fw-addr-lists.d/allow"; -# cert="Root YE"; timeout=1w }; +# cert="ISRG Root X2:Root YE"; timeout=1w }; # }; "block"={ # { url="https://rsc.eworm.de/main/fw-addr-lists.d/block"; -# cert="Root YE" }; +# cert="ISRG Root X2:Root YE" }; { url="https://raw.githubusercontent.com/stamparm/ipsum/refs/heads/master/levels/4.txt"; # # higher level (decrease the numerical value) for more addresses, and vice versa cert="ISRG Root X1" }; @@ -131,7 +131,7 @@ }; # "mikrotik"={ # { url="https://rsc.eworm.de/main/fw-addr-lists.d/mikrotik"; -# cert="Root YE"; timeout=1w }; +# cert="ISRG Root X2:Root YE"; timeout=1w }; # }; }; :global FwAddrListTimeOut 1d; diff --git a/global-functions.rsc b/global-functions.rsc index f870df18..633f3841 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -1243,7 +1243,8 @@ :global SymbolForNotification; :global ValidateSyntax; - :if ([ $CertificateAvailable "Root YE" "fetch" ] = false) do={ + :if ([ $CertificateAvailable "ISRG Root X2" "fetch" ] = false || \ + [ $CertificateAvailable "Root YE" "fetch" ] = false) do={ $LogPrint warning $0 ("Downloading certificate failed, trying without."); } diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc index 6a048556..9cab84e7 100644 --- a/netwatch-dns.rsc +++ b/netwatch-dns.rsc @@ -16,7 +16,6 @@ :local ScriptName [ :jobname ]; :global CertificateAvailable; - :global CharacterReplace; :global EitherOr; :global IsDNSResolving; :global LogPrint; @@ -100,7 +99,7 @@ } :foreach DohServer in=$DohServers do={ - :foreach DohCert in=[ :toarray [ $CharacterReplace ($DohServer->"doh-cert") ":" "," ] ] do={ + :foreach DohCert in=[ :toarray delimiter=":" ($DohServer->"doh-cert") ] do={ :if ([ :len $DohCert ] > 0) do={ :if ([ $CertificateAvailable $DohCert "fetch" ] = false || \ [ $CertificateAvailable $DohCert "dns" ] = false) do={