1 files changed, 17 insertions, 5 deletions
diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index 6d48a59..4413f07 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -3,6 +3,8 @@
 # Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
+# requires RouterOS, version=7.13
+#
 # send notifications via Ntfy (ntfy.sh)
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-ntfy.md
 
@@ -36,7 +38,8 @@
     :if ([ :typeof $Message ] = "array" ) do={
       :do {
         /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
-          ($Message->"url") http-header-field=($Message->"headers") http-data=($Message->"text") as-value;
+          http-header-field=($Message->"headers") http-data=($Message->"text") \
+          ($Message->"url") user=($Message->"user") password=($Message->"pass") as-value;
         :set ($NtfyQueue->$Id);
       } on-error={
         $LogPrint debug $0 ("Sending queued Ntfy message failed.");
@@ -60,17 +63,24 @@
   :global NtfyQueue;
   :global NtfyServer;
   :global NtfyServerOverride;
+  :global NtfyServerPass;
+  :global NtfyServerPassOverride;
+  :global NtfyServerUser;
+  :global NtfyServerUserOverride;
   :global NtfyTopic;
   :global NtfyTopicOverride;
 
   :global CertificateAvailable;
   :global EitherOr;
+  :global FetchUserAgentStr;
   :global IfThenElse;
   :global LogPrint;
   :global SymbolForNotification;
   :global UrlEncode;
 
   :local Server [ $EitherOr ($NtfyServerOverride->($Notification->"origin")) $NtfyServer ];
+  :local User [ $EitherOr ($NtfyServerUserOverride->($Notification->"origin")) $NtfyServerUser ];
+  :local Pass [ $EitherOr ($NtfyServerPassOverride->($Notification->"origin")) $NtfyServerPass ];
   :local Topic [ $EitherOr ($NtfyTopicOverride->($Notification->"origin")) $NtfyTopic ];
 
   :if ([ :len $Topic ] = 0) do={
@@ -78,7 +88,8 @@
   }
 
   :local Url ("https://" . $NtfyServer . "/" . [ $UrlEncode $NtfyTopic ]);
-  :local Headers ({ ("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \
+  :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ]; \
+    ("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \
     ("Title: " . "[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject")) });
   :local Text (($Notification->"message") . "\n");
   :if ([ :len ($Notification->"link") ] > 0) do={
@@ -93,7 +104,7 @@
       }
     }
     /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
-      $Url http-header-field=$Headers http-data=$Text as-value;
+      http-header-field=$Headers http-data=$Text $Url user=$User password=$Pass as-value;
   } on-error={
     $LogPrint info $0 ("Failed sending ntfy notification! Queuing...");
 
@@ -103,7 +114,8 @@
     :set Text ($Text . "\n" . [ $SymbolForNotification "alarm-clock" ] . \
       "This message was queued since " . [ /system/clock/get date ] . " " . \
       [ /system/clock/get time ] . " and may be obsolete.");
-    :set ($NtfyQueue->[ :len $NtfyQueue ]) { url=$Url; headers=$Headers; text=$Text };
+    :set ($NtfyQueue->[ :len $NtfyQueue ]) \
+      { url=$Url; user=$User; pass=$Pass; headers=$Headers; text=$Text };
     :if ([ :len [ /system/scheduler/find where name="_FlushNtfyQueue" ] ] = 0) do={
       /system/scheduler/add name="_FlushNtfyQueue" interval=1m start-time=startup \
         on-event=(":global FlushNtfyQueue; \$FlushNtfyQueue;");
@@ -123,7 +135,7 @@
 :set SendNtfy do={
   :global SendNtfy2;
 
-  $SendNtfy2 ({ subject=$1; message=$2; link=$3; silent=$4 });
+  $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
 }
 
 # send notification via ntfy - expects one array argument