Merge branch 'rmdir-rmfile' into next

RouterOS 7.18beta2 comes with some severe issues in file handling,
probably racy conditions. Let's move file (and directory) removal to
functions, so errors can be caught and ignored 🤪 from a central place.

backup-cloud.rsc

@@ -26,6 +26,7 @@
   :global LogPrint;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -97,7 +98,7 @@
     $LogPrint error $ScriptName ("Failed uploading backup for " . $Identity . " to cloud!");
     :set PackagesUpdateBackupFailure true;
   }
-  /file/remove "tmpfs/backup-cloud";
+  $RmDir "tmpfs/backup-cloud";
 } on-error={
   :global ExitError; $ExitError $ExitOK [ :jobname ];
 }

backup-upload.rsc

@@ -35,6 +35,8 @@
   :global LogPrint;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
+  :global RmFile;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -99,7 +101,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".backup");
+    $RmFile ($FilePath . ".backup");
   }
 
   # create configuration export
@@ -118,7 +120,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".rsc");
+    $RmFile ($FilePath . ".rsc");
   }
 
   # global-config-overlay
@@ -139,7 +141,7 @@
       :set Failed 1;
     }
 
-    /file/remove ($FilePath . ".conf");
+    $RmFile ($FilePath . ".conf");
   }
 
   :local FileInfo do={
@@ -170,7 +172,7 @@
   :if ($Failed = 1) do={
     :set PackagesUpdateBackupFailure true;
   }
-  /file/remove $DirName;
+  $RmDir $DirName;
 } on-error={
   :global ExitError; $ExitError $ExitOK [ :jobname ];
 }

capsman-download-packages.capsman.rsc

@@ -22,6 +22,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -61,7 +62,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 

capsman-download-packages.template.rsc

@@ -23,6 +23,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -63,7 +64,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 

capsman-download-packages.wifi.rsc

@@ -22,6 +22,7 @@
   :global DownloadPackage;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -61,7 +62,7 @@
     :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
          ($File->"package-architecture") $PackagePath ] = true) do={
       :set Updated true;
-      /file/remove $Package;
+      $RmFile $Package;
     }
   }
 

check-certificates.rsc

@@ -44,6 +44,7 @@
     :global EscapeForRegEx;
     :global FetchUserAgentStr;
     :global LogPrint;
+    :global RmFile;
     :global UrlEncode;
     :global WaitForFile;
 
@@ -63,7 +64,7 @@
             :set DecryptionFailed false;
           }
         }
-        /file/remove [ find where name=$CertFileName ];
+        $RmFile $CertFileName;
 
         :if ($DecryptionFailed = true) do={
           $LogPrint warning $ScriptName ("Decryption failed for certificate file '" . $CertFileName . "'.");

global-functions.rsc

@@ -63,6 +63,8 @@
 :global ProtocolStrip;
 :global RandomDelay;
 :global RequiredRouterOS;
+:global RmDir;
+:global RmFile;
 :global ScriptFromTerminal;
 :global ScriptInstallUpdate;
 :global ScriptLock;
@@ -147,6 +149,7 @@
   :global CleanName;
   :global FetchUserAgentStr;
   :global LogPrint;
+  :global RmFile;
   :global WaitForFile;
 
   $LogPrint info $0 ("Downloading and importing certificate with " . \
@@ -170,7 +173,7 @@
         dst-path=$FileName as-value;
       $WaitForFile $FileName;
       :if ([ /file/get $FileName size ] = 0) do={
-        /file/remove $FileName;
+        $RmFile $FileName;
         :error false;
       }
     } on-error={
@@ -181,7 +184,7 @@
 
   /certificate/import file-name=$FileName passphrase="" as-value;
   :delay 1s;
-  /file/remove [ find where name=$FileName ];
+  $RmFile $FileName;
 
   :if ([ :len [ /certificate/find where common-name=$CommonName ] ] = 0) do={
     /certificate/remove [ find where name~("^" . $FileName . "_[0-9]+\$") ];
@@ -340,6 +343,7 @@
   :global CleanFilePath;
   :global LogPrint;
   :global MkDir;
+  :global RmFile;
   :global WaitForFile;
 
   :if ([ :len $PkgName ] = 0) do={ :return false; }
@@ -383,7 +387,7 @@
       $LogPrint debug $0 ("Downloading package file failed.");
     }
 
-    /file/remove [ find where name=$PkgDest ];
+    $RmFile $PkgDest;
     :set Retry ($Retry - 1);
   }
 
@@ -453,6 +457,8 @@
   :global IfThenElse;
   :global LogPrint;
   :global MkDir;
+  :global RmDir;
+  :global RmFile;
   :global WaitForFile;
 
   :set CheckCert [ $IfThenElse ($CheckCert = "false") "no" "yes-without-crl" ];
@@ -469,10 +475,10 @@
       http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
   } on-error={
     :if ([ $WaitForFile $FileName 500ms ] = true) do={
-      /file/remove $FileName;
+      $RmFile $FileName;
     }
     $LogPrint debug $0 ("Failed downloading from: " . $Url);
-    /file/remove $DirName;
+    $RmDir $DirName;
     :return false;
   }
   $WaitForFile $FileName;
@@ -488,7 +494,7 @@
       :delay 100ms;
     }
   }
-  /file/remove $DirName;
+  $RmDir $DirName;
   :return $Return;
 }
 
@@ -851,6 +857,7 @@
 
   :global CleanFilePath;
   :global LogPrint;
+  :global RmDir;
   :global WaitForFile;
 
   :local MkTmpfs do={
@@ -867,7 +874,7 @@
     }
 
     $LogPrint info $0 ("Creating disk of type tmpfs.");
-    /file/remove [ find where name="tmpfs" type="directory" ];
+    $RmDir "tmpfs";
     :do {
       /disk/add slot=tmpfs type=tmpfs tmpfs-max-size=([ /system/resource/get total-memory ] / 3);
       $WaitForFile "tmpfs";
@@ -1004,6 +1011,62 @@
   :return true;
 }
 
+# remove directory
+:set RmDir do={
+  :local DirName [ :tostr $1 ];
+
+  :global LogPrint;
+
+  $LogPrint debug $0 ("Removing directory: ". $DirName);
+
+  :if ([ :len [ /file/find where name=$DirName type!=directory ] ] > 0) do={
+    $LogPrint error $0 ("Directory '" . $DirName . "' is not a directory.");
+    :return false;
+  }
+
+  :local Dir [ /file/find where name=$DirName type=directory ];
+  :if ([ :len $Dir ] = 0) do={
+    $LogPrint debug $0 ("... which does not exist.");
+    :return true;
+  }
+
+  :do {
+    /file/remove $Dir;
+  } on-error={
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' (" . $Dir . ") failed.");
+    :return false;
+  }
+  :return true;
+}
+
+# remove file
+:set RmFile do={
+  :local FileName [ :tostr $1 ];
+
+  :global LogPrint;
+
+  $LogPrint debug $0 ("Removing file: ". $FileName);
+
+  :if ([ :len [ /file/find where name=$FileName type!=file ] ] > 0) do={
+    $LogPrint error $0 ("File '" . $FileName . "' is not a file.");
+    :return false;
+  }
+
+  :local File [ /file/find where name=$FileName type=file ];
+  :if ([ :len $File ] = 0) do={
+    $LogPrint debug $0 ("... which does not exist.");
+    :return true;
+  }
+
+  :do {
+    /file/remove $File;
+  } on-error={
+    $LogPrint error $0 ("Removing file '" . $FileName . "' (" . $File . ") failed.");
+    :return false;
+  }
+  :return true;
+}
+
 # check if script is run from terminal
 :set ScriptFromTerminal do={
   :local Script [ :tostr $1 ];

mod/ssh-keys-import.rsc

@@ -19,6 +19,7 @@
   :global GetRandom20CharAlNum;
   :global LogPrint;
   :global MkDir;
+  :global RmDir;
   :global WaitForFile;
 
   :if ([ :len $Key ] = 0 || [ :len $User ] = 0) do={
@@ -58,10 +59,10 @@
     /user/ssh-keys/import public-key-file=$FileName user=$User;
     $LogPrint info $0 ("Imported ssh public key (" . $KeyVal->2 . ", " . $KeyVal->0 . ", " . \
       "MD5:" . $FingerPrintMD5 . ") for user '" . $User . "'.");
-    /file/remove "tmpfs/ssh-keys-import";
+    $RmDir "tmpfs/ssh-keys-import";
   } on-error={
     $LogPrint warning $0 ("Failed importing key.");
-    /file/remove "tmpfs/ssh-keys-import";
+    $RmDir "tmpfs/ssh-keys-import";
     :return false;
   }
 } on-error={

telegram-chat.rsc

@@ -37,6 +37,7 @@
   :global MIN;
   :global MkDir;
   :global RandomDelay;
+  :global RmDir;
   :global ScriptLock;
   :global SendTelegram2;
   :global SymbolForNotification;
@@ -154,7 +155,7 @@
                 $State . [ $IfThenElse ([ :len $Content ] > 0) \
                 ([ $SymbolForNotification "memo" ] . "Output:\n" . $Content) \
                 ([ $SymbolForNotification "memo" ] . "No output.") ]) });
-            /file/remove "tmpfs/telegram-chat";
+            $RmDir "tmpfs/telegram-chat";
           } else={
             $LogPrint info $ScriptName ("The command from update " . $UpdateID . " failed syntax validation!");
             $SendTelegram2 ({ origin=$ScriptName; chatid=($Chat->"id"); silent=false; replyto=($Message->"message_id"); \