aboutsummaryrefslogtreecommitdiffstats
path: root/hotspot-to-wpa
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2021-12-21 13:15:35 +0100
committerGravatar Christian Hesse <mail@eworm.de>2022-01-07 15:28:08 +0100
commit491f53a8ce4a4a76fcaa4b1b99ec85e5f00b2ee5 (patch)
tree89e1373edaff220340f448130d0083cc4c061db7 /hotspot-to-wpa
parent97f35dcf0e99738e9170a413f6be52c989708b9c (diff)
hotspot-to-wpa: support settings from templatechange-74
Diffstat (limited to 'hotspot-to-wpa')
-rw-r--r--hotspot-to-wpa33
1 files changed, 31 insertions, 2 deletions
diff --git a/hotspot-to-wpa b/hotspot-to-wpa
index b573b3f..c40e08a 100644
--- a/hotspot-to-wpa
+++ b/hotspot-to-wpa
@@ -10,12 +10,15 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:global EitherOr;
:global LogPrintExit2;
+:global ParseKeyValueStore;
:local MacAddress $"mac-address";
:local UserName $username;
:local Date [ / system clock get date ];
-:local PassWord [ / ip hotspot user get [ find where name=$UserName ] password ];
+:local Hotspot [ / ip hotspot host get [ find where mac-address=$MacAddress authorized ] server ];
+:local UserVal [ / ip hotspot user get [ find where name=$UserName ] ];
:if ([ :len [ / caps-man access-list find where comment="--- hotspot-to-wpa above ---" disabled ] ] = 0) do={
/ caps-man access-list add comment="--- hotspot-to-wpa above ---" disabled=yes;
@@ -28,4 +31,30 @@ $LogPrintExit2 info $0 ("Adding/updating accesslist entry for mac address " . $M
/ caps-man access-list remove [ find where mac-address=$MacAddress comment~"^hotspot-to-wpa: " ];
/ caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \
- mac-address=$MacAddress private-passphrase=$PassWord ssid-regexp="-wpa\$" place-before=$PlaceBefore;
+ mac-address=$MacAddress private-passphrase=($UserVal->"password") ssid-regexp="-wpa\$" place-before=$PlaceBefore;
+
+:local Template [ / caps-man access-list get ([ find where comment=("hotspot-to-wpa template " . $Hotspot) disabled ]->0) ];
+:local UserInfo [ $ParseKeyValueStore ($UserVal->"comment") ];
+:local Entry [ / caps-man access-list find where mac-address=$MacAddress \
+ comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) ];
+
+:local PrivatePassphrase [ $EitherOr ($UserInfo->"private-passphrase") ($Template->"private-passphrase") ];
+:if ([ :len $PrivatePassphrase ] > 0) do={
+ :if ($PrivatePassphrase = "ignore") do={
+ / caps-man access-list set $Entry !private-passphrase;
+ } else={
+ / caps-man access-list set $Entry private-passphrase=$PrivatePassphrase;
+ }
+}
+:local SsidRegexp [ $EitherOr ($UserInfo->"ssid-regexp") ($Template->"ssid-regexp") ];
+:if ([ :len $SsidRegexp ] > 0) do={
+ / caps-man access-list set $Entry ssid-regexp=$SsidRegexp;
+}
+:local VlanId [ $EitherOr ($UserInfo->"vlan-id") ($Template->"vlan-id") ];
+:if ([ :len $VlanId ] > 0) do={
+ / caps-man access-list set $Entry vlan-id=$VlanId;
+}
+:local VlanMode [ $EitherOr ($UserInfo->"vlan-mode") ($Template->"vlan-mode") ];
+:if ([ :len $VlanMode] > 0) do={
+ / caps-man access-list set $Entry vlan-mode=$VlanMode;
+}