groove/routeros-scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mod/notification-ntfy: add basic authentication in headers

Browse source 
This makes it a bit easier and straight forward as we pass the
headers anyway.
This commit is contained in:
Christian Hesse 2024-12-13 17:48:49 +01:00
parent d1b9b1b410
commit 6bee467550
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mod/notification-ntfy.rsc
View file

@ -39,7 +39,7 @@
:do { :do {
/tool/fetch check-certificate=yes-without-crl output=none http-method=post \ /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
http-header-field=($Message->"headers") http-data=($Message->"text") \ http-header-field=($Message->"headers") http-data=($Message->"text") \
($Message->"url") user=($Message->"user") password=($Message->"pass") as-value; ($Message->"url") as-value;
:set ($NtfyQueue->$Id); :set ($NtfyQueue->$Id);
} on-error={ } on-error={
$LogPrint debug $0 ("Sending queued Ntfy message failed."); $LogPrint debug $0 ("Sending queued Ntfy message failed.");
@ -96,6 +96,9 @@
:local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ]; \ :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ]; \
("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \ ("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \
("Title: " . "[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject")) }); ("Title: " . "[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject")) });
:if ([ :len $User ] > 0 || [ :len $Pass ] > 0) do={
:set Headers ($Headers, ("Authorization: Basic " . [ :convert to=base64 ($User . ":" . $Pass) ]));
}
:if ([ :len $Token ] > 0) do={ :if ([ :len $Token ] > 0) do={
:set Headers ($Headers, ("Authorization: Bearer " . $Token)); :set Headers ($Headers, ("Authorization: Bearer " . $Token));
} }
@ -112,7 +115,7 @@
} }
} }
/tool/fetch check-certificate=yes-without-crl output=none http-method=post \ /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
http-header-field=$Headers http-data=$Text $Url user=$User password=$Pass as-value; http-header-field=$Headers http-data=$Text $Url as-value;
} on-error={ } on-error={
$LogPrint info $0 ("Failed sending ntfy notification! Queuing..."); $LogPrint info $0 ("Failed sending ntfy notification! Queuing...");
@ -123,7 +126,7 @@
"This message was queued since " . [ /system/clock/get date ] . " " . \ "This message was queued since " . [ /system/clock/get date ] . " " . \
[ /system/clock/get time ] . " and may be obsolete."); [ /system/clock/get time ] . " and may be obsolete.");
:set ($NtfyQueue->[ :len $NtfyQueue ]) \ :set ($NtfyQueue->[ :len $NtfyQueue ]) \
{ url=$Url; user=$User; pass=$Pass; headers=$Headers; text=$Text }; { url=$Url; headers=$Headers; text=$Text };
:if ([ :len [ /system/scheduler/find where name="_FlushNtfyQueue" ] ] = 0) do={ :if ([ :len [ /system/scheduler/find where name="_FlushNtfyQueue" ] ] = 0) do={
/system/scheduler/add name="_FlushNtfyQueue" interval=1m start-time=startup \ /system/scheduler/add name="_FlushNtfyQueue" interval=1m start-time=startup \
on-event=(":global FlushNtfyQueue; \$FlushNtfyQueue;"); on-event=(":global FlushNtfyQueue; \$FlushNtfyQueue;");