From 2e53da32d1237bf14b7941c0fdf78b3b86ea0169 Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Fri, 25 Aug 2023 07:16:46 +1000
Subject: [PATCH] Pholus cleanup + conversion v0.4

---
 ...  multicast DNS and DNS Service Discovery_wp.pdf | Bin
 .../plugins/pholus_scan/pholus}/README.md           |   0
 .../plugins/pholus_scan/pholus}/licence.txt         |   0
 .../plugins/pholus_scan/pholus}/pholus.py           |   0
 .../plugins/pholus_scan/pholus}/pholus3.py          |   0
 front/plugins/pholus_scan/script.py                 |   9 +++++----
 pialert/const.py                                    |   2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename {pholus => front/plugins/pholus_scan/pholus}/AAtlasis - An Attack-in-Depth Analysis of  multicast DNS and DNS Service Discovery_wp.pdf (100%)
 rename {pholus => front/plugins/pholus_scan/pholus}/README.md (100%)
 rename {pholus => front/plugins/pholus_scan/pholus}/licence.txt (100%)
 rename {pholus => front/plugins/pholus_scan/pholus}/pholus.py (100%)
 rename {pholus => front/plugins/pholus_scan/pholus}/pholus3.py (100%)

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'