diff --git a/pholus/AAtlasis - An Attack-in-Depth Analysis of multicast DNS and DNS Service Discovery_wp.pdf b/front/plugins/pholus_scan/pholus/AAtlasis - An Attack-in-Depth Analysis of multicast DNS and DNS Service Discovery_wp.pdf similarity index 100% rename from pholus/AAtlasis - An Attack-in-Depth Analysis of multicast DNS and DNS Service Discovery_wp.pdf rename to front/plugins/pholus_scan/pholus/AAtlasis - An Attack-in-Depth Analysis of multicast DNS and DNS Service Discovery_wp.pdf diff --git a/pholus/README.md b/front/plugins/pholus_scan/pholus/README.md similarity index 100% rename from pholus/README.md rename to front/plugins/pholus_scan/pholus/README.md diff --git a/pholus/licence.txt b/front/plugins/pholus_scan/pholus/licence.txt similarity index 100% rename from pholus/licence.txt rename to front/plugins/pholus_scan/pholus/licence.txt diff --git a/pholus/pholus.py b/front/plugins/pholus_scan/pholus/pholus.py similarity index 100% rename from pholus/pholus.py rename to front/plugins/pholus_scan/pholus/pholus.py diff --git a/pholus/pholus3.py b/front/plugins/pholus_scan/pholus/pholus3.py similarity index 100% rename from pholus/pholus3.py rename to front/plugins/pholus_scan/pholus/pholus3.py diff --git a/front/plugins/pholus_scan/script.py b/front/plugins/pholus_scan/script.py index 1989f906..6218cebb 100755 --- a/front/plugins/pholus_scan/script.py +++ b/front/plugins/pholus_scan/script.py @@ -16,11 +16,12 @@ sys.path.append('/home/pi/pialert/pialert') from logger import mylog from plugin_helper import Plugin_Object, Plugin_Objects from helper import timeNowTZ -from const import fullPholusPath, logPath +from const import logPath, pialertPath -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') +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') +fullPholusPath = os.path.join(CUR_PATH, 'pholus/pholus3.py') def main(): diff --git a/pialert/const.py b/pialert/const.py index 9b172bfa..3a63a43f 100755 --- a/pialert/const.py +++ b/pialert/const.py @@ -15,7 +15,7 @@ logPath = pialertPath + '/front/log' apiPath = pialertPath + '/front/api/' fullConfPath = pialertPath + confPath fullDbPath = pialertPath + dbPath -fullPholusPath = pialertPath+'/pholus/pholus3.py' + vendorsDB = '/usr/share/arp-scan/ieee-oui.txt'