aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--daily-psk.capsman.rsc121
-rw-r--r--daily-psk.local.rsc119
-rw-r--r--daily-psk.template.rsc163
-rw-r--r--daily-psk.wifi.rsc121
-rw-r--r--daily-psk.wifiwave2.rsc121
5 files changed, 335 insertions, 310 deletions
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index f576d1d..b47ae14 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -11,77 +11,82 @@
#
# !! Do not edit this file, it is generated from template!
-:local 0 [ :jobname ];
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:global DailyPskMatchComment;
-:global DailyPskQrCodeUrl;
-:global Identity;
+:local Main do={
+ :local ScriptName [ :tostr $1 ];
-:global FormatLine;
-:global LogPrintExit2;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
-:global UrlEncode;
-:global WaitForFile;
-:global WaitFullyConnected;
+ :global DailyPskMatchComment;
+ :global DailyPskQrCodeUrl;
+ :global Identity;
-$ScriptLock $0;
-$WaitFullyConnected;
+ :global FormatLine;
+ :global LogPrintExit2;
+ :global ScriptLock;
+ :global SendNotification2;
+ :global SymbolForNotification;
+ :global UrlEncode;
+ :global WaitForFile;
+ :global WaitFullyConnected;
-# return pseudo-random string for PSK
-:local GeneratePSK do={
- :local Date [ :tostr $1 ];
+ $ScriptLock $ScriptName;
+ $WaitFullyConnected;
- :global DailyPskSecrets;
+ # return pseudo-random string for PSK
+ :local GeneratePSK do={
+ :local Date [ :tostr $1 ];
- :global ParseDate;
+ :global DailyPskSecrets;
- :set Date [ $ParseDate $Date ];
+ :global ParseDate;
- :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));
+ :set Date [ $ParseDate $Date ];
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
-}
+ :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 ];
-:local Seen ({});
-:local Date [ /system/clock/get date ];
-:local NewPsk [ $GeneratePSK $Date ];
-
-:foreach AccList in=[ /caps-man/access-list/find where comment~$DailyPskMatchComment ] do={
- :local SsidRegExp [ /caps-man/access-list/get $AccList ssid-regexp ];
- :local Configuration ([ /caps-man/configuration/find where ssid~$SsidRegExp ]->0);
- :local Ssid [ /caps-man/configuration/get $Configuration ssid ];
- :local OldPsk [ /caps-man/access-list/get $AccList private-passphrase ];
- :local Skip 0;
-
- :if ($NewPsk != $OldPsk) do={
- $LogPrintExit2 info $0 ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
- /caps-man/access-list/set $AccList private-passphrase=$NewPsk;
-
- :if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
- :if ($Seen->$Ssid = 1) do={
- $LogPrintExit2 debug $0 ("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=$0; \
- 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;
+ :foreach AccList in=[ /caps-man/access-list/find where comment~$DailyPskMatchComment ] do={
+ :local SsidRegExp [ /caps-man/access-list/get $AccList ssid-regexp ];
+ :local Configuration ([ /caps-man/configuration/find where ssid~$SsidRegExp ]->0);
+ :local Ssid [ /caps-man/configuration/get $Configuration ssid ];
+ :local OldPsk [ /caps-man/access-list/get $AccList private-passphrase ];
+ :local Skip 0;
+
+ :if ($NewPsk != $OldPsk) do={
+ $LogPrintExit2 info $ScriptName ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
+ /caps-man/access-list/set $AccList private-passphrase=$NewPsk;
+
+ :if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 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/daily-psk.local.rsc b/daily-psk.local.rsc
index da12038..72e20ef 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -11,76 +11,81 @@
#
# !! Do not edit this file, it is generated from template!
-:local 0 [ :jobname ];
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:global DailyPskMatchComment;
-:global DailyPskQrCodeUrl;
-:global Identity;
+:local Main do={
+ :local ScriptName [ :tostr $1 ];
-:global FormatLine;
-:global LogPrintExit2;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
-:global UrlEncode;
-:global WaitForFile;
-:global WaitFullyConnected;
+ :global DailyPskMatchComment;
+ :global DailyPskQrCodeUrl;
+ :global Identity;
-$ScriptLock $0;
-$WaitFullyConnected;
+ :global FormatLine;
+ :global LogPrintExit2;
+ :global ScriptLock;
+ :global SendNotification2;
+ :global SymbolForNotification;
+ :global UrlEncode;
+ :global WaitForFile;
+ :global WaitFullyConnected;
-# return pseudo-random string for PSK
-:local GeneratePSK do={
- :local Date [ :tostr $1 ];
+ $ScriptLock $ScriptName;
+ $WaitFullyConnected;
- :global DailyPskSecrets;
+ # return pseudo-random string for PSK
+ :local GeneratePSK do={
+ :local Date [ :tostr $1 ];
- :global ParseDate;
+ :global DailyPskSecrets;
- :set Date [ $ParseDate $Date ];
+ :global ParseDate;
- :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));
+ :set Date [ $ParseDate $Date ];
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
-}
+ :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 ];
-:local Seen ({});
-:local Date [ /system/clock/get date ];
-:local NewPsk [ $GeneratePSK $Date ];
-
-:foreach AccList in=[ /interface/wireless/access-list/find where comment~$DailyPskMatchComment ] do={
- :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 ];
- :local Skip 0;
-
- :if ($NewPsk != $OldPsk) do={
- $LogPrintExit2 info $0 ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
- /interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk;
-
- :if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={
- :if ($Seen->$Ssid = 1) do={
- $LogPrintExit2 debug $0 ("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=$0; \
- 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;
+ :foreach AccList in=[ /interface/wireless/access-list/find where comment~$DailyPskMatchComment ] do={
+ :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 ];
+ :local Skip 0;
+
+ :if ($NewPsk != $OldPsk) do={
+ $LogPrintExit2 info $ScriptName ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
+ /interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk;
+
+ :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;
+ } 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/daily-psk.template.rsc b/daily-psk.template.rsc
index d1abce2..2f2838e 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -12,98 +12,103 @@
# !! This is just a template to generate the real script!
# !! Pattern '%TEMPL%' is replaced, paths are filtered.
-:local 0 [ :jobname ];
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:global DailyPskMatchComment;
-:global DailyPskQrCodeUrl;
-:global Identity;
+:local Main do={
+ :local ScriptName [ :tostr $1 ];
-:global FormatLine;
-:global LogPrintExit2;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
-:global UrlEncode;
-:global WaitForFile;
-:global WaitFullyConnected;
+ :global DailyPskMatchComment;
+ :global DailyPskQrCodeUrl;
+ :global Identity;
-$ScriptLock $0;
-$WaitFullyConnected;
+ :global FormatLine;
+ :global LogPrintExit2;
+ :global ScriptLock;
+ :global SendNotification2;
+ :global SymbolForNotification;
+ :global UrlEncode;
+ :global WaitForFile;
+ :global WaitFullyConnected;
-# return pseudo-random string for PSK
-:local GeneratePSK do={
- :local Date [ :tostr $1 ];
+ $ScriptLock $ScriptName;
+ $WaitFullyConnected;
- :global DailyPskSecrets;
+ # return pseudo-random string for PSK
+ :local GeneratePSK do={
+ :local Date [ :tostr $1 ];
- :global ParseDate;
+ :global DailyPskSecrets;
- :set Date [ $ParseDate $Date ];
+ :global ParseDate;
- :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));
+ :set Date [ $ParseDate $Date ];
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
-}
+ :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 ];
-:local Seen ({});
-:local Date [ /system/clock/get date ];
-:local NewPsk [ $GeneratePSK $Date ];
-
-: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
- :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 ];
- :local Skip 0;
-
- :if ($NewPsk != $OldPsk) do={
- $LogPrintExit2 info $0 ("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 $0 ("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=$0; \
- 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;
+ :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
+ :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 ];
+ :local Skip 0;
+
+ :if ($NewPsk != $OldPsk) do={
+ $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;
+ } 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/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 488d921..e013dd1 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -11,77 +11,82 @@
#
# !! Do not edit this file, it is generated from template!
-:local 0 [ :jobname ];
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:global DailyPskMatchComment;
-:global DailyPskQrCodeUrl;
-:global Identity;
+:local Main do={
+ :local ScriptName [ :tostr $1 ];
-:global FormatLine;
-:global LogPrintExit2;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
-:global UrlEncode;
-:global WaitForFile;
-:global WaitFullyConnected;
+ :global DailyPskMatchComment;
+ :global DailyPskQrCodeUrl;
+ :global Identity;
-$ScriptLock $0;
-$WaitFullyConnected;
+ :global FormatLine;
+ :global LogPrintExit2;
+ :global ScriptLock;
+ :global SendNotification2;
+ :global SymbolForNotification;
+ :global UrlEncode;
+ :global WaitForFile;
+ :global WaitFullyConnected;
-# return pseudo-random string for PSK
-:local GeneratePSK do={
- :local Date [ :tostr $1 ];
+ $ScriptLock $ScriptName;
+ $WaitFullyConnected;
- :global DailyPskSecrets;
+ # return pseudo-random string for PSK
+ :local GeneratePSK do={
+ :local Date [ :tostr $1 ];
- :global ParseDate;
+ :global DailyPskSecrets;
- :set Date [ $ParseDate $Date ];
+ :global ParseDate;
- :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));
+ :set Date [ $ParseDate $Date ];
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
-}
+ :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 ];
-:local Seen ({});
-:local Date [ /system/clock/get date ];
-:local NewPsk [ $GeneratePSK $Date ];
-
-:foreach AccList in=[ /interface/wifi/access-list/find where comment~$DailyPskMatchComment ] do={
- :local SsidRegExp [ /interface/wifi/access-list/get $AccList ssid-regexp ];
- :local Configuration ([ /interface/wifi/configuration/find where ssid~$SsidRegExp ]->0);
- :local Ssid [ /interface/wifi/configuration/get $Configuration ssid ];
- :local OldPsk [ /interface/wifi/access-list/get $AccList passphrase ];
- :local Skip 0;
-
- :if ($NewPsk != $OldPsk) do={
- $LogPrintExit2 info $0 ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
- /interface/wifi/access-list/set $AccList passphrase=$NewPsk;
-
- :if ([ :len [ /interface/wifi/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
- :if ($Seen->$Ssid = 1) do={
- $LogPrintExit2 debug $0 ("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=$0; \
- 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;
+ :foreach AccList in=[ /interface/wifi/access-list/find where comment~$DailyPskMatchComment ] do={
+ :local SsidRegExp [ /interface/wifi/access-list/get $AccList ssid-regexp ];
+ :local Configuration ([ /interface/wifi/configuration/find where ssid~$SsidRegExp ]->0);
+ :local Ssid [ /interface/wifi/configuration/get $Configuration ssid ];
+ :local OldPsk [ /interface/wifi/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/wifi/access-list/set $AccList passphrase=$NewPsk;
+
+ :if ([ :len [ /interface/wifi/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/daily-psk.wifiwave2.rsc b/daily-psk.wifiwave2.rsc
index 89c5c25..75cfb7a 100644
--- a/daily-psk.wifiwave2.rsc
+++ b/daily-psk.wifiwave2.rsc
@@ -11,77 +11,82 @@
#
# !! Do not edit this file, it is generated from template!
-:local 0 [ :jobname ];
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:global DailyPskMatchComment;
-:global DailyPskQrCodeUrl;
-:global Identity;
+:local Main do={
+ :local ScriptName [ :tostr $1 ];
-:global FormatLine;
-:global LogPrintExit2;
-:global ScriptLock;
-:global SendNotification2;
-:global SymbolForNotification;
-:global UrlEncode;
-:global WaitForFile;
-:global WaitFullyConnected;
+ :global DailyPskMatchComment;
+ :global DailyPskQrCodeUrl;
+ :global Identity;
-$ScriptLock $0;
-$WaitFullyConnected;
+ :global FormatLine;
+ :global LogPrintExit2;
+ :global ScriptLock;
+ :global SendNotification2;
+ :global SymbolForNotification;
+ :global UrlEncode;
+ :global WaitForFile;
+ :global WaitFullyConnected;
-# return pseudo-random string for PSK
-:local GeneratePSK do={
- :local Date [ :tostr $1 ];
+ $ScriptLock $ScriptName;
+ $WaitFullyConnected;
- :global DailyPskSecrets;
+ # return pseudo-random string for PSK
+ :local GeneratePSK do={
+ :local Date [ :tostr $1 ];
- :global ParseDate;
+ :global DailyPskSecrets;
- :set Date [ $ParseDate $Date ];
+ :global ParseDate;
- :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));
+ :set Date [ $ParseDate $Date ];
- :return (($DailyPskSecrets->0->(($Date->"day") - 1)) . \
- ($DailyPskSecrets->1->(($Date->"month") - 1)) . \
- ($DailyPskSecrets->2->$WeekDay));
-}
+ :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 ];
-: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 $0 ("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 $0 ("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=$0; \
- 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;
+ :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 ];
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-01 06:22:02 +0000