"
+ },
+ {
+ "equals": "watched-changed",
+ "replacement": "
"
+ },
+ {
+ "equals": "new",
+ "replacement": "
"
+ },
+ {
+ "equals": "missing-in-last-scan",
+ "replacement": "
"
+ }
+ ],
+ "localized": ["name"],
+ "name":[{
+ "language_code":"en_us",
+ "string" : "Status"
+ },
+ {
+ "language_code":"es_es",
+ "string" : "Estado"
+ }]
+ }
+ ]
+}
diff --git a/front/plugins/vendor_update/script.py b/front/plugins/vendor_update/script.py
new file mode 100755
index 00000000..b72d1598
--- /dev/null
+++ b/front/plugins/vendor_update/script.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+# test script by running:
+# /home/pi/pialert/front/plugins/db_cleanup/script.py pluginskeephistory=250 hourstokeepnewdevice=48 daystokeepevents=90
+
+import os
+import pathlib
+import argparse
+import sys
+import hashlib
+import csv
+import sqlite3
+from io import StringIO
+from datetime import datetime
+
+sys.path.append("/home/pi/pialert/front/plugins")
+sys.path.append('/home/pi/pialert/pialert')
+
+from plugin_helper import Plugin_Object, Plugin_Objects, decodeBase64
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ
+from const import logPath, pialertPath
+from device import query_MAC_vendor
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+LOG_FILE = os.path.join(CUR_PATH, 'script.log')
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+def main():
+
+ mylog('verbose', ['[VNDRPDT] In script'])
+
+ # Get newest DB
+ update_vendor_database()
+
+ # Resolve missing vendors
+ plugin_objects = Plugin_Objects(RESULT_FILE)
+
+ plugin_objects = update_vendors('/home/pi/pialert/db/pialert.db', plugin_objects)
+
+ plugin_objects.write_result_file()
+
+ mylog('verbose', ['[VNDRPDT] Update complete'])
+
+ return 0
+
+#===============================================================================
+# Update device vendors database
+#===============================================================================
+def update_vendor_database():
+
+ # Update vendors DB (iab oui)
+ mylog('verbose', [' Updating vendors DB (iab & oui)'])
+ update_args = ['sh', pialertPath + '/back/update_vendors.sh']
+
+ # Execute command
+ try:
+ # try runnning a subprocess safely
+ update_output = subprocess.check_output (update_args)
+ except subprocess.CalledProcessError as e:
+ # An error occured, handle it
+ mylog('none', [' FAILED: Updating vendors DB, set LOG_LEVEL=debug for more info'])
+ mylog('none', [e.output])
+
+
+# resolve missing vendors
+def update_vendors (dbPath, plugin_objects):
+
+ # Connect to the PiAlert SQLite database
+ conn = sqlite3.connect(dbPath)
+ cursor = conn.cursor()
+
+ # Initialize variables
+ recordsToUpdate = []
+ ignored = 0
+ notFound = 0
+
+ # All devices loop
+ mylog('verbose', [' Searching devices vendor'])
+
+ for device in cursor.execute ("""SELECT * FROM Devices
+ WHERE dev_Vendor = '(unknown)'
+ OR dev_Vendor =''
+ OR dev_Vendor IS NULL""") :
+ # Search vendor in HW Vendors DB
+ vendor = query_MAC_vendor (device['dev_MAC'])
+ if vendor == -1 :
+ notFound += 1
+ elif vendor == -2 :
+ ignored += 1
+ else :
+ plugin_objects.add_object(
+ primaryId = device['dev_MAC'], # MAC (Device Name)
+ secondaryId = device['dev_LastIP'], # IP Address (always 0.0.0.0)
+ watched1 = vendor,
+ watched2 = device['dev_Name'],
+ watched3 = "",
+ watched4 = "",
+ extra = "",
+ foreignKey = device['dev_MAC']
+ )
+
+ # Print log
+ mylog('verbose', [" Devices Ignored: ", ignored])
+ mylog('verbose', [" Vendors Not Found:", notFound])
+ mylog('verbose', [" Vendors updated: ", len(plugin_objects) ])
+
+ conn.commit()
+ # Close the database connection
+ conn.close()
+
+ return plugin_objects
+
+
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':
+ main()
\ No newline at end of file
diff --git a/pialert/README.md b/pialert/README.md
index 41c5399d..5d6ff197 100755
--- a/pialert/README.md
+++ b/pialert/README.md
@@ -17,7 +17,6 @@ The original pilaert.py code is now moved to this new folder and split into diff
|```helper.py```| Helper as the name suggest contains multiple little functions and methods used in many of the other modules and helps keep things clean |
|```initialise.py```| Initiatlise sets up the environment and makes everything ready to go |
|```logger.py```| Logger is there the keep all the logs organised and looking identical. |
-|```mac_vendor.py```| This module runs and manages the ``` update_vendors.sh ``` script from within Pi.Alert |
|```networscan.py```| Networkscan orchestrates the actual scanning of the network, calling the individual scanners and managing the results |
|```plugin.py```| This is where the plugins get integrated into the backend of Pi.Alert |
|```reporting.py```| Reporting generates the email, html and json reports to be sent by the publishers |
diff --git a/pialert/README_ES.md b/pialert/README_ES.md
index a9a6510b..664ce689 100755
--- a/pialert/README_ES.md
+++ b/pialert/README_ES.md
@@ -18,7 +18,6 @@ El código pilaert.py original ahora se mueve a esta nueva carpeta y se divide e
|```helper.py```| Helper como su nombre indica contiene múltiples pequeñas funciones y métodos utilizados en muchos de los otros módulos y ayuda a mantener las cosas limpias |
|```initialise.py```| Initiatlise prepara el entorno y deja todo listo para funcionar |
|```logger.py```| Logger está ahí para mantener todos los registros organizados y con el mismo aspecto |
-|```mac_vendor.py```| Este módulo ejecuta y gestiona el ``` update_vendors.sh ``` script desde Pi.Alert |
|```networscan.py```| El escaneado de red organiza el escaneado real de la red, llamando a los escáneres individuales y gestionando los resultados |
|```plugin.py```| Aquí es donde los plugins se integran en el backend de Pi.Alert |
|```reporting.py```| La generación de informes genera los informes de correo electrónico, html y json que deben enviar los editores |
diff --git a/pialert/__main__.py b/pialert/__main__.py
index e96bef15..c4b8d772 100755
--- a/pialert/__main__.py
+++ b/pialert/__main__.py
@@ -28,7 +28,6 @@ from helper import filePermissions, isNewVersion, timeNowTZ, updateState, get
from api import update_api
from networkscan import process_scan
from initialise import importConfigs
-from mac_vendor import update_devices_MAC_vendors
from database import DB, get_all_devices
from reporting import check_and_run_event, send_notifications
from plugin import run_plugin_scripts
@@ -146,13 +145,6 @@ def main ():
conf.cycle = 'internet_IP'
last_internet_IP_scan = loop_start_time
check_internet_IP(db)
-
- # Update vendors once a week
- if conf.last_update_vendors + datetime.timedelta(days = 7) < loop_start_time:
- conf.last_update_vendors = loop_start_time
- conf.cycle = 'update_vendors'
- mylog('verbose', ['[MAIN] cycle:',conf.cycle])
- update_devices_MAC_vendors(db)
# Run splugin scripts which are set to run every timne after a scans finished
pluginsState = run_plugin_scripts(db,'always_after_scan', pluginsState)
diff --git a/pialert/const.py b/pialert/const.py
index d2a01d01..932b6e14 100755
--- a/pialert/const.py
+++ b/pialert/const.py
@@ -18,7 +18,7 @@ fullDbPath = pialertPath + dbPath
-vendorsDB = '/usr/share/arp-scan/ieee-oui.txt'
+vendorsDB = '/usr/share/arp-scan/ieee-oui.txt'
diff --git a/pialert/database.py b/pialert/database.py
index 088811b8..6953c2b4 100755
--- a/pialert/database.py
+++ b/pialert/database.py
@@ -362,8 +362,7 @@ class DB():
# indicates, if CurrentScan table is available
self.sql.execute("DROP TABLE IF EXISTS CurrentScan;")
- self.sql.execute(""" CREATE TABLE CurrentScan (
- cur_ScanCycle INTEGER,
+ self.sql.execute(""" CREATE TABLE CurrentScan (
cur_MAC STRING(50) NOT NULL COLLATE NOCASE,
cur_IP STRING(50) NOT NULL COLLATE NOCASE,
cur_Vendor STRING(250),
diff --git a/pialert/device.py b/pialert/device.py
index ffb6d602..16c872b9 100755
--- a/pialert/device.py
+++ b/pialert/device.py
@@ -6,7 +6,7 @@ import re
from helper import timeNowTZ, get_setting, get_setting_value,resolve_device_name_dig, resolve_device_name_pholus
from scanners.internet import check_IP_format, get_internet_IP
from logger import mylog, print_log
-from mac_vendor import query_MAC_vendor
+from const import vendorsDB
#-------------------------------------------------------------------------------
@@ -23,8 +23,8 @@ def save_scanned_devices (db):
# TESTING - Force IP
# internet_IP = ""
if internet_IP != "" :
- sql.execute (f"""INSERT INTO CurrentScan (cur_ScanCycle, cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod)
- VALUES ( 1, 'Internet', '{internet_IP}', Null, 'queryDNS') """)
+ sql.execute (f"""INSERT INTO CurrentScan (cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod)
+ VALUES ( 'Internet', '{internet_IP}', Null, 'queryDNS') """)
# #76 Add Local MAC of default local interface
# BUGFIX #106 - Device that pialert is running
@@ -50,7 +50,7 @@ def save_scanned_devices (db):
# Check if local mac has been detected with other methods
sql.execute (f"SELECT COUNT(*) FROM CurrentScan WHERE cur_MAC = '{local_mac}'")
if sql.fetchone()[0] == 0 :
- sql.execute (f"""INSERT INTO CurrentScan (cur_ScanCycle, cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod) VALUES ( 1, '{local_mac}', '{local_ip}', Null, 'local_MAC') """)
+ sql.execute (f"""INSERT INTO CurrentScan (cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod) VALUES ( '{local_mac}', '{local_ip}', Null, 'local_MAC') """)
#-------------------------------------------------------------------------------
def print_scan_stats(db):
@@ -311,3 +311,45 @@ def check_mac_or_internet(input_str):
return True
else:
return False
+
+
+#===============================================================================
+# Lookup unknown vendors on devices
+#===============================================================================
+
+#-------------------------------------------------------------------------------
+def query_MAC_vendor (pMAC):
+ try :
+ # BUGFIX #6 - Fix pMAC parameter as numbers
+ pMACstr = str(pMAC)
+
+ # Check MAC parameter
+ mac = pMACstr.replace (':','')
+ if len(pMACstr) != 17 or len(mac) != 12 :
+ return -2
+
+ # Search vendor in HW Vendors DB
+ mac = mac[0:6]
+ grep_args = ['grep', '-i', mac, vendorsDB]
+
+ # Execute command
+ if conf.LOG_LEVEL == 'debug':
+ # try runnning a subprocess
+ grep_output = subprocess.check_output (grep_args)
+ else:
+ try:
+ # try runnning a subprocess
+ grep_output = subprocess.check_output (grep_args)
+ except subprocess.CalledProcessError as e:
+ # An error occured, handle it
+ mylog('none', ["[Mac Vendor Check] Error: ", e.output])
+ grep_output = " There was an error, check logs for details"
+
+ # Return Vendor
+ vendor = grep_output[7:]
+ vendor = vendor.rstrip()
+ return vendor
+
+ # not Found
+ except subprocess.CalledProcessError :
+ return -1
diff --git a/pialert/mac_vendor.py b/pialert/mac_vendor.py
deleted file mode 100755
index 8b4aafad..00000000
--- a/pialert/mac_vendor.py
+++ /dev/null
@@ -1,113 +0,0 @@
-
-import subprocess
-import conf
-
-from const import pialertPath, vendorsDB
-from helper import timeNowTZ, updateState
-from logger import mylog
-
-
-#===============================================================================
-# UPDATE DEVICE MAC VENDORS
-#===============================================================================
-
-
-
-def update_devices_MAC_vendors (db, pArg = ''):
- sql = db.sql # TO-DO
- # Header
- updateState("Upkeep: Vendors")
- mylog('verbose', ['[', timeNowTZ(), '] Upkeep - Update HW Vendors:' ])
-
- # Update vendors DB (iab oui)
- mylog('verbose', [' Updating vendors DB (iab & oui)'])
- update_args = ['sh', pialertPath + '/back/update_vendors.sh', pArg]
-
- # Execute command
- if conf.LOG_LEVEL == 'debug':
- # try runnning a subprocess
- update_output = subprocess.check_output (update_args)
- else:
- try:
- # try runnning a subprocess safely
- update_output = subprocess.check_output (update_args)
- except subprocess.CalledProcessError as e:
- # An error occured, handle it
- mylog('none', [' FAILED: Updating vendors DB, set LOG_LEVEL=debug for more info'])
- mylog('none', [e.output])
-
- # Initialize variables
- recordsToUpdate = []
- ignored = 0
- notFound = 0
-
- # All devices loop
- mylog('verbose', [' Searching devices vendor'])
- for device in sql.execute ("""SELECT * FROM Devices
- WHERE dev_Vendor = '(unknown)'
- OR dev_Vendor =''
- OR dev_Vendor IS NULL""") :
- # Search vendor in HW Vendors DB
- vendor = query_MAC_vendor (device['dev_MAC'])
- if vendor == -1 :
- notFound += 1
- elif vendor == -2 :
- ignored += 1
- else :
- recordsToUpdate.append ([vendor, device['dev_MAC']])
-
- # Print log
- mylog('verbose', [" Devices Ignored: ", ignored])
- mylog('verbose', [" Vendors Not Found:", notFound])
- mylog('verbose', [" Vendors updated: ", len(recordsToUpdate) ])
-
-
- # update devices
- sql.executemany ("UPDATE Devices SET dev_Vendor = ? WHERE dev_MAC = ? ",
- recordsToUpdate )
-
- # Commit DB
- db.commitDB()
-
- if len(recordsToUpdate) > 0:
- return True
- else:
- return False
-
-#-------------------------------------------------------------------------------
-def query_MAC_vendor (pMAC):
- try :
- # BUGFIX #6 - Fix pMAC parameter as numbers
- pMACstr = str(pMAC)
-
- # Check MAC parameter
- mac = pMACstr.replace (':','')
- if len(pMACstr) != 17 or len(mac) != 12 :
- return -2
-
- # Search vendor in HW Vendors DB
- mac = mac[0:6]
- grep_args = ['grep', '-i', mac, vendorsDB]
-
- # Execute command
- if conf.LOG_LEVEL == 'debug':
- # try runnning a subprocess
- grep_output = subprocess.check_output (grep_args)
- else:
- try:
- # try runnning a subprocess
- grep_output = subprocess.check_output (grep_args)
- except subprocess.CalledProcessError as e:
- # An error occured, handle it
- mylog('none', ["[Mac Vendor Check] Error: ", e.output])
- grep_output = " There was an error, check logs for details"
-
- # Return Vendor
- vendor = grep_output[7:]
- vendor = vendor.rstrip()
- return vendor
-
- # not Found
- except subprocess.CalledProcessError :
- return -1
-