From fe5386fbec298d8a0f588c5bc5c033d84b798bbd Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 9 Jul 2018 16:44:44 +0200 Subject: introduce templates for scripts depending on capsman or local wireless --- Makefile | 9 +++++++ collect-wireless-mac | 64 -------------------------------------------- collect-wireless-mac.capsman | 62 ++++++++++++++++++++++++++++++++++++++++++ collect-wireless-mac.in | 63 +++++++++++++++++++++++++++++++++++++++++++ collect-wireless-mac.local | 62 ++++++++++++++++++++++++++++++++++++++++++ dhcp-lease-comment | 22 --------------- dhcp-lease-comment.capsman | 20 ++++++++++++++ dhcp-lease-comment.in | 21 +++++++++++++++ dhcp-lease-comment.local | 20 ++++++++++++++ lease-script | 4 ++- 10 files changed, 260 insertions(+), 87 deletions(-) create mode 100644 Makefile delete mode 100644 collect-wireless-mac create mode 100644 collect-wireless-mac.capsman create mode 100644 collect-wireless-mac.in create mode 100644 collect-wireless-mac.local delete mode 100644 dhcp-lease-comment create mode 100644 dhcp-lease-comment.capsman create mode 100644 dhcp-lease-comment.in create mode 100644 dhcp-lease-comment.local diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..23169cf --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +GENERATE = collect-wireless-mac.capsman collect-wireless-mac.local dhcp-lease-comment.capsman dhcp-lease-comment.local + +all: $(GENERATE) + +%.local: *.in Makefile + sed -e 's/%PATH%/interface wireless/' -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' < $(basename $@).in > $@ + +%.capsman: *.in Makefile + sed -e 's/%PATH%/caps-man/' -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' < $(basename $@).in > $@ diff --git a/collect-wireless-mac b/collect-wireless-mac deleted file mode 100644 index ee93a11..0000000 --- a/collect-wireless-mac +++ /dev/null @@ -1,64 +0,0 @@ -# RouterOS script: collect-wireless-mac -# Copyright (c) 2013-2018 Christian Hesse -# -# collect wireless mac adresses in access list -# -# this supports local wireless and caps-man when updating paths: -# $ sed -i '/^$/,$s/caps-man/interface wireless/' collect-wireless-mac -# $ sed -i '/^$/,$s/interface wireless/caps-man/' collect-wireless-mac - -:global "identity"; -:global "email-general-to"; -:global "email-general-cc"; - -:local "place-before" [ / caps-man access-list find where comment="--- collected above ---" disabled ]; -:if ([ :len $"place-before" ] = 0) do={ - :error "Missing disabled access-list entry with comment '--- collected above ---'"; -} - -:foreach regtbl in=[ / caps-man registration-table find ] do={ - :local mac [ / caps-man registration-table get $regtbl mac-address ]; - :local acclst [ :pick [ / caps-man access-list find where mac-address=$mac ] 0 ]; - :if ( [ :len $acclst ] = 0 ) do={ - :local hostname "no dhcp lease"; - :local address "no dhcp lease"; - :local lease [ / ip dhcp-server lease find where mac-address=$mac ]; - :if ( [ :len $lease ] > 0 ) do={ - :set hostname [ / ip dhcp-server lease get $lease host-name ]; - :set address [ / ip dhcp-server lease get $lease address ]; - } - :if ( [ :len $hostname ] = 0 ) do={ - :set hostname "no hostname"; - } - :if ( [ :len $address ] = 0 ) do={ - :set address "no address"; - } - :local regentry [ / caps-man registration-table find where mac-address=$mac ]; - :local interface [ / caps-man registration-table get $regentry interface ]; - :local ssid; - :if ("caps-man" = ("caps" . "-man")) do={ - :set ssid [ / caps-man registration-table get $regentry ssid ]; - } else={ - # keep two spaces here to protect against replace! - :set ssid [ / interface wireless get [ find where name=$interface ] ssid ]; - } - :local datetime ([ / system clock get date ] . " " . [ / system clock get time ]); - :local message ("unknown MAC address " . $mac . " (" . $hostname . ") first seen on " . \ - $datetime . " connected to SSID " . $ssid . ", interface " . $interface); - / log info $message; - / caps-man access-list add place-before=$"place-before" comment=$message mac-address=$mac disabled=yes; - / tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \ - subject=("[" . $identity . "] " . $mac . " connected to " . $ssid) \ - body=("A device with unknown MAC address connected to " . $ssid . " on " . $identity . ".\n\n" . \ - "Controller: " . $identity . "\n" . \ - "Interface: " . $interface . "\n" . \ - "SSID: " . $ssid . "\n" . \ - "MAC: " . $mac . "\n" . \ - "Hostname: " . $hostname . "\n" . \ - "Address: " . $address . "\n" . \ - "Date: " . $datetime); - } else={ - :local comment [ / caps-man access-list get $acclst comment ]; - :log debug ("MAC address " . $mac . " already known: " . $comment); - } -} diff --git a/collect-wireless-mac.capsman b/collect-wireless-mac.capsman new file mode 100644 index 0000000..f6fabf3 --- /dev/null +++ b/collect-wireless-mac.capsman @@ -0,0 +1,62 @@ +# RouterOS script: collect-wireless-mac +# Copyright (c) 2013-2018 Christian Hesse +# +# collect wireless mac adresses in access list +# +# !! Do not edit this file, it is generated from template! + +:global "identity"; +:global "email-general-to"; +:global "email-general-cc"; + +:local "place-before" [ / caps-man access-list find where comment="--- collected above ---" disabled ]; +:if ([ :len $"place-before" ] = 0) do={ + :error "Missing disabled access-list entry with comment '--- collected above ---'"; +} + +:foreach regtbl in=[ / caps-man registration-table find ] do={ + :local mac [ / caps-man registration-table get $regtbl mac-address ]; + :local acclst [ :pick [ / caps-man access-list find where mac-address=$mac ] 0 ]; + :if ( [ :len $acclst ] = 0 ) do={ + :local hostname "no dhcp lease"; + :local address "no dhcp lease"; + :local lease [ / ip dhcp-server lease find where mac-address=$mac ]; + :if ( [ :len $lease ] > 0 ) do={ + :set hostname [ / ip dhcp-server lease get $lease host-name ]; + :set address [ / ip dhcp-server lease get $lease address ]; + } + :if ( [ :len $hostname ] = 0 ) do={ + :set hostname "no hostname"; + } + :if ( [ :len $address ] = 0 ) do={ + :set address "no address"; + } + :local regentry [ / caps-man registration-table find where mac-address=$mac ]; + :local interface [ / caps-man registration-table get $regentry interface ]; + :local ssid; + :if ("caps-man" = ("caps" . "-man")) do={ + :set ssid [ / caps-man registration-table get $regentry ssid ]; + } else={ + # keep two spaces here to protect against replace! + :set ssid [ / interface wireless get [ find where name=$interface ] ssid ]; + } + :local datetime ([ / system clock get date ] . " " . [ / system clock get time ]); + :local message ("unknown MAC address " . $mac . " (" . $hostname . ") first seen on " . \ + $datetime . " connected to SSID " . $ssid . ", interface " . $interface); + / log info $message; + / caps-man access-list add place-before=$"place-before" comment=$message mac-address=$mac disabled=yes; + / tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \ + subject=("[" . $identity . "] " . $mac . " connected to " . $ssid) \ + body=("A device with unknown MAC address connected to " . $ssid . " on " . $identity . ".\n\n" . \ + "Controller: " . $identity . "\n" . \ + "Interface: " . $interface . "\n" . \ + "SSID: " . $ssid . "\n" . \ + "MAC: " . $mac . "\n" . \ + "Hostname: " . $hostname . "\n" . \ + "Address: " . $address . "\n" . \ + "Date: " . $datetime); + } else={ + :local comment [ / caps-man access-list get $acclst comment ]; + :log debug ("MAC address " . $mac . " already known: " . $comment); + } +} diff --git a/collect-wireless-mac.in b/collect-wireless-mac.in new file mode 100644 index 0000000..79cbeff --- /dev/null +++ b/collect-wireless-mac.in @@ -0,0 +1,63 @@ +# RouterOS script: collect-wireless-mac +# Copyright (c) 2013-2018 Christian Hesse +# +# collect wireless mac adresses in access list +# +# !! This is just a template! Replace '%PATH%' with 'capsman' +# !! or 'interface wireless'! + +:global "identity"; +:global "email-general-to"; +:global "email-general-cc"; + +:local "place-before" [ / %PATH% access-list find where comment="--- collected above ---" disabled ]; +:if ([ :len $"place-before" ] = 0) do={ + :error "Missing disabled access-list entry with comment '--- collected above ---'"; +} + +:foreach regtbl in=[ / %PATH% registration-table find ] do={ + :local mac [ / %PATH% registration-table get $regtbl mac-address ]; + :local acclst [ :pick [ / %PATH% access-list find where mac-address=$mac ] 0 ]; + :if ( [ :len $acclst ] = 0 ) do={ + :local hostname "no dhcp lease"; + :local address "no dhcp lease"; + :local lease [ / ip dhcp-server lease find where mac-address=$mac ]; + :if ( [ :len $lease ] > 0 ) do={ + :set hostname [ / ip dhcp-server lease get $lease host-name ]; + :set address [ / ip dhcp-server lease get $lease address ]; + } + :if ( [ :len $hostname ] = 0 ) do={ + :set hostname "no hostname"; + } + :if ( [ :len $address ] = 0 ) do={ + :set address "no address"; + } + :local regentry [ / %PATH% registration-table find where mac-address=$mac ]; + :local interface [ / %PATH% registration-table get $regentry interface ]; + :local ssid; + :if ("%PATH%" = ("caps" . "-man")) do={ + :set ssid [ / %PATH% registration-table get $regentry ssid ]; + } else={ + # keep two spaces here to protect against replace! + :set ssid [ / interface wireless get [ find where name=$interface ] ssid ]; + } + :local datetime ([ / system clock get date ] . " " . [ / system clock get time ]); + :local message ("unknown MAC address " . $mac . " (" . $hostname . ") first seen on " . \ + $datetime . " connected to SSID " . $ssid . ", interface " . $interface); + / log info $message; + / %PATH% access-list add place-before=$"place-before" comment=$message mac-address=$mac disabled=yes; + / tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \ + subject=("[" . $identity . "] " . $mac . " connected to " . $ssid) \ + body=("A device with unknown MAC address connected to " . $ssid . " on " . $identity . ".\n\n" . \ + "Controller: " . $identity . "\n" . \ + "Interface: " . $interface . "\n" . \ + "SSID: " . $ssid . "\n" . \ + "MAC: " . $mac . "\n" . \ + "Hostname: " . $hostname . "\n" . \ + "Address: " . $address . "\n" . \ + "Date: " . $datetime); + } else={ + :local comment [ / %PATH% access-list get $acclst comment ]; + :log debug ("MAC address " . $mac . " already known: " . $comment); + } +} diff --git a/collect-wireless-mac.local b/collect-wireless-mac.local new file mode 100644 index 0000000..4418c94 --- /dev/null +++ b/collect-wireless-mac.local @@ -0,0 +1,62 @@ +# RouterOS script: collect-wireless-mac +# Copyright (c) 2013-2018 Christian Hesse +# +# collect wireless mac adresses in access list +# +# !! Do not edit this file, it is generated from template! + +:global "identity"; +:global "email-general-to"; +:global "email-general-cc"; + +:local "place-before" [ / interface wireless access-list find where comment="--- collected above ---" disabled ]; +:if ([ :len $"place-before" ] = 0) do={ + :error "Missing disabled access-list entry with comment '--- collected above ---'"; +} + +:foreach regtbl in=[ / interface wireless registration-table find ] do={ + :local mac [ / interface wireless registration-table get $regtbl mac-address ]; + :local acclst [ :pick [ / interface wireless access-list find where mac-address=$mac ] 0 ]; + :if ( [ :len $acclst ] = 0 ) do={ + :local hostname "no dhcp lease"; + :local address "no dhcp lease"; + :local lease [ / ip dhcp-server lease find where mac-address=$mac ]; + :if ( [ :len $lease ] > 0 ) do={ + :set hostname [ / ip dhcp-server lease get $lease host-name ]; + :set address [ / ip dhcp-server lease get $lease address ]; + } + :if ( [ :len $hostname ] = 0 ) do={ + :set hostname "no hostname"; + } + :if ( [ :len $address ] = 0 ) do={ + :set address "no address"; + } + :local regentry [ / interface wireless registration-table find where mac-address=$mac ]; + :local interface [ / interface wireless registration-table get $regentry interface ]; + :local ssid; + :if ("interface wireless" = ("caps" . "-man")) do={ + :set ssid [ / interface wireless registration-table get $regentry ssid ]; + } else={ + # keep two spaces here to protect against replace! + :set ssid [ / interface wireless get [ find where name=$interface ] ssid ]; + } + :local datetime ([ / system clock get date ] . " " . [ / system clock get time ]); + :local message ("unknown MAC address " . $mac . " (" . $hostname . ") first seen on " . \ + $datetime . " connected to SSID " . $ssid . ", interface " . $interface); + / log info $message; + / interface wireless access-list add place-before=$"place-before" comment=$message mac-address=$mac disabled=yes; + / tool e-mail send to=$"email-general-to" cc=$"email-general-cc" \ + subject=("[" . $identity . "] " . $mac . " connected to " . $ssid) \ + body=("A device with unknown MAC address connected to " . $ssid . " on " . $identity . ".\n\n" . \ + "Controller: " . $identity . "\n" . \ + "Interface: " . $interface . "\n" . \ + "SSID: " . $ssid . "\n" . \ + "MAC: " . $mac . "\n" . \ + "Hostname: " . $hostname . "\n" . \ + "Address: " . $address . "\n" . \ + "Date: " . $datetime); + } else={ + :local comment [ / interface wireless access-list get $acclst comment ]; + :log debug ("MAC address " . $mac . " already known: " . $comment); + } +} diff --git a/dhcp-lease-comment b/dhcp-lease-comment deleted file mode 100644 index f3a081c..0000000 --- a/dhcp-lease-comment +++ /dev/null @@ -1,22 +0,0 @@ -# RouterOS script: dhcp-lease-comment -# Copyright (c) 2013-2018 Christian Hesse -# -# update dhcp-server lease comment with infos from access-list -# -# this supports local wireless and caps-man when updating paths: -# $ sed -i '/^$/,$s/caps-man/interface wireless/' dhcp-lease-comment -# $ sed -i '/^$/,$s/interface wireless/caps-man/' dhcp-lease-comment - -:foreach lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={ - :local macaddress [ / ip dhcp-server lease get $lease mac-address ]; - :local oldcomment [ / ip dhcp-server lease get $lease comment ]; - :local newcomment; - :local accesslst [ :pick [ / caps-man access-list find where mac-address=$macaddress ] 0 ]; - :if ( [ :len $accesslst ] > 0 ) do={ - :set newcomment [ / caps-man access-list get $accesslst comment ]; - } - :if ([ :len $newcomment ] != 0 && $oldcomment != $newcomment) do={ - :log info ("Updating comment for DHCP lease " . $macaddress . ": " . $newcomment); - / ip dhcp-server lease set comment=$newcomment $lease; - } -} diff --git a/dhcp-lease-comment.capsman b/dhcp-lease-comment.capsman new file mode 100644 index 0000000..324a5d8 --- /dev/null +++ b/dhcp-lease-comment.capsman @@ -0,0 +1,20 @@ +# RouterOS script: dhcp-lease-comment +# Copyright (c) 2013-2018 Christian Hesse +# +# update dhcp-server lease comment with infos from access-list +# +# !! Do not edit this file, it is generated from template! + +:foreach lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={ + :local macaddress [ / ip dhcp-server lease get $lease mac-address ]; + :local oldcomment [ / ip dhcp-server lease get $lease comment ]; + :local newcomment; + :local accesslst [ :pick [ / caps-man access-list find where mac-address=$macaddress ] 0 ]; + :if ( [ :len $accesslst ] > 0 ) do={ + :set newcomment [ / caps-man access-list get $accesslst comment ]; + } + :if ([ :len $newcomment ] != 0 && $oldcomment != $newcomment) do={ + :log info ("Updating comment for DHCP lease " . $macaddress . ": " . $newcomment); + / ip dhcp-server lease set comment=$newcomment $lease; + } +} diff --git a/dhcp-lease-comment.in b/dhcp-lease-comment.in new file mode 100644 index 0000000..35f1b3d --- /dev/null +++ b/dhcp-lease-comment.in @@ -0,0 +1,21 @@ +# RouterOS script: dhcp-lease-comment +# Copyright (c) 2013-2018 Christian Hesse +# +# update dhcp-server lease comment with infos from access-list +# +# !! This is just a template! Replace '%PATH%' with 'capsman' +# !! or 'interface wireless'! + +:foreach lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={ + :local macaddress [ / ip dhcp-server lease get $lease mac-address ]; + :local oldcomment [ / ip dhcp-server lease get $lease comment ]; + :local newcomment; + :local accesslst [ :pick [ / %PATH% access-list find where mac-address=$macaddress ] 0 ]; + :if ( [ :len $accesslst ] > 0 ) do={ + :set newcomment [ / %PATH% access-list get $accesslst comment ]; + } + :if ([ :len $newcomment ] != 0 && $oldcomment != $newcomment) do={ + :log info ("Updating comment for DHCP lease " . $macaddress . ": " . $newcomment); + / ip dhcp-server lease set comment=$newcomment $lease; + } +} diff --git a/dhcp-lease-comment.local b/dhcp-lease-comment.local new file mode 100644 index 0000000..ad4785b --- /dev/null +++ b/dhcp-lease-comment.local @@ -0,0 +1,20 @@ +# RouterOS script: dhcp-lease-comment +# Copyright (c) 2013-2018 Christian Hesse +# +# update dhcp-server lease comment with infos from access-list +# +# !! Do not edit this file, it is generated from template! + +:foreach lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={ + :local macaddress [ / ip dhcp-server lease get $lease mac-address ]; + :local oldcomment [ / ip dhcp-server lease get $lease comment ]; + :local newcomment; + :local accesslst [ :pick [ / interface wireless access-list find where mac-address=$macaddress ] 0 ]; + :if ( [ :len $accesslst ] > 0 ) do={ + :set newcomment [ / interface wireless access-list get $accesslst comment ]; + } + :if ([ :len $newcomment ] != 0 && $oldcomment != $newcomment) do={ + :log info ("Updating comment for DHCP lease " . $macaddress . ": " . $newcomment); + / ip dhcp-server lease set comment=$newcomment $lease; + } +} diff --git a/lease-script b/lease-script index b80b89b..f260614 100644 --- a/lease-script +++ b/lease-script @@ -4,7 +4,9 @@ # run scripts on DHCP lease # ( / ip dhcp-server set lease-script=lease-script [ find ] ) -:local scripts { "dhcp-to-dns"; "collect-wireless-mac"; "dhcp-lease-comment" }; +:local scripts { "dhcp-to-dns"; + "collect-wireless-mac.local"; "dhcp-lease-comment.local", + "collect-wireless-mac.capsman"; "dhcp-lease-comment.capsman" }; # delay a second to give time to update the lease table :delay 1s; -- cgit v1.2.3-54-g00ecf