1 files changed, 38 insertions, 15 deletions

diff --git a/global-functions.rsc b/global-functions.rsc
index 918ea9a..f890376 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -12,7 +12,7 @@
 :local ScriptName [ :jobname ];
 
 # expected configuration version
-:global ExpectedConfigVersion 127;
+:global ExpectedConfigVersion 128;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;
@@ -58,6 +58,7 @@
 :global ParseDate;
 :global ParseKeyValueStore;
 :global PrettyPrint;
+:global ProtocolStrip;
 :global RandomDelay;
 :global RequiredRouterOS;
 :global ScriptFromTerminal;
@@ -150,7 +151,7 @@
     $WaitForFile $FileName;
     /certificate/import file-name=$FileName passphrase="" as-value;
     :delay 1s;
-    /file/remove $FileName;
+    /file/remove [ find where name=$FileName ];
 
     :foreach Cert in=[ /certificate/find where name~("^" . $FileName . "_[0-9]+\$") ] do={
       $CertificateNameByCN [ /certificate/get $Cert common-name ];
@@ -229,11 +230,19 @@
   :for I from=0 to=([ :len $Input ] - 1) do={
     :local Char [ :pick $Input $I ];
     :if ([ :typeof [ find "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-" $Char ] ] = "nil") do={
-      :set Char "-";
-    }
-    :if ($Char != "-" || [ :pick $Return ([ :len $Return ] - 1) ] != "-") do={
-      :set Return ($Return . $Char);
+      :do {
+        :if ([ :len $Return ] = 0) do={
+          :error true;
+        }
+        :if ([ :pick $Return ([ :len $Return ] - 1) ] = "-") do={
+          :error true;
+        }
+        :set Char "-";
+      } on-error={
+        :set Char "";
+      }
     }
+    :set Return ($Return . $Char);
   }
   :return $Return;
 }
@@ -405,13 +414,13 @@
 
   :set CheckCert [ $IfThenElse ($CheckCert = false) "no" "yes-without-crl" ];
 
-  :local FileName ("tmpfs/" . [ $CleanName $ScriptName ]);
-  :if ([ $MkDir $FileName ] = false) do={
+  :local DirName ("tmpfs/" . [ $CleanName $ScriptName ]);
+  :if ([ $MkDir $DirName ] = false) do={
     $LogPrint error $0 ("Failed creating directory!");
     :return false;
   }
 
-  :set FileName ($FileName . "/" . [ $CleanName $0 ] . "-" . [ $GetRandom20CharAlNum ]);
+  :local FileName ($DirName . "/" . [ $CleanName $0 ] . "-" . [ $GetRandom20CharAlNum ]);
   :do {
     /tool/fetch check-certificate=$CheckCert $Url dst-path=$FileName \
       http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
@@ -420,6 +429,7 @@
       /file/remove $FileName;
     }
     $LogPrint debug $0 ("Failed downloading from: " . $Url);
+    /file/remove $DirName;
     :return false;
   }
   $WaitForFile $FileName;
@@ -431,7 +441,7 @@
     :set Return ($Return . ([ /file/read offset=$VarSize chunk-size=32768 file=$FileName as-value ]->"data"));
     :set VarSize [ :len $Return ];
   }
-  /file/remove $FileName;
+  /file/remove $DirName;
   :return $Return;
 }
 
@@ -663,7 +673,7 @@
   :global IsTimeSyncCached;
   :global IsTimeSyncResetNtp;
 
-  :global LogPrint;
+  :global LogPrintOnce;
 
   :if ($IsTimeSyncCached = true) do={
     :return true;
@@ -683,6 +693,7 @@
       :return false;
     }
 
+    $LogPrintOnce warning $0 ("The ntp client is configured, but did not sync.");
     :set IsTimeSyncResetNtp $Uptime;
     /system/ntp/client/set enabled=no;
     :delay 20ms;
@@ -692,7 +703,7 @@
 
   :if ([ /system/license/get ]->"level" = "free" || \
        [ /system/resource/get ]->"board-name" = "x86") do={
-    $LogPrint debug $0 ("No ntp client configured, relying on RTC for CHR free license and x86.");
+    $LogPrintOnce debug $0 ("No ntp client configured, relying on RTC for CHR free license and x86.");
     :return true;
   }
 
@@ -704,7 +715,7 @@
     :return false;
   }
 
-  $LogPrint debug $0 ("No time source configured! Returning gracefully...");
+  $LogPrintOnce debug $0 ("No time source configured! Returning gracefully...");
   :return true;
 }
 
@@ -885,6 +896,17 @@
   :put [ $Unix2Dos $Input ];
 }
 
+# strip protocol from from url string
+:set ProtocolStrip do={
+  :local Input [ :tostr $1 ];
+
+  :local Pos [ :find $Input "://" ];
+  :if ([ :typeof $Pos ] = "nil") do={
+    :return $Input;
+  }
+  :return [ :pick $Input ($Pos + 3) [ :len $Input ] ];
+}
+
 # delay a random amount of seconds
 :set RandomDelay do={
   :local Time [ :tonum $1 ];
@@ -1496,13 +1518,14 @@
 
   :global CleanFilePath;
   :global EitherOr;
+  :global MAX;
 
   :set FileName [ $CleanFilePath $FileName ];
   :local I 1;
-  :local Delay ([ :totime [ $EitherOr $WaitTime 2s ] ] / 20);
+  :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 10);
 
   :while ([ :len [ /file/find where name=$FileName ] ] = 0) do={
-    :if ($I >= 20) do={
+    :if ($I >= 10) do={
       :return false;
     }
     :delay $Delay;