aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2021-07-11 22:21:47 +0200
committerGravatar Christian Hesse <mail@eworm.de>2021-07-11 22:30:00 +0200
commit29ececda9b9bbb16392b778bd8ff012ed88427ca (patch)
tree7a573c171fe5e3d408f24c9cd9977994c02a0764
parent483506b1898464366a30411a1f8ed336b508f870 (diff)
collect-wireless-mac: check for existence of mac address
Chance are that $RegVal is an array with just an id - no idea why this happens. So do not check for array but existence of mac address.
-rw-r--r--collect-wireless-mac.capsman74
-rw-r--r--collect-wireless-mac.local76
-rw-r--r--collect-wireless-mac.template76
3 files changed, 119 insertions, 107 deletions
diff --git a/collect-wireless-mac.capsman b/collect-wireless-mac.capsman
index cddc5fa..5f6d750 100644
--- a/collect-wireless-mac.capsman
+++ b/collect-wireless-mac.capsman
@@ -39,43 +39,47 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
}
- :local AccessList ([ / caps-man access-list find where mac-address=($RegVal->"mac-address") ]->0);
- :if ([ :len $AccessList ] > 0) do={
- $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
- [ / caps-man access-list get $AccessList comment ]) false;
- }
+ :if ([ :len ($RegVal->"mac-address") ] > 0) do={
+ :local AccessList ([ / caps-man access-list find where mac-address=($RegVal->"mac-address") ]->0);
+ :if ([ :len $AccessList ] > 0) do={
+ $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
+ [ / caps-man access-list get $AccessList comment ]) false;
+ }
- :if ([ :typeof $RegVal ] = "array" && [ :len $AccessList ] = 0) do={
- :local Address "no dhcp lease";
- :local DnsName "no dhcp lease";
- :local HostName "no dhcp lease";
- :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
- :if ([ :len $Lease ] > 0) do={
- :set Address [ / ip dhcp-server lease get $Lease address ];
- :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
- :set DnsName "no dns name";
- :local DnsRec ([ / ip dns static find where address=$Address ]->0);
- :if ([ :len $DnsRec ] > 0) do={
- :set DnsName [ / ip dns static get $DnsRec name ];
+ :if ([ :len $AccessList ] = 0) do={
+ :local Address "no dhcp lease";
+ :local DnsName "no dhcp lease";
+ :local HostName "no dhcp lease";
+ :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
+ :if ([ :len $Lease ] > 0) do={
+ :set Address [ / ip dhcp-server lease get $Lease address ];
+ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
+ :set DnsName "no dns name";
+ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
+ :if ([ :len $DnsRec ] > 0) do={
+ :set DnsName [ / ip dns static get $DnsRec name ];
+ }
}
+ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
+ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
+ :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
+ "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
+ $LogPrintExit2 info $0 $Message false;
+ / caps-man access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
+ $SendNotification2 ({ origin=$0; \
+ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
+ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
+ "Controller: " . $Identity . "\n" . \
+ "Interface: " . $RegVal->"interface" . "\n" . \
+ "SSID: " . $RegVal->"ssid" . "\n" . \
+ "MAC: " . $RegVal->"mac-address" . "\n" . \
+ "Vendor: " . $Vendor . "\n" . \
+ "Hostname: " . $HostName . "\n" . \
+ "Address: " . $Address . "\n" . \
+ "DNS name: " . $DnsName . "\n" . \
+ "Date: " . $DateTime) });
}
- :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
- :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
- :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
- "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
- $LogPrintExit2 info $0 $Message false;
- / caps-man access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
- $SendNotification2 ({ origin=$0; \
- subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
- message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
- "Controller: " . $Identity . "\n" . \
- "Interface: " . $RegVal->"interface" . "\n" . \
- "SSID: " . $RegVal->"ssid" . "\n" . \
- "MAC: " . $RegVal->"mac-address" . "\n" . \
- "Vendor: " . $Vendor . "\n" . \
- "Hostname: " . $HostName . "\n" . \
- "Address: " . $Address . "\n" . \
- "DNS name: " . $DnsName . "\n" . \
- "Date: " . $DateTime) });
+ } else={
+ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false;
}
}
diff --git a/collect-wireless-mac.local b/collect-wireless-mac.local
index 7ef6b18..a2bcf5b 100644
--- a/collect-wireless-mac.local
+++ b/collect-wireless-mac.local
@@ -39,44 +39,48 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
}
- :local AccessList ([ / interface wireless access-list find where mac-address=($RegVal->"mac-address") ]->0);
- :if ([ :len $AccessList ] > 0) do={
- $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
- [ / interface wireless access-list get $AccessList comment ]) false;
- }
+ :if ([ :len ($RegVal->"mac-address") ] > 0) do={
+ :local AccessList ([ / interface wireless access-list find where mac-address=($RegVal->"mac-address") ]->0);
+ :if ([ :len $AccessList ] > 0) do={
+ $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
+ [ / interface wireless access-list get $AccessList comment ]) false;
+ }
- :if ([ :typeof $RegVal ] = "array" && [ :len $AccessList ] = 0) do={
- :local Address "no dhcp lease";
- :local DnsName "no dhcp lease";
- :local HostName "no dhcp lease";
- :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
- :if ([ :len $Lease ] > 0) do={
- :set Address [ / ip dhcp-server lease get $Lease address ];
- :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
- :set DnsName "no dns name";
- :local DnsRec ([ / ip dns static find where address=$Address ]->0);
- :if ([ :len $DnsRec ] > 0) do={
- :set DnsName [ / ip dns static get $DnsRec name ];
+ :if ([ :len $AccessList ] = 0) do={
+ :local Address "no dhcp lease";
+ :local DnsName "no dhcp lease";
+ :local HostName "no dhcp lease";
+ :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
+ :if ([ :len $Lease ] > 0) do={
+ :set Address [ / ip dhcp-server lease get $Lease address ];
+ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
+ :set DnsName "no dns name";
+ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
+ :if ([ :len $DnsRec ] > 0) do={
+ :set DnsName [ / ip dns static get $DnsRec name ];
+ }
}
+ :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
+ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
+ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
+ :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
+ "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
+ $LogPrintExit2 info $0 $Message false;
+ / interface wireless access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
+ $SendNotification2 ({ origin=$0; \
+ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
+ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
+ "Controller: " . $Identity . "\n" . \
+ "Interface: " . $RegVal->"interface" . "\n" . \
+ "SSID: " . $RegVal->"ssid" . "\n" . \
+ "MAC: " . $RegVal->"mac-address" . "\n" . \
+ "Vendor: " . $Vendor . "\n" . \
+ "Hostname: " . $HostName . "\n" . \
+ "Address: " . $Address . "\n" . \
+ "DNS name: " . $DnsName . "\n" . \
+ "Date: " . $DateTime) });
}
- :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
- :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
- :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
- :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
- "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
- $LogPrintExit2 info $0 $Message false;
- / interface wireless access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
- $SendNotification2 ({ origin=$0; \
- subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
- message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
- "Controller: " . $Identity . "\n" . \
- "Interface: " . $RegVal->"interface" . "\n" . \
- "SSID: " . $RegVal->"ssid" . "\n" . \
- "MAC: " . $RegVal->"mac-address" . "\n" . \
- "Vendor: " . $Vendor . "\n" . \
- "Hostname: " . $HostName . "\n" . \
- "Address: " . $Address . "\n" . \
- "DNS name: " . $DnsName . "\n" . \
- "Date: " . $DateTime) });
+ } else={
+ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false;
}
}
diff --git a/collect-wireless-mac.template b/collect-wireless-mac.template
index aa3f5bf..7b6848b 100644
--- a/collect-wireless-mac.template
+++ b/collect-wireless-mac.template
@@ -40,44 +40,48 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
}
- :local AccessList ([ / %PATH% access-list find where mac-address=($RegVal->"mac-address") ]->0);
- :if ([ :len $AccessList ] > 0) do={
- $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
- [ / %PATH% access-list get $AccessList comment ]) false;
- }
+ :if ([ :len ($RegVal->"mac-address") ] > 0) do={
+ :local AccessList ([ / %PATH% access-list find where mac-address=($RegVal->"mac-address") ]->0);
+ :if ([ :len $AccessList ] > 0) do={
+ $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
+ [ / %PATH% access-list get $AccessList comment ]) false;
+ }
- :if ([ :typeof $RegVal ] = "array" && [ :len $AccessList ] = 0) do={
- :local Address "no dhcp lease";
- :local DnsName "no dhcp lease";
- :local HostName "no dhcp lease";
- :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
- :if ([ :len $Lease ] > 0) do={
- :set Address [ / ip dhcp-server lease get $Lease address ];
- :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
- :set DnsName "no dns name";
- :local DnsRec ([ / ip dns static find where address=$Address ]->0);
- :if ([ :len $DnsRec ] > 0) do={
- :set DnsName [ / ip dns static get $DnsRec name ];
+ :if ([ :len $AccessList ] = 0) do={
+ :local Address "no dhcp lease";
+ :local DnsName "no dhcp lease";
+ :local HostName "no dhcp lease";
+ :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
+ :if ([ :len $Lease ] > 0) do={
+ :set Address [ / ip dhcp-server lease get $Lease address ];
+ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
+ :set DnsName "no dns name";
+ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
+ :if ([ :len $DnsRec ] > 0) do={
+ :set DnsName [ / ip dns static get $DnsRec name ];
+ }
}
+ :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
+ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
+ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
+ :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
+ "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
+ $LogPrintExit2 info $0 $Message false;
+ / %PATH% access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
+ $SendNotification2 ({ origin=$0; \
+ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
+ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
+ "Controller: " . $Identity . "\n" . \
+ "Interface: " . $RegVal->"interface" . "\n" . \
+ "SSID: " . $RegVal->"ssid" . "\n" . \
+ "MAC: " . $RegVal->"mac-address" . "\n" . \
+ "Vendor: " . $Vendor . "\n" . \
+ "Hostname: " . $HostName . "\n" . \
+ "Address: " . $Address . "\n" . \
+ "DNS name: " . $DnsName . "\n" . \
+ "Date: " . $DateTime) });
}
- :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
- :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
- :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
- :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
- "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
- $LogPrintExit2 info $0 $Message false;
- / %PATH% access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
- $SendNotification2 ({ origin=$0; \
- subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
- message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \
- "Controller: " . $Identity . "\n" . \
- "Interface: " . $RegVal->"interface" . "\n" . \
- "SSID: " . $RegVal->"ssid" . "\n" . \
- "MAC: " . $RegVal->"mac-address" . "\n" . \
- "Vendor: " . $Vendor . "\n" . \
- "Hostname: " . $HostName . "\n" . \
- "Address: " . $Address . "\n" . \
- "DNS name: " . $DnsName . "\n" . \
- "Date: " . $DateTime) });
+ } else={
+ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false;
}
}