aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-05 11:10:24 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commitdecb8fb17a8530765aec82f5b5df1bffa5407024 (patch)
tree9bfff31fa0b4dadb922870fe6c06c8841f21b599
parentb4146083296884be88ed73652dc1ee5f3ccf0c63 (diff)
daily-psk: drop support for wifiwave2
-rw-r--r--daily-psk.template.rsc9
-rw-r--r--daily-psk.wifiwave2.rsc94
-rw-r--r--doc/daily-psk.md22
3 files changed, 7 insertions, 118 deletions
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 93cefeb..c45f34a 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -63,21 +63,16 @@
:foreach AccList in=[ /caps-man/access-list/find where comment~$DailyPskMatchComment ] do={
:foreach AccList in=[ /interface/wifi/access-list/find where comment~$DailyPskMatchComment ] do={
- :foreach AccList in=[ /interface/wifiwave2/access-list/find where comment~$DailyPskMatchComment ] do={
:foreach AccList in=[ /interface/wireless/access-list/find where comment~$DailyPskMatchComment ] do={
:local SsidRegExp [ /caps-man/access-list/get $AccList ssid-regexp ];
:local SsidRegExp [ /interface/wifi/access-list/get $AccList ssid-regexp ];
- :local SsidRegExp [ /interface/wifiwave2/access-list/get $AccList ssid-regexp ];
:local Configuration ([ /caps-man/configuration/find where ssid~$SsidRegExp ]->0);
:local Configuration ([ /interface/wifi/configuration/find where ssid~$SsidRegExp ]->0);
- :local Configuration ([ /interface/wifiwave2/configuration/find where ssid~$SsidRegExp ]->0);
:local Ssid [ /caps-man/configuration/get $Configuration ssid ];
:local Ssid [ /interface/wifi/configuration/get $Configuration ssid ];
- :local Ssid [ /interface/wifiwave2/configuration/get $Configuration ssid ];
:local OldPsk [ /caps-man/access-list/get $AccList private-passphrase ];
:local OldPsk [ /interface/wifi/access-list/get $AccList passphrase ];
- :local OldPsk [ /interface/wifiwave2/access-list/get $AccList passphrase ];
- # /caps-man/ /interface/wifi/ /interface/wifiwave2/ above - /interface/wireless/ below
+ # /caps-man/ /interface/wifi/ above - /interface/wireless/ below
:local IntName [ /interface/wireless/access-list/get $AccList interface ];
:local Ssid [ /interface/wireless/get $IntName ssid ];
:local OldPsk [ /interface/wireless/access-list/get $AccList private-pre-shared-key ];
@@ -87,12 +82,10 @@
$LogPrintExit2 info $ScriptName ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
/caps-man/access-list/set $AccList private-passphrase=$NewPsk;
/interface/wifi/access-list/set $AccList passphrase=$NewPsk;
- /interface/wifiwave2/access-list/set $AccList passphrase=$NewPsk;
/interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk;
:if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
:if ([ :len [ /interface/wifi/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
- :if ([ :len [ /interface/wifiwave2/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
:if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={
:if ($Seen->$Ssid = 1) do={
$LogPrintExit2 debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
diff --git a/daily-psk.wifiwave2.rsc b/daily-psk.wifiwave2.rsc
deleted file mode 100644
index 4e71489..0000000
--- a/daily-psk.wifiwave2.rsc
+++ /dev/null
@@ -1,94 +0,0 @@
-#!rsc by RouterOS
-# RouterOS script: daily-psk.wifiwave2
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
-# Michael Gisbers <michael@gisbers.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
-#
-# requires RouterOS, version=7.12
-#
-# update daily PSK (pre shared key)
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/daily-psk.md
-#
-# !! Do not edit this file, it is generated from template!
-
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:local Main do={
- :local ScriptName [ :tostr $1 ];
-
- :global DailyPskMatchComment;
- :global DailyPskQrCodeUrl;
- :global Identity;
-
- :global FormatLine;
- :global LogPrintExit2;
- :global ScriptLock;
- :global SendNotification2;
- :global SymbolForNotification;
- :global UrlEncode;
- :global WaitForFile;
- :global WaitFullyConnected;
-
- :if ([ $ScriptLock $ScriptName ] = false) do={
- :return false;
- }
- $WaitFullyConnected;
-
- # return pseudo-random string for PSK
- :local GeneratePSK do={
- :local Date [ :tostr $1 ];
-
- :global DailyPskSecrets;
-
- :global ParseDate;
-
- :set Date [ $ParseDate $Date ];
-
- :local A ((14 - ($Date->"month")) / 12);
- :local B (($Date->"year") - $A);
- :local C (($Date->"month") + 12 * $A - 2);
- :local WeekDay (7000 + ($Date->"day") + $B + ($B / 4) - ($B / 100) + ($B / 400) + ((31 * $C) / 12));
- :set WeekDay ($WeekDay - (($WeekDay / 7) * 7));
-
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
- }
-
- :local Seen ({});
- :local Date [ /system/clock/get date ];
- :local NewPsk [ $GeneratePSK $Date ];
-
- :foreach AccList in=[ /interface/wifiwave2/access-list/find where comment~$DailyPskMatchComment ] do={
- :local SsidRegExp [ /interface/wifiwave2/access-list/get $AccList ssid-regexp ];
- :local Configuration ([ /interface/wifiwave2/configuration/find where ssid~$SsidRegExp ]->0);
- :local Ssid [ /interface/wifiwave2/configuration/get $Configuration ssid ];
- :local OldPsk [ /interface/wifiwave2/access-list/get $AccList passphrase ];
- :local Skip 0;
-
- :if ($NewPsk != $OldPsk) do={
- $LogPrintExit2 info $ScriptName ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
- /interface/wifiwave2/access-list/set $AccList passphrase=$NewPsk;
-
- :if ([ :len [ /interface/wifiwave2/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
- :if ($Seen->$Ssid = 1) do={
- $LogPrintExit2 debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
- } else={
- :local Link ($DailyPskQrCodeUrl . \
- "?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" . \
- [ $FormatLine "SSID" $Ssid ] . "\n" . \
- [ $FormatLine "PSK" $NewPsk ] . "\n" . \
- [ $FormatLine "Date" $Date ] . "\n\n" . \
- "A client device specific rule must not exist!"); link=$Link });
- :set ($Seen->$Ssid) 1;
- }
- }
- }
- }
-}
-
-$Main [ :jobname ];
diff --git a/doc/daily-psk.md b/doc/daily-psk.md
index 6eb656c..01fb9f6 100644
--- a/doc/daily-psk.md
+++ b/doc/daily-psk.md
@@ -21,23 +21,17 @@ Requirements and installation
Just install this script.
-Depending on whether you use `wifi` package (`/interface/wifi`), `wifiwave2`
-package (`/interface/wifiwave2`), legacy wifi with CAPsMAN (`/caps-man`)
-or local wireless interface (`/interface/wireless`) you need to install a
-different script and add schedulers to run the script:
+Depending on whether you use `wifi` package (`/interface/wifi`), legacy
+wifi with CAPsMAN (`/caps-man`) or local wireless interface
+(`/interface/wireless`) you need to install a different script and add
+schedulers to run the script:
-For `wifi` (RouterOS 7.13 and later):
+For `wifi`:
$ScriptInstallUpdate daily-psk.wifi;
/system/scheduler/add interval=1d name=daily-psk on-event="/system/script/run daily-psk.wifi;" start-time=03:00:00;
/system/scheduler/add name=daily-psk@startup on-event="/system/script/run daily-psk.wifi;" start-time=startup;
-For `wifiwave2` (up to RouterOS 7.12):
-
- $ScriptInstallUpdate daily-psk.wifiwave2;
- /system/scheduler/add interval=1d name=daily-psk on-event="/system/script/run daily-psk.wifiwave2;" start-time=03:00:00;
- /system/scheduler/add name=daily-psk@startup on-event="/system/script/run daily-psk.wifiwave2;" start-time=startup;
-
For legacy CAPsMAN:
$ScriptInstallUpdate daily-psk.capsman;
@@ -64,14 +58,10 @@ The configuration goes to `global-config-overlay`, these are the parameters:
> [`global-config`](../global-config.rsc) (the one without `-overlay`) to
> your local `global-config-overlay` and modify it to your specific needs.
-Then add an access list entry. For `wifi` (RouterOS 7.13 and later):
+Then add an access list entry. For `wifi`:
/interface/wifi/access-list/add comment="Daily PSK" ssid-regexp="-guest\$" passphrase="ToBeChangedDaily";
-For `wifiwave2` (up to RouterOS 7.12):
-
- /interface/wifiwave2/access-list/add comment="Daily PSK" ssid-regexp="-guest\$" passphrase="ToBeChangedDaily";
-
For legacy CAPsMAN:
/caps-man/access-list/add comment="Daily PSK" ssid-regexp="-guest\$" private-passphrase="ToBeChangedDaily";