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.
This commit is contained in:
Christian Hesse 2021-07-11 22:21:47 +02:00
parent 483506b189
commit 29ececda9b
3 changed files with 125 additions and 113 deletions

View file

@ -39,43 +39,47 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false; $LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
} }
:local AccessList ([ / caps-man access-list find where mac-address=($RegVal->"mac-address") ]->0); :if ([ :len ($RegVal->"mac-address") ] > 0) do={
:if ([ :len $AccessList ] > 0) do={ :local AccessList ([ / caps-man access-list find where mac-address=($RegVal->"mac-address") ]->0);
$LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \ :if ([ :len $AccessList ] > 0) do={
[ / caps-man access-list get $AccessList comment ]) false; $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 ];
}
} }
:local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
:local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; :if ([ :len $AccessList ] = 0) do={
:local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ :local Address "no dhcp lease";
"first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface"); :local DnsName "no dhcp lease";
$LogPrintExit2 info $0 $Message false; :local HostName "no dhcp lease";
/ caps-man access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes; :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
$SendNotification2 ({ origin=$0; \ :if ([ :len $Lease ] > 0) do={
subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ :set Address [ / ip dhcp-server lease get $Lease address ];
message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
"Controller: " . $Identity . "\n" . \ :set DnsName "no dns name";
"Interface: " . $RegVal->"interface" . "\n" . \ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
"SSID: " . $RegVal->"ssid" . "\n" . \ :if ([ :len $DnsRec ] > 0) do={
"MAC: " . $RegVal->"mac-address" . "\n" . \ :set DnsName [ / ip dns static get $DnsRec name ];
"Vendor: " . $Vendor . "\n" . \ }
"Hostname: " . $HostName . "\n" . \ }
"Address: " . $Address . "\n" . \ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
"DNS name: " . $DnsName . "\n" . \ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
"Date: " . $DateTime) }); :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;
} }
} }

View file

@ -39,44 +39,48 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false; $LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
} }
:local AccessList ([ / interface wireless access-list find where mac-address=($RegVal->"mac-address") ]->0); :if ([ :len ($RegVal->"mac-address") ] > 0) do={
:if ([ :len $AccessList ] > 0) do={ :local AccessList ([ / interface wireless access-list find where mac-address=($RegVal->"mac-address") ]->0);
$LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \ :if ([ :len $AccessList ] > 0) do={
[ / interface wireless access-list get $AccessList comment ]) false; $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 ];
}
} }
:set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
:local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]); :if ([ :len $AccessList ] = 0) do={
:local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; :local Address "no dhcp lease";
:local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ :local DnsName "no dhcp lease";
"first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface"); :local HostName "no dhcp lease";
$LogPrintExit2 info $0 $Message false; :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
/ interface wireless access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes; :if ([ :len $Lease ] > 0) do={
$SendNotification2 ({ origin=$0; \ :set Address [ / ip dhcp-server lease get $Lease address ];
subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ :set DnsName "no dns name";
"Controller: " . $Identity . "\n" . \ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
"Interface: " . $RegVal->"interface" . "\n" . \ :if ([ :len $DnsRec ] > 0) do={
"SSID: " . $RegVal->"ssid" . "\n" . \ :set DnsName [ / ip dns static get $DnsRec name ];
"MAC: " . $RegVal->"mac-address" . "\n" . \ }
"Vendor: " . $Vendor . "\n" . \ }
"Hostname: " . $HostName . "\n" . \ :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
"Address: " . $Address . "\n" . \ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
"DNS name: " . $DnsName . "\n" . \ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
"Date: " . $DateTime) }); :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;
} }
} }

View file

@ -40,44 +40,48 @@ $ScriptLock $0 false 10;
$LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false; $LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
} }
:local AccessList ([ / %PATH% access-list find where mac-address=($RegVal->"mac-address") ]->0); :if ([ :len ($RegVal->"mac-address") ] > 0) do={
:if ([ :len $AccessList ] > 0) do={ :local AccessList ([ / %PATH% access-list find where mac-address=($RegVal->"mac-address") ]->0);
$LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \ :if ([ :len $AccessList ] > 0) do={
[ / %PATH% access-list get $AccessList comment ]) false; $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 ];
}
} }
:set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
:local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]); :if ([ :len $AccessList ] = 0) do={
:local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; :local Address "no dhcp lease";
:local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ :local DnsName "no dhcp lease";
"first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface"); :local HostName "no dhcp lease";
$LogPrintExit2 info $0 $Message false; :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
/ %PATH% access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes; :if ([ :len $Lease ] > 0) do={
$SendNotification2 ({ origin=$0; \ :set Address [ / ip dhcp-server lease get $Lease address ];
subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ :set DnsName "no dns name";
"Controller: " . $Identity . "\n" . \ :local DnsRec ([ / ip dns static find where address=$Address ]->0);
"Interface: " . $RegVal->"interface" . "\n" . \ :if ([ :len $DnsRec ] > 0) do={
"SSID: " . $RegVal->"ssid" . "\n" . \ :set DnsName [ / ip dns static get $DnsRec name ];
"MAC: " . $RegVal->"mac-address" . "\n" . \ }
"Vendor: " . $Vendor . "\n" . \ }
"Hostname: " . $HostName . "\n" . \ :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ];
"Address: " . $Address . "\n" . \ :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
"DNS name: " . $DnsName . "\n" . \ :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
"Date: " . $DateTime) }); :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;
} }
} }