Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:40:03 01.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 7eed5736857183f79f093ec7287c0f932b9e6991..bd199e2f756a22e6ea222b5474740875b7e7c539 100644 (file)
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/387/e56480ae";
+:global CommitId "main/388/a34b22fb";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:30:03 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:40:03 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/AM-RKN-dnsLookup.rsc b/html/AM-RKN-dnsLookup.rsc
index 480eae6711cc887d076339ead4b3dc688940664d..45b1c9dcba2ccc7191ca5acd2fb1da9cbd40f8b9 100644 (file)
--- a/html/AM-RKN-dnsLookup.rsc
+++ b/html/AM-RKN-dnsLookup.rsc
@@ -1,22 +1,37 @@
-:global ListRKN;
-:global SrvRKN;
-:global Done;
+#!rsc by Vados
+# RouterOS script: AM-RKN-dnsLookup
+# Script comment: Lookup IP addresses for RKN list and add them to firewall address-list
+# Copyright (c) 2007-2026 Vados <vados@vados.ru>
+#
+#
+# requires RouterOS, version=7.19
+# requires device-mode, fetch
+#
+# Script description: This script is intended to be run periodically, e.g. once a day, to update the IP addresses in the firewall address-list based on the RKN list.
+#                     It resolves the domain names in the RKN list and adds the corresponding IP addresses to the specified firewall address-list.
+#                     The script also handles CNAME records by following them until it finds A records.
+# Usage:
+# /system/script { run AM-RKN-dnsLookup; }
+:local ScriptName [ :jobname ];
+:global AM-RKN-dnsLookupReady false;
 
-#has $Done been initialized?
-:if ([:typeof $Done] != "boolean") do={
-    :set Done true;
-}
+:local ExitOK false;
+:onerror Err {
+#  :global AM-RKN-dnsLookupReady;
+  :retry { :if ($AM-RKN-dnsLookupReady != true) \
+      do={ :error ($ScriptName . " is running and not ready"); }; } delay=500ms max=50;
 
+:local ListRKN "FuckRKN";
+:local ListComment ("ListRKN managed by " . $ScriptName);
+#has $Done been initialized?
+#:if ([:typeof $Done] != "boolean") do={:set Done true}
 #make sure previous runs have finished
-while (!$Done) do={
-    :nothing;
-}
-
+#while (!$Done) do={:nothing}
 #block any other runs
-:set Done false;
+#:set Done false;
 
 #delete old address lists
-:foreach aListItem in=[/ip firewall address-list find list=$ListRKN] do={
+:foreach aListItem in=[/ip/firewall/address-list find list=$ListRKN] do={
     /ip firewall address-list remove $aListItem;
 }
 

diff --git a/html/certs/DigiCert-Global-Root-G2.pem b/html/certs/DigiCert-Global-Root-G2.pem
new file mode 100644 (file)
index 0000000..8af6c7a
--- /dev/null
+++ b/html/certs/DigiCert-Global-Root-G2.pem
@@ -0,0 +1,29 @@
+# Issuer: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root G2"
+# Serial: 4293743540046975378534879503202253541
+# MD5 Fingerprint: e4:a6:8a:c8:54:ac:52:42:46:0a:fd:72:48:1b:2a:44
+# SHA1 Fingerprint: df:3c:24:f9:bf:d6:66:76:1b:26:80:73:fe:06:d1:cc:8d:4f:82:a4
+# SHA256 Fingerprint: cb:3c:cb:b7:60:31:e5:e0:13:8f:8d:d3:9a:23:f9:de:47:ff:c3:5e:43:c1:14:4c:ea:27:d4:6a:5a:b1:cb:5f
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----

diff --git a/html/certs/Makefile b/html/certs/Makefile
index 8c56f90fd0f1022ebd0f8dc513e32c00523455ff..b9d9dd0bb0204e9b351a4126e0947232c71f84a4 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -28,12 +28,12 @@ DOMAINS_IPV4 = \
        ipv4.showipv6.de/ISRG-Root-X1 \
        ipv4.tunnelbroker.net/Starfield-Root-Certificate-Authority-G2 \
        mkcert.org/ISRG-Root-X1 \
+       mkcert.org/Digicert-Global-Root-G2 \
        ntfy.sh/ISRG-Root-X1 \
        mkcert.org/generate/DigiCert-Trust-Root-G4 \
        mkcert.org/DigiCert-Global-Root-G3 \
        mkcert.org/Starfield-Root-Certificate-Authority-G2 \
        www.dshield.org/GTS-Root-R4 \
-       mkcert.org/generate/Digicert-Global-Root-G2 \
        www.spamhaus.org/GTS-Root-R4
 DOMAINS_IPV6 = \
        [2606\:4700\:4700\:\:1111]/SSL-com-Root-Certification-Authority-ECC \

diff --git a/html/certs/test/DigiCert-Global-Root-G2.pem b/html/certs/test/DigiCert-Global-Root-G2.pem
new file mode 100644 (file)
index 0000000..8af6c7a
--- /dev/null
+++ b/html/certs/test/DigiCert-Global-Root-G2.pem
@@ -0,0 +1,29 @@
+# Issuer: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root G2"
+# Serial: 4293743540046975378534879503202253541
+# MD5 Fingerprint: e4:a6:8a:c8:54:ac:52:42:46:0a:fd:72:48:1b:2a:44
+# SHA1 Fingerprint: df:3c:24:f9:bf:d6:66:76:1b:26:80:73:fe:06:d1:cc:8d:4f:82:a4
+# SHA256 Fingerprint: cb:3c:cb:b7:60:31:e5:e0:13:8f:8d:d3:9a:23:f9:de:47:ff:c3:5e:43:c1:14:4c:ea:27:d4:6a:5a:b1:cb:5f
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----