Commit graph

407 commits

Author SHA1 Message Date
Christian Hesse
e111832462 global-functions: $NotificationFunctions->"email": do not declare unused function 2021-12-14 00:06:10 +01:00
Christian Hesse
0fab371d1a global-functions: $DeviceInfo: show license level if available
This now shows license level for CHR.

The property is named different for Routerboards. As these have the
license bundled to hardware anyway we do not show it there.
2021-12-13 22:25:55 +01:00
Christian Hesse
40dea01670 README: changes for RouterOS v6 2021-12-13 11:36:03 +01:00
Christian Hesse
6dede0c49b global-functions: $ScriptLock: simplify cleanup code 2021-12-10 07:34:09 +01:00
Christian Hesse
a46fd48187 global-functions: $ScriptLock: remove ticket in a loop
This was not required with RouterOS v6, but for any reason removing a
ticket may fail with RouterOS v7 in very rare cases. So remove in a
loop...
2021-12-09 22:48:30 +01:00
Christian Hesse
b423e6ed0f global-functions: $ScriptLock: cleanup in dedicated function 2021-12-09 22:48:30 +01:00
Christian Hesse
cdcab4599a global-functions: $ScriptLock: initialize earlier 2021-12-09 12:52:03 +01:00
Christian Hesse
9c87b5a222 global-functions: $ScriptLock: initialize empty array on cleanup 2021-12-09 12:52:03 +01:00
Christian Hesse
a98965d727 global-functions: give a hint on RouterOS v7 2021-12-07 23:01:01 +01:00
Christian Hesse
1f5cc39b3c global-config: load overlay automatically 2021-12-07 21:58:03 +01:00
Christian Hesse
dab04fd63e README: changes for RouterOS v7 2021-12-07 11:11:19 +01:00
Christian Hesse
5b786e10c8 global-functions: $DeviceInfo: add current firmware
(I would like to show a note if the upgrade is pending... But did not
find a way to get that information. Is there?)
2021-11-22 09:57:57 +01:00
Christian Hesse
2625cc09a5 check-health: support hard lower limit for voltage
... to detect slow decrease of voltage, for example with UPS.
2021-11-16 22:21:37 +01:00
Christian Hesse
d87c50cf68 check-health: indicate voltage increase or decrease 2021-11-16 22:21:37 +01:00
Christian Hesse
185fe2c730 reintroduce global-wait 2021-11-16 22:21:37 +01:00
Christian Hesse
3b997d3087 global-functions: drop deprecated function $LogPrintExit
... which has been replaced by $LogPrintExit2 some time ago.
2021-11-16 22:21:22 +01:00
Christian Hesse
8fc88c73f8 shorten modules directory name (global-functions.d -> mod) 2021-11-15 22:18:10 +01:00
Christian Hesse
f484e45b6a bridge-port-to-default -> global-functions.d/bridge-port-to 2021-11-15 22:18:10 +01:00
Christian Hesse
b6215ba958 add global-functions.d/bridge-port-vlan 2021-11-12 16:09:35 +01:00
Christian Hesse
99a95d310e global-functions: $NotificationFunctions->"email": check for valid settings
No need to queue mails if 'address' and 'from' are not specified...
2021-10-01 20:39:59 +02:00
Christian Hesse
f780b205a9 global-functions: $DeviceInfo: do not fail on non-RouterBoard with ROS 7.x 2021-10-01 09:00:36 +02:00
Christian Hesse
9295d06fe2 global-functions.d/inspectvar: add $InspectVar...
to inspect variables. This is useful for variables with (nested) arrays,
for example inspecting $NetwatchNotify (from netwatch-notify):

[admin@Mikrotik] > $InspectVar $NetwatchNotify
-type-> array
  -key-> quad-one
    -type-> array
      -key-> count
        -type-> num
        -value-> 0
      -key-> notified
        -type-> bool
        -value-> false
      -key-> parent
        -type-> nothing
      -key-> resolve-failed
        -type-> nothing
      -key-> since
        -type-> nothing
  -key-> example.com
    -type-> array
      -key-> count
        -type-> num
        -value-> 0
      -key-> notified
        -type-> bool
        -value-> false
      -key-> parent
        -type-> str
        -value-> quad-one
      -key-> resolve-failed
        -type-> nothing
      -key-> since
        -type-> nothing
2021-09-21 21:26:13 +02:00
Christian Hesse
ce78d7d9e9 global-functions: notify about move of $IPCalc and $ScriptRunOnce to modules
Just install with...

$ScriptInstallUpdate global-functions.d/ipcalc

... and/or...

$ScriptInstallUpdate global-functions.d/scriptrunonce

... and use the functions as before.
2021-09-21 21:26:13 +02:00
Christian Hesse
012db05a93 global-functions: move $ScriptRunOnce to optional module 2021-09-21 21:26:13 +02:00
Christian Hesse
8b05d25487 global-functions: move $IPCalc to optional module 2021-09-21 21:26:13 +02:00
Christian Hesse
70f9c7926b global-functions*: syntax for ROS 7.x
Strings with escape sequence have to be enclosed in parentheses. Looks
like RouterOS 7.x is stricter here...
2021-09-08 14:33:02 +02:00
Christian Hesse
150c228197 global-functions: $CertificateAvailable: drop version check 2021-09-02 08:55:34 +02:00
Christian Hesse
832e899cda global-functions: $RequiredRouterOS: allow to use without warning 2021-09-01 14:05:55 +02:00
Christian Hesse
ae8e22941e global-functions: $ScriptLock: handle array by index
This should mitigate race conditions while rewriting the array.
2021-08-31 21:40:42 +02:00
Christian Hesse
d356d6f57c global-functions: $ScriptLock: do not store but calculate job count
This should mitigate some more race conditions.
2021-08-31 21:40:42 +02:00
Christian Hesse
4269bc9548 global-functions: $ScriptLock: check for successful removal of ticket
The script is already locked, so there is no second script to remove a
ticket at the same time. However a new script can add a new ticket and
overwrite the removal... Thus check for successful removal anyway.
2021-07-25 23:19:54 +02:00
Ben Harris
9fba3dd8df global-functions: $ScriptLock: fix off-by-one check...
... for stale job tickets

Signed-off-by: Christian Hesse <mail@eworm.de>
2021-07-15 10:17:25 +02:00
Christian Hesse
483506b189 global-functions: introduce $ScriptRunOnce 2021-07-10 23:18:04 +02:00
Christian Hesse
d1ef710093 global-functions: $ScriptInstallUpdate: add error handling for changelog 2021-07-09 22:04:15 +02:00
Christian Hesse
dc7fc0d385 finally remove old scripts 2021-07-09 12:46:03 +02:00
Christian Hesse
b864db1e38 global-functions: $ScriptInstallUpdate: add error handling for migration 2021-07-09 12:46:03 +02:00
Christian Hesse
f694e1e54d global-functions: $ScriptInstallUpdate: drop unused variable
This was a left-over from re-run message.
2021-07-09 12:46:03 +02:00
Christian Hesse
81cba72bec global-functions: $ScriptInstallUpdate: drop the migration pattern 2021-07-09 12:46:03 +02:00
Christian Hesse
bccb7c3452 netwatch-notify: implement pre-down hook 2021-07-09 12:46:03 +02:00
Christian Hesse
4192d30d7e global-functions: $ScriptLock: drop variable, just return 2021-07-09 10:40:13 +02:00
Christian Hesse
a4e548eb80 global-functions: $ScriptLock: make ticket management more reliable 2021-07-08 21:03:31 +02:00
Michael Gisbers
d5edcbd3b6 check-routeros-update: allow update for cap
If CAPsMAN is running on a device with just 16MB flash downloading the
packages is not possible (or at least lost at reboot). So allow a CAP to
update with opt-in.
2021-07-01 22:56:18 +02:00
Christian Hesse
aad91d90ea global-functions: $ScriptLock: use hex string for ticket
Does not matter what the ticket looks like, but using hex string it is
not converted to number.
2021-07-01 22:37:03 +02:00
Christian Hesse
0b4c1861cf global-functions: $ScriptLock: use a limit on lock...
... to make sure it does not lock forever.
2021-07-01 22:37:03 +02:00
Christian Hesse
7de3457f44 global-functions: $ScriptLock: allow to wait for lock 2021-06-30 21:28:27 +02:00
Christian Hesse
5d30886e59 global-functions: $ScriptLock: rework with tickets
Getting the order right is not easy... We use a global variable to store
"tickets" in an array. Based on that scripts know their order.
2021-06-30 21:28:27 +02:00
Christian Hesse
b2d0ed1240 global-functions: $ScriptLock: check if script is running 2021-06-30 21:18:38 +02:00
Christian Hesse
e13e3cfe34 global-functions: $ScriptLock: check if script exists 2021-06-30 21:16:17 +02:00
Christian Hesse
301ad4b3e5 global-functions: $ScriptLock: allow to return...
... with true instead of breaking with error.
2021-06-30 11:13:50 +02:00
Christian Hesse
89f8dc7120 global-functions: $LogPrintExit2: allow origin-specific debug
Add something like this in global-config-overlay:

:global PrintDebugOverride {
  "dhcp-to-dns"=true;
}
2021-06-30 11:12:12 +02:00
Christian Hesse
679917390b global-functions: $GetRandomNumber: use $HexToNum 2021-06-28 21:33:13 +02:00
Christian Hesse
cfc400b3d5 global-functions: $GetRandom20CharHex: do not remove otp...
... as it is instantly invalid anyway.
2021-06-28 21:33:13 +02:00
Christian Hesse
855399b2bc global-functions: $RandomDelay: allow to specify unit in second argument 2021-06-24 22:28:08 +02:00
Christian Hesse
1a404195d5 hotspot-to-wpa: add optional cleanup script 2021-06-23 15:15:16 +02:00
Christian Hesse
f5b1f9cb97 celebrating the 1.000th commit - hooray! 2021-06-23 15:14:38 +02:00
Christian Hesse
64496d76c2 notify about tag in scripts 2021-06-23 10:26:49 +02:00
Christian Hesse
7fb4fdfca2 global-functions: $MkDir: abuse smb share to create directory
The smb feature is provided by system package... So we have it anyway.
It gives some benefits compared to abusing fetch:

* It is faster!
* No need to alter, enable and restore a service! (The share is created disabled.)
* Firewall rules can not break this.
* No temporary file is created.
* Less code!

Let's hope we do not introduce new breakage.

Closes #14
2021-06-21 22:58:17 +02:00
Christian Hesse
34c9da5aa2 global-functions: $NotificationFunctions->"email": support removing attachment 2021-06-17 15:06:35 +02:00
Christian Hesse
c60c96e32a global-functions: $HexToNum: properly handle capital characters 2021-06-16 10:16:35 +02:00
Christian Hesse
babcc00dcd global-functions: introduce $HexToNum 2021-06-15 14:38:02 +02:00
Christian Hesse
4cc8a0e160 global-functions: $SendEMail2: fix name in array
This did not send anything at all...

Fixes #12
2021-06-10 07:52:43 +02:00
Christian Hesse
de61c14c60 log-forward: implement reverse logic to include messages...
... even if a filter matches to exclude them. Let's have an example:

:global LogForwardFilter "(debug|info)";
:global LogForwardInclude "account";

This will forward everything about topic *account* (login, logout,
failed login, ...) - even with topic *info*.
2021-06-09 14:42:43 +02:00
Christian Hesse
50d1706a06 global-functions: make Telegram notifications a module 2021-06-08 21:07:25 +02:00
Michael Gisbers
8375673d93 global-functions: implement notifications via Matrix
Matrix is an open network for secure, decentralized communication - and
it has a web api.

A warning on message type: Using 'm.notice' breaks rendering on Element
for Android (no fixed width font) and does not pop up desktop
notification. Thus we use 'm.text'. Should be safe as we do not send the
messages in response to other messages.

https://matrix.org/
2021-06-08 21:07:25 +02:00
Christian Hesse
7a43bfbc6a global-functions: make notification functions extensible
This allows to add notification functions without overloading functions.
Just add it into the array:

:set ($NotificationFunctions->"fancy-messager") do={
  # notification magic here...
}

Adding functions $SendFancyMessager and/or $SendFancyMessager2 may be
useful. Optionally a function to flush a queue may be required.

A BIG FAT WARNING about function parameters:
Calling a function from array results in $0 for the function name being
skipped. That's why we have to add the function name manually!
2021-06-08 21:07:24 +02:00
Christian Hesse
b866eca3ec global-functions: $ScriptInstallUpdate: drop the re-run message
This makes sense just rarely... For important changes we have the
migration mechanism. So just drop this.
2021-06-08 21:07:24 +02:00
Christian Hesse
f9a2afdeda global-functions: $ScriptInstallUpdate: reload configuration later 2021-06-08 21:07:24 +02:00
Christian Hesse
2315d6bc59 global-functions: $ScriptInstallUpdate: reload functions just once 2021-06-08 21:07:24 +02:00
Christian Hesse
57b0f1b2dd global-functions: support loading modules
If script's name starts with "global-functions.d/" it is handled
as module:

 * loaded at startup
 * triggers reload on update
2021-06-08 21:07:24 +02:00
Christian Hesse
45dd33c90a global-functions: $DownloadPackage: quote package name 2021-05-19 14:03:18 +02:00
Christian Hesse
4427cabd0e update Let's Encrypt trust chain
Drop 'DST Root CA X3', use 'ISRG Root X1' instead. The migration code
makes sure that...

 * the intermediate certificate 'R3' is signed by 'ISRG Root X1'
 * 'ISRG Root X1' is self-signed, not cross-signed by 'DST Root CA X3'
 * 'DST Root CA X3' is finally gone
2021-05-18 16:33:35 +02:00
Christian Hesse
862417b8d3 add 'ipsec-to-dns' 2021-05-17 16:41:51 +02:00
Christian Hesse
cfb31e844c netwatch-notify: support dynamic address update 2021-05-06 15:11:05 +02:00
Christian Hesse
666cd3f184 upload-backup: add second symbol 2021-04-29 22:37:36 +02:00
Christian Hesse
aa4ad27b0a cloud-backup: add second symbol 2021-04-29 22:37:36 +02:00
Christian Hesse
d2560db5c9 email-backup: use $SendEMail2
This drops $EmailBackupTo & $EmailBackupCc from settings! Use settings
overwrite if required:

:global EmailGeneralToOverride {
  "email-backup"="backup@example.com";
}
2021-04-29 22:37:36 +02:00
Christian Hesse
529cefffaf global-functions: $SendEMail2: support file attachments 2021-04-29 22:37:36 +02:00
Christian Hesse
7ed54a4fe7 global-functions: $DownloadPackage: be more verbose 2021-04-29 14:55:51 +02:00
Christian Hesse
0f445fd528 global-functions: $DownloadPackage: fix typo 2021-04-29 14:40:29 +02:00
Christian Hesse
5d973a095a global-functions: $FlushEmailQueue: try to avoid running simultaneously
We can not check the status for a *specific* mail, so running simultaneously
is a problem. Let's increase the interval to the number of queue items -
and hope it helps. Decrease when done.
2021-04-29 09:12:17 +02:00
Christian Hesse
56b7523775 global-functions: notify about settings override 2021-04-28 15:33:37 +02:00
Christian Hesse
c640823881 global-functions: $ScriptInstallUpdate: pass origin to $SendNotification2 2021-04-28 13:58:37 +02:00
Christian Hesse
2d0ce17629 global-functions: $SendTelegram2: support overriding token id and chat id 2021-04-28 13:58:37 +02:00
Christian Hesse
bd05ca1133 global-functions: $SendTelegram2: store token id in queue 2021-04-28 13:58:37 +02:00
Christian Hesse
42dcdae11e global-functions: $SendEMail2: support overriding to and cc 2021-04-28 13:58:37 +02:00
Christian Hesse
e97b394536 global-functions: introduce $EitherOr 2021-04-28 13:58:37 +02:00
Christian Hesse
76f32e3927 global-functions: $ScriptInstallUpdate: use $SendNotification2 2021-04-28 13:58:37 +02:00
Christian Hesse
c7a2eecd3c global-functions: introduce $SendEMail2, $SendNotification2 & $SendTelegram2
These accept just one array as argument. Adding new features is possible
without breaking the API.

These calls are the same for now:

$SendNotification "Subject..." "Message...";
$SendNotification2 ({ subject="Subject..."; message="Message..." });

But the latter will bring more features in future.
2021-04-28 13:58:37 +02:00
Christian Hesse
96613e9bdd global-functions: $LogPrintExit: add deprecation warning 2021-04-26 16:40:02 +02:00
Christian Hesse
025f14ae13 global-functions: CertificateDownload: silence certificate import 2021-03-21 22:28:09 +01:00
Christian Hesse
7c4ab95394 global-functions: introduce $EscapeForRegEx 2021-03-17 08:51:23 +01:00
Christian Hesse
4472784274 global-functions: $CertificateAvailable: use pre-test loop
This is required to test for root CA (without intermediate) directly.
2021-03-10 23:16:39 +01:00
Christian Hesse
d1741c99fe global-functions: $ScriptInstallUpdate: run migration unconditionally
We want the migration to run even if the notification is disabled.
2021-03-04 12:13:20 +01:00
Christian Hesse
842c44b10a global-functions: $DNSIsResolving: have a final return 2021-03-03 14:54:22 +01:00
Christian Hesse
e65802007f global-functions: introduce and use $QuotedPrintable
Some mail clients do not like unencoded utf-8 in subject... Let's
encode in quoted-printable to fix.
2021-03-03 14:54:22 +01:00
Christian Hesse
7829a6c33a global-functions: $UrlEncode: simplify code 2021-03-03 14:54:22 +01:00
Christian Hesse
a019ff861e global-functions: $ValidateSyntax: add line breaks
This makes sure the closing curly bracket is not hidden in comment.
2021-02-26 20:59:27 +01:00
Christian Hesse
8e00545267 global-functions: $ScriptInstallUpdate: validate syntax of changelog and migration code 2021-02-26 15:38:33 +01:00
Christian Hesse
c48ad50f24 global-functions: introduce and use $ValidateSyntax 2021-02-26 14:49:10 +01:00
Christian Hesse
bd6b67ad7a global-functions: $ScriptInstallUpdate: add syntax validation 2021-02-25 16:50:10 +01:00