From c66bb89be2b6e76a0926b19f9726c91067e5bbf3 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 10 Jul 2018 14:01:41 +0200 Subject: update template system --- Makefile | 12 ++++++--- collect-wireless-mac.capsman | 10 ++----- collect-wireless-mac.in | 63 ------------------------------------------- collect-wireless-mac.local | 10 ++----- collect-wireless-mac.template | 58 +++++++++++++++++++++++++++++++++++++++ dhcp-lease-comment.capsman | 2 +- dhcp-lease-comment.in | 21 --------------- dhcp-lease-comment.local | 2 +- dhcp-lease-comment.template | 21 +++++++++++++++ 9 files changed, 93 insertions(+), 106 deletions(-) delete mode 100644 collect-wireless-mac.in create mode 100644 collect-wireless-mac.template delete mode 100644 dhcp-lease-comment.in create mode 100644 dhcp-lease-comment.template diff --git a/Makefile b/Makefile index 23169cf..2169170 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,12 @@ GENERATE = collect-wireless-mac.capsman collect-wireless-mac.local dhcp-lease-co 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 > $@ +%.local: *.template Makefile + sed -e '/\/ caps-man/d' -e 's|%PATH%|interface wireless|' -e 's|%TEMPL%|$(suffix $@)|' \ + -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \ + < $(basename $@).template > $@ -%.capsman: *.in Makefile - sed -e 's/%PATH%/caps-man/' -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' < $(basename $@).in > $@ +%.capsman: *.template Makefile + sed -e '/\/ interface wireless/d' -e 's/%PATH%/caps-man/' -e 's/%TEMPL%/$(suffix $@)/' \ + -e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \ + < $(basename $@).template > $@ diff --git a/collect-wireless-mac.capsman b/collect-wireless-mac.capsman index f6fabf3..6b1ad49 100644 --- a/collect-wireless-mac.capsman +++ b/collect-wireless-mac.capsman @@ -1,4 +1,4 @@ -# RouterOS script: collect-wireless-mac +# RouterOS script: collect-wireless-mac.capsman # Copyright (c) 2013-2018 Christian Hesse # # collect wireless mac adresses in access list @@ -33,13 +33,7 @@ } :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 ssid [ / caps-man registration-table get $regentry 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); diff --git a/collect-wireless-mac.in b/collect-wireless-mac.in deleted file mode 100644 index 79cbeff..0000000 --- a/collect-wireless-mac.in +++ /dev/null @@ -1,63 +0,0 @@ -# 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 index 4418c94..5bd544c 100644 --- a/collect-wireless-mac.local +++ b/collect-wireless-mac.local @@ -1,4 +1,4 @@ -# RouterOS script: collect-wireless-mac +# RouterOS script: collect-wireless-mac.local # Copyright (c) 2013-2018 Christian Hesse # # collect wireless mac adresses in access list @@ -33,13 +33,7 @@ } :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 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); diff --git a/collect-wireless-mac.template b/collect-wireless-mac.template new file mode 100644 index 0000000..80109fe --- /dev/null +++ b/collect-wireless-mac.template @@ -0,0 +1,58 @@ +# RouterOS script: collect-wireless-mac%TEMPL% +# Copyright (c) 2013-2018 Christian Hesse +# +# collect wireless mac adresses in access list +# +# !! This is just a template! Replace '%PATH%' with 'caps-man' +# !! 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 [ / caps-man registration-table get $regentry ssid ]; + :local 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/dhcp-lease-comment.capsman b/dhcp-lease-comment.capsman index 324a5d8..eb436eb 100644 --- a/dhcp-lease-comment.capsman +++ b/dhcp-lease-comment.capsman @@ -1,4 +1,4 @@ -# RouterOS script: dhcp-lease-comment +# RouterOS script: dhcp-lease-comment.capsman # Copyright (c) 2013-2018 Christian Hesse # # update dhcp-server lease comment with infos from access-list diff --git a/dhcp-lease-comment.in b/dhcp-lease-comment.in deleted file mode 100644 index 35f1b3d..0000000 --- a/dhcp-lease-comment.in +++ /dev/null @@ -1,21 +0,0 @@ -# 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 index ad4785b..2b22691 100644 --- a/dhcp-lease-comment.local +++ b/dhcp-lease-comment.local @@ -1,4 +1,4 @@ -# RouterOS script: dhcp-lease-comment +# RouterOS script: dhcp-lease-comment.local # Copyright (c) 2013-2018 Christian Hesse # # update dhcp-server lease comment with infos from access-list diff --git a/dhcp-lease-comment.template b/dhcp-lease-comment.template new file mode 100644 index 0000000..b344955 --- /dev/null +++ b/dhcp-lease-comment.template @@ -0,0 +1,21 @@ +# RouterOS script: dhcp-lease-comment%TEMPL% +# Copyright (c) 2013-2018 Christian Hesse +# +# update dhcp-server lease comment with infos from access-list +# +# !! This is just a template! Replace '%PATH%' with 'caps-man' +# !! 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; + } +} -- cgit v1.2.3-54-g00ecf