Merge branch 'dhcp-to-dns' into next

... and drop the workaround. This requires RouterOS 7.22beta3.

check-certificates.rsc

@@ -29,6 +29,7 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
+  :global UrlEncode;
   :global WaitFullyConnected;
 
   :local CheckCertificatesDownloadImport do={
@@ -44,10 +45,11 @@
     :global FetchUserAgentStr;
     :global LogPrint;
     :global RmFile;
+    :global UrlEncode;
     :global WaitForFile;
 
     :foreach Type in={ "p12"; "pem" } do={
-      :local CertFileName ([ :convert to=url $FetchName ] . "." . $Type);
+      :local CertFileName ([ $UrlEncode $FetchName ] . "." . $Type);
       $LogPrint debug $ScriptName ("Trying type '" . $Type . "' for '" . $CertName . \
           "' (file '" . $CertFileName . "')...");
 
@@ -198,7 +200,7 @@
       } else={
         $LogPrint debug $ScriptName ("Certificate '" . $CertVal->"name" . "' was not updated, but replaced.");
 
-        :local CertNew [ /certificate/find where name~("^" . [ $EscapeForRegEx [ :convert to=url $FetchName ] ] . "\\.(p12|pem)_[0-9]+\$") \
+        :local CertNew [ /certificate/find where name~("^" . [ $EscapeForRegEx [ $UrlEncode $FetchName ] ] . "\\.(p12|pem)_[0-9]+\$") \
           (common-name=($CertVal->"common-name") or subject-alt-name~("(^|\\W)(DNS|IP):" . [ $EscapeForRegEx $LastName ] . "(\\W|\$)")) \
           fingerprint!=[ :tostr ($CertVal->"fingerprint") ] ];
         :local CertNewVal [ /certificate/get $CertNew ];

daily-psk.capsman.rsc

@@ -26,6 +26,7 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
+  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -75,7 +76,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \

daily-psk.local.rsc

@@ -26,6 +26,7 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
+  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -74,7 +75,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \

daily-psk.template.rsc

@@ -27,6 +27,7 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
+  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -90,7 +91,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \

daily-psk.wifi.rsc

@@ -26,6 +26,7 @@
   :global ScriptLock;
   :global SendNotification2;
   :global SymbolForNotification;
+  :global UrlEncode;
   :global WaitForFile;
   :global WaitFullyConnected;
 
@@ -75,7 +76,7 @@
           $LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
         } else={
           :local Link ($DailyPskQrCodeUrl . \
-              "?scale=8&level=1&ssid=" . [ :convert to=url $Ssid ] . "&pass=" . [ :convert to=url $NewPsk ]);
+              "?scale=8&level=1&ssid=" . [ $UrlEncode $Ssid ] . "&pass=" . [ $UrlEncode $NewPsk ]);
           $SendNotification2 ({ origin=$ScriptName; \
             subject=([ $SymbolForNotification "calendar" ] . "daily PSK " . $Ssid); \
             message=("This is the daily PSK on " . $Identity . ":\n\n" . \

general/style.css

@@ -43,10 +43,10 @@ hr {
   clear: both;
 }
 img.notification {
-  box-shadow: 3px 3px 7px rgba(100,100,100,0.7);
+  box-shadow: 5px 5px 7px gray;
 }
 img.screenshot {
-  box-shadow: 3px 3px 7px rgba(100,100,100,0.7);
+  box-shadow: 5px 5px 7px gray;
 }
 img.logo {
   float: left;
@@ -72,7 +72,7 @@ pre {
 pre.code {
   background-color: #f8f8f8;
   border: 1px solid #ccc;
-  box-shadow: 3px 3px 7px rgba(100,100,100,0.7);
+  box-shadow: 5px 5px 7px gray;
   overflow: auto;
   padding: 6px 10px;
   border-radius: 3px;

global-functions.d/deprecated.rsc

@@ -10,7 +10,6 @@
 
 :global ExitError;
 :global HexToNum;
-:global UrlEncode;
 
 # wrapper for $ExitOnError with additional parameter
 :set ExitError do={
@@ -37,30 +36,3 @@
 
   :return [ :tonum ("0x" . $Input) ];
 }
-
-# url encoding
-:set UrlEncode do={
-  :local Input [ :tostr $1 ];
-
-  :if ([ :len $Input ] = 0) do={
-    :return "";
-  }
-
-  :local Return "";
-  :local Chars ("\n\r !\"#\$%&'()*+,:;<=>?@[\\]^`{|}~");
-  :local Subs { "%0A"; "%0D"; "%20"; "%21"; "%22"; "%23"; "%24"; "%25"; "%26"; "%27";
-         "%28"; "%29"; "%2A"; "%2B"; "%2C"; "%3A"; "%3B"; "%3C"; "%3D"; "%3E"; "%3F";
-         "%40"; "%5B"; "%5C"; "%5D"; "%5E"; "%60"; "%7B"; "%7C"; "%7D"; "%7E" };
-
-  :for I from=0 to=([ :len $Input ] - 1) do={
-    :local Char [ :pick $Input $I ];
-    :local Replace [ :find $Chars $Char ];
-
-    :if ([ :typeof $Replace ] = "num") do={
-      :set Char ($Subs->$Replace);
-    }
-    :set Return ($Return . $Char);
-  }
-
-  :return $Return;
-}

global-functions.rsc

@@ -80,6 +80,7 @@
 :global SymbolByUnicodeName;
 :global SymbolForNotification;
 :global Unix2Dos;
+:global UrlEncode;
 :global ValidateSyntax;
 :global VersionToNum;
 :global WaitDefaultRouteReachable;
@@ -1736,6 +1737,33 @@
   :return [ :tocrlf [ :tostr $1 ] ];
 }
 
+# url encoding
+:set UrlEncode do={
+  :local Input [ :tostr $1 ];
+
+  :if ([ :len $Input ] = 0) do={
+    :return "";
+  }
+
+  :local Return "";
+  :local Chars ("\n\r !\"#\$%&'()*+,:;<=>?@[\\]^`{|}~");
+  :local Subs { "%0A"; "%0D"; "%20"; "%21"; "%22"; "%23"; "%24"; "%25"; "%26"; "%27";
+         "%28"; "%29"; "%2A"; "%2B"; "%2C"; "%3A"; "%3B"; "%3C"; "%3D"; "%3E"; "%3F";
+         "%40"; "%5B"; "%5C"; "%5D"; "%5E"; "%60"; "%7B"; "%7C"; "%7D"; "%7E" };
+
+  :for I from=0 to=([ :len $Input ] - 1) do={
+    :local Char [ :pick $Input $I ];
+    :local Replace [ :find $Chars $Char ];
+
+    :if ([ :typeof $Replace ] = "num") do={
+      :set Char ($Subs->$Replace);
+    }
+    :set Return ($Return . $Char);
+  }
+
+  :return $Return;
+}
+
 # basic syntax validation
 :set ValidateSyntax do={
   :local Code [ :tostr $1 ];

mod/notification-matrix.rsc

@@ -242,6 +242,7 @@
 
   :global FetchUserAgentStr;
   :global LogPrint;
+  :global UrlEncode;
 
   :global MatrixAccessToken;
   :global MatrixHomeServer;
@@ -250,8 +251,8 @@
   :onerror Err {
     /tool/fetch check-certificate=yes-without-crl output=none \
         http-header-field=({ [ $FetchUserAgentStr $0 ] }) http-method=post http-data="" \
-        ("https://" . $MatrixHomeServer . "/_matrix/client/r0/rooms/" . [ :convert to=url $MatrixRoom ] . \
+        ("https://" . $MatrixHomeServer . "/_matrix/client/r0/rooms/" . [ $UrlEncode $MatrixRoom ] . \
-        "/join?access_token=" . [ :convert to=url $MatrixAccessToken ]) as-value;
+        "/join?access_token=" . [ $UrlEncode $MatrixAccessToken ]) as-value;
     $LogPrint debug $0 ("Joined the room.");
   } do={
     $LogPrint error $0 ("Failed joining the room: " . $Err);

mod/notification-ntfy.rsc

@@ -80,6 +80,7 @@
   :global IfThenElse;
   :global LogPrint;
   :global SymbolForNotification;
+  :global UrlEncode;
 
   :local Server [ $EitherOr ($NtfyServerOverride->($Notification->"origin")) $NtfyServer ];
   :local User [ $EitherOr ($NtfyServerUserOverride->($Notification->"origin")) $NtfyServerUser ];
@@ -91,7 +92,7 @@
     :return false;
   }
 
-  :local Url ("https://" . $Server . "/" . [ :convert to=url $Topic ]);
+  :local Url ("https://" . $Server . "/" . [ $UrlEncode $Topic ]);
   :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ]; \
     ("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \
     ("Title: " . "[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject")) });

mod/notification-telegram.rsc

@@ -126,6 +126,7 @@
   :global LogPrint;
   :global ProtocolStrip;
   :global SymbolForNotification;
+  :global UrlEncode;
 
   :local EscapeMD do={
     :local Text [ :tostr $1 ];
@@ -202,7 +203,7 @@
     }
     :local Data ([ /tool/fetch check-certificate=yes-without-crl output=user http-method=post \
       ("https://api.telegram.org/bot" . $TokenId . "/sendMessage") \
-      http-data=($HTTPData . "&text=" . [ :convert to=url $Text ]) as-value ]->"data");
+      http-data=($HTTPData . "&text=" . [ $UrlEncode $Text ]) as-value ]->"data");
     :set ($TelegramMessageIDs->[ :tostr ([ :deserialize from=json value=$Data ]->"result"->"message_id") ]) 1;
   } do={
     $LogPrint info $0 ("Failed sending Telegram notification: " . $Err . " - Queuing...");
@@ -214,7 +215,7 @@
       [ $EscapeMD ("This message was queued since _" . [ /system/clock/get date ] . \
       " " . [ /system/clock/get time ] . "_ and may be obsolete.") "plain" "_" ]);
     :set ($TelegramQueue->[ :len $TelegramQueue ]) { tokenid=$TokenId;
-      http-data=($HTTPData . "&text=" . [ :convert to=url $Text ]) };
+      http-data=($HTTPData . "&text=" . [ $UrlEncode $Text ]) };
     :if ([ :len [ /system/scheduler/find where name="_FlushTelegramQueue" ] ] = 0) do={
       /system/scheduler/add name="_FlushTelegramQueue" interval=1m start-time=startup \
         on-event=(":global FlushTelegramQueue; \$FlushTelegramQueue;");