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", "function": "REPORT_ON",
"type": "text.multiselect", "type": "text.multiselect",
"default_value": ["new", "watched-changed"], "default_value": ["new"],
"options": ["new", "watched-changed", "watched-not-changed"], "options": ["new", "watched-changed", "watched-not-changed"],
"localized": ["name", "description"], "localized": ["name", "description"],
"name": [ "name": [

44
pialert/networkscan.py
View File

@@ -103,62 +103,52 @@ def void_ghost_disconnections (db):
startTime = timeNowTZ() startTime = timeNowTZ()
# Void connect ghost events (disconnect event exists in last X min.) # Void connect ghost events (disconnect event exists in last X min.)
mylog('debug','[Void Ghost Con] - 1 Connect ghost events') mylog('debug','[Void Ghost Con] - 1 Connect ghost events')
sql.execute ("""UPDATE Events SET eve_PairEventRowid = Null, sql.execute("""UPDATE Events SET eve_PairEventRowid = Null,
eve_EventType ='VOIDED - ' || eve_EventType eve_EventType ='VOIDED - ' || eve_EventType
WHERE eve_MAC != 'Internet' WHERE eve_MAC != 'Internet'
AND eve_EventType = 'Connected' AND eve_EventType = 'Connected'
AND eve_DateTime = ? AND eve_DateTime = ?
AND eve_MAC IN ( AND eve_MAC IN (
SELECT Events.eve_MAC SELECT Events.eve_MAC
FROM CurrentScan, Devices, ScanCycles, Events FROM CurrentScan, Devices, Events
WHERE cur_ScanCycle = ? WHERE dev_MAC = cur_MAC
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
AND eve_MAC = cur_MAC AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected' AND eve_EventType = 'Disconnected'
AND eve_DateTime >= AND eve_DateTime >= DATETIME(?, '-3 minutes')
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
) """, ) """,
(startTime, conf.cycle, startTime) ) (startTime, startTime))
# Void connect paired events # Void connect paired events
mylog('debug','[Void Ghost Con] - 2 Paired events') mylog('debug','[Void Ghost Con] - 2 Paired events')
sql.execute ("""UPDATE Events SET eve_PairEventRowid = Null sql.execute("""UPDATE Events SET eve_PairEventRowid = Null
WHERE eve_MAC != 'Internet' WHERE eve_MAC != 'Internet'
AND eve_PairEventRowid IN ( AND eve_PairEventRowid IN (
SELECT Events.RowID SELECT Events.RowID
FROM CurrentScan, Devices, ScanCycles, Events FROM CurrentScan, Devices, Events
WHERE cur_ScanCycle = ? WHERE dev_MAC = cur_MAC
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
AND eve_MAC = cur_MAC AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected' AND eve_EventType = 'Disconnected'
AND eve_DateTime >= AND eve_DateTime >= DATETIME(?, '-3 minutes')
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
) """, ) """,
(conf.cycle, startTime) ) (startTime,))
# Void disconnect ghost events # Void disconnect ghost events
mylog('debug','[Void Ghost Con] - 3 Disconnect ghost events') mylog('debug','[Void Ghost Con] - 3 Disconnect ghost events')
sql.execute ("""UPDATE Events SET eve_PairEventRowid = Null, sql.execute("""UPDATE Events SET eve_PairEventRowid = Null,
eve_EventType = 'VOIDED - '|| eve_EventType eve_EventType = 'VOIDED - '|| eve_EventType
WHERE eve_MAC != 'Internet' WHERE eve_MAC != 'Internet'
AND ROWID IN ( AND ROWID IN (
SELECT Events.RowID SELECT Events.RowID
FROM CurrentScan, Devices, ScanCycles, Events FROM CurrentScan, Devices, Events
WHERE cur_ScanCycle = ? WHERE dev_MAC = cur_MAC
AND dev_MAC = cur_MAC
AND dev_ScanCycle = cic_ID
AND cic_ID = cur_ScanCycle
AND eve_MAC = cur_MAC AND eve_MAC = cur_MAC
AND eve_EventType = 'Disconnected' AND eve_EventType = 'Disconnected'
AND eve_DateTime >= AND eve_DateTime >= DATETIME(?, '-3 minutes')
DATETIME (?, '-' || cic_EveryXmin ||' minutes')
) """, ) """,
(conf.cycle, startTime) ) (startTime,))
mylog('debug','[Void Ghost Con] Void Ghost Connections end') mylog('debug','[Void Ghost Con] Void Ghost Connections end')
db.commitDB() db.commitDB()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------