cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARPSCAN to plugin rewrite

Browse Source
This commit is contained in:
Jokob-sk
2023-08-07 17:42:46 +10:00
parent 5f3f4c1a73
commit 80bda24b5f
2 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/plugins/arp_scan/config.json
View File

@@ -128,7 +128,7 @@
{
"function": "REPORT_ON",
"type": "text.multiselect",
"default_value": ["new", "watched-changed"],
"default_value": ["new"],
"options": ["new", "watched-changed", "watched-not-changed"],
"localized": ["name", "description"],
"name": [

38
pialert/networkscan.py
View File

@@ -110,17 +110,13 @@ def void_ghost_disconnections (db):
AND eve_DateTime = ?
AND eve_MAC IN (
SELECT Events.eve_MAC
FROM CurrentScan, Devices, ScanCycles, Events
WHERE cur_ScanCycle = ?
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
FROM CurrentScan, Devices, Events
WHERE dev_MAC = cur_MAC
AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected'
AND eve_DateTime >=
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
AND eve_DateTime >= DATETIME(?, '-3 minutes')
) """,
(startTime, conf.cycle, startTime) )
(startTime, startTime))
# Void connect paired events
mylog('debug','[Void Ghost Con] - 2 Paired events')
@@ -128,17 +124,13 @@ def void_ghost_disconnections (db):
WHERE eve_MAC != 'Internet'
AND eve_PairEventRowid IN (
SELECT Events.RowID
FROM CurrentScan, Devices, ScanCycles, Events
WHERE cur_ScanCycle = ?
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
FROM CurrentScan, Devices, Events
WHERE dev_MAC = cur_MAC
AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected'
AND eve_DateTime >=
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
AND eve_DateTime >= DATETIME(?, '-3 minutes')
) """,
(conf.cycle, startTime) )
(startTime,))
# Void disconnect ghost events
mylog('debug','[Void Ghost Con] - 3 Disconnect ghost events')
@@ -147,18 +139,16 @@ def void_ghost_disconnections (db):
WHERE eve_MAC != 'Internet'
AND ROWID IN (
SELECT Events.RowID
FROM CurrentScan, Devices, ScanCycles, Events
WHERE cur_ScanCycle = ?
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
FROM CurrentScan, Devices, Events
WHERE dev_MAC = cur_MAC
AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected'
AND eve_DateTime >=
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
AND eve_DateTime >= DATETIME(?, '-3 minutes')
) """,
(conf.cycle, startTime) )
(startTime,))
mylog('debug','[Void Ghost Con] Void Ghost Connections end')
db.commitDB()
#-------------------------------------------------------------------------------