fw-addr-lists: use $FetchHugerouteros-7.13-5

2 files changed, 11 insertions, 13 deletions

diff --git a/doc/fw-addr-lists.md b/doc/fw-addr-lists.md
index 70ca6e9..ac34c88 100644
--- a/doc/fw-addr-lists.md
+++ b/doc/fw-addr-lists.md
@@ -4,7 +4,7 @@ Download, import and update firewall address-lists
 [![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
 [![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
-[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.12-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.13-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
 [![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
 [![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
 
@@ -29,6 +29,10 @@ see situation when the lists are not populated.
 To mitigate man-in-the-middle attacks with altered lists the server's
 certificate is checked.
 
+> ⚠️ **Warning**: The script does not limit the size of a list, but keep in
+> mind that huge lists can exhaust your device's resources (RAM and CPU),
+> and may take a long time to process.
+
 Requirements and installation
 -----------------------------
 
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 68775b4..66f8581 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -3,7 +3,7 @@
 # Copyright (c) 2023-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
-# requires RouterOS, version=7.12
+# requires RouterOS, version=7.13
 #
 # download, import and update firewall address-lists
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/fw-addr-lists.md
@@ -19,7 +19,7 @@
 
   :global CertificateAvailable;
   :global EitherOr;
-  :global FetchUserAgentStr;
+  :global FetchHuge;
   :global LogPrint;
   :global LogPrintOnce;
   :global ScriptLock;
@@ -50,12 +50,12 @@
     :local Failure false;
 
     :foreach List in=$FwList do={
-      :local CheckCertificate "no";
+      :local CheckCertificate false;
       :local Data false;
       :local TimeOut [ $EitherOr [ :totime ($List->"timeout") ] $FwAddrListTimeOut ];
 
       :if ([ :len ($List->"cert") ] > 0) do={
-        :set CheckCertificate "yes-without-crl";
+        :set CheckCertificate true;
         :if ([ $CertificateAvailable ($List->"cert") ] = false) do={
           $LogPrint warning $ScriptName ("Downloading required certificate failed, trying anyway.");
         }
@@ -63,10 +63,8 @@
 
       :for I from=1 to=5 do={
         :if ($Data = false) do={
-          :do {
-            :set Data ([ /tool/fetch check-certificate=$CheckCertificate output=user \
-              http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) ($List->"url") as-value ]->"data");
-          } on-error={
+          :set Data [ $FetchHuge $ScriptName ($List->"url") $CheckCertificate ];
+          :if ($Data = false) do={
             :if ($I < 5) do={
               $LogPrint debug $ScriptName ("Failed downloading, " . $I . ". try: " . $List->"url");
               :delay (($I * $I) . "s");
@@ -81,10 +79,6 @@
         $LogPrint warning $ScriptName ("Failed downloading list from: " . $List->"url");
       }
 
-      :if ([ :len $Data ] > 63000) do={
-        $LogPrintOnce warning $ScriptName ("The list is huge and may be truncated: " . $List->"url");
-      }
-
       :while ([ :len $Data ] != 0) do={
         :local Line [ :pick $Data 0 [ :find $Data "\n" ] ];
         :local Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));