From e1687f0f90b337b9a765bafccb1db31f5ad2e527 Mon Sep 17 00:00:00 2001 From: Mark McKinnon Date: Sun, 17 Jul 2022 12:06:33 -0400 Subject: [PATCH 1/2] Add Chrome Profile Support Add chrome profile support --- scripts/artifacts/chromium.py | 2 +- scripts/artifacts/chromiumAutofill.py | 2 +- scripts/artifacts/chromiumBookmarks.py | 2 +- scripts/artifacts/chromiumCookies.py | 2 +- scripts/artifacts/chromiumDownloads.py | 2 +- scripts/artifacts/chromiumLoginData.py | 2 +- scripts/artifacts/chromiumMediaHistory.py | 2 +- scripts/artifacts/chromiumNetworkActionPredictor.py | 2 +- scripts/artifacts/chromiumOfflinePages.py | 2 +- scripts/artifacts/chromiumOmnibox.py | 2 +- scripts/artifacts/chromiumSearchTerms.py | 4 ++-- scripts/artifacts/chromiumSync.py | 2 +- scripts/artifacts/chromiumTopSites.py | 2 +- scripts/artifacts/chromiumWebsearch.py | 2 +- scripts/version_info.py | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/artifacts/chromium.py b/scripts/artifacts/chromium.py index 7471b3c..1ae4a6a 100644 --- a/scripts/artifacts/chromium.py +++ b/scripts/artifacts/chromium.py @@ -64,6 +64,6 @@ def get_chrome(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chrome": ( "Browser", - ('**/home/*/.config/google-chrome/default/History*'), + ('**/home/*/.config/google-chrome/default/History*', '**/home/*/.config/google-chrome/Profile*/History*'), get_chrome) } diff --git a/scripts/artifacts/chromiumAutofill.py b/scripts/artifacts/chromiumAutofill.py index 7ed89cc..6d9a511 100644 --- a/scripts/artifacts/chromiumAutofill.py +++ b/scripts/artifacts/chromiumAutofill.py @@ -60,6 +60,6 @@ def get_chromeAutofill(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeAutofill": ( "Browser", - ('**/home/*/.config/google-chrome/default/Web Data*'), + ('**/home/*/.config/google-chrome/default/Web Data*', '**/home/*/.config/google-chrome/Profile*/Web Data*'), get_chromeAutofill) } diff --git a/scripts/artifacts/chromiumBookmarks.py b/scripts/artifacts/chromiumBookmarks.py index 31b38cb..51dfea6 100644 --- a/scripts/artifacts/chromiumBookmarks.py +++ b/scripts/artifacts/chromiumBookmarks.py @@ -61,6 +61,6 @@ def get_chromeBookmarks(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chrome_bookmarks": ( "Browser", - ('**/home/*/.config/google-chrome/default/Bookmarks*'), + ('**/home/*/.config/google-chrome/default/Bookmarks*', '**/home/*/.config/google-chrome/Profile*/Bookmarks*'), get_chromeBookmarks) } diff --git a/scripts/artifacts/chromiumCookies.py b/scripts/artifacts/chromiumCookies.py index 66dd7ca..dd8a475 100644 --- a/scripts/artifacts/chromiumCookies.py +++ b/scripts/artifacts/chromiumCookies.py @@ -89,6 +89,6 @@ def get_chromeCookies(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeCookies": ( "Browser", - ('**/home/*/.config/google-chrome/default/Cookies*'), + ('**/home/*/.config/google-chrome/default/Cookies*', '**/home/*/.config/google-chrome/Profile*/Cookies*'), get_chromeCookies) } diff --git a/scripts/artifacts/chromiumDownloads.py b/scripts/artifacts/chromiumDownloads.py index 73b850a..a2c476e 100644 --- a/scripts/artifacts/chromiumDownloads.py +++ b/scripts/artifacts/chromiumDownloads.py @@ -79,6 +79,6 @@ def get_chromeDownloads(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeDownloads": ( "Browser", - ('**/home/*/.config/google-chrome/default/History*'), + ('**/home/*/.config/google-chrome/default/History*', '**/home/*/.config/google-chrome/Profile*/History*'), get_chromeDownloads) } diff --git a/scripts/artifacts/chromiumLoginData.py b/scripts/artifacts/chromiumLoginData.py index b92cb8e..37db0ae 100644 --- a/scripts/artifacts/chromiumLoginData.py +++ b/scripts/artifacts/chromiumLoginData.py @@ -110,6 +110,6 @@ def get_chromeLoginData(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeLoginData": ( "Browser", - ('**/home/*/.config/google-chrome/default/Login Data*'), + ('**/home/*/.config/google-chrome/default/Login Data*', '**/home/*/.config/google-chrome/Profile*/Login Data*'), get_chromeLoginData) } diff --git a/scripts/artifacts/chromiumMediaHistory.py b/scripts/artifacts/chromiumMediaHistory.py index 994b25d..2cce856 100644 --- a/scripts/artifacts/chromiumMediaHistory.py +++ b/scripts/artifacts/chromiumMediaHistory.py @@ -140,6 +140,6 @@ def get_chromeMediaHistory(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeMediaHistory": ( "Browser", - ('**/home/*/.config/google-chrome/default/Media History*'), + ('**/home/*/.config/google-chrome/default/Media History*', '**/home/*/.config/google-chrome/Profile*/Media History*'), get_chromeMediaHistory) } diff --git a/scripts/artifacts/chromiumNetworkActionPredictor.py b/scripts/artifacts/chromiumNetworkActionPredictor.py index 18856bb..dbc7701 100644 --- a/scripts/artifacts/chromiumNetworkActionPredictor.py +++ b/scripts/artifacts/chromiumNetworkActionPredictor.py @@ -58,6 +58,6 @@ def get_chromeNetworkActionPredictor(files_found, report_folder, seeker, wrap_te __artifacts__ = { "chromeNetworkActionPredictor": ( "Browser", - ('**/home/*/.config/google-chrome/default/Network Action Predictor*'), + ('**/home/*/.config/google-chrome/default/Network Action Predictor*', '**/home/*/.config/google-chrome/Profile*/Network Action Predictor*'), get_chromeNetworkActionPredictor) } diff --git a/scripts/artifacts/chromiumOfflinePages.py b/scripts/artifacts/chromiumOfflinePages.py index d7d47e1..33e7216 100644 --- a/scripts/artifacts/chromiumOfflinePages.py +++ b/scripts/artifacts/chromiumOfflinePages.py @@ -63,6 +63,6 @@ def get_chromeOfflinePages(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeOffinePages": ( "Browser", - ('**/home/*/.config/google-chrome/default/Offline Pages/metadata/OfflinePages.db*'), + ('**/home/*/.config/google-chrome/default/Offline Pages/metadata/OfflinePages.db*', '**/home/*/.config/google-chrome/default/Offline Pages/Profile*/OfflinePages.db*'), get_chromeOfflinePages) } \ No newline at end of file diff --git a/scripts/artifacts/chromiumOmnibox.py b/scripts/artifacts/chromiumOmnibox.py index 38ee348..19813e9 100644 --- a/scripts/artifacts/chromiumOmnibox.py +++ b/scripts/artifacts/chromiumOmnibox.py @@ -68,6 +68,6 @@ def get_chromeOmnibox(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeOmnibox": ( "Browser", - ('**/.config/google-chrome/Default/Shortcuts*'), + ('**/.config/google-chrome/Default/Shortcuts*', '**/.config/google-chrome/Profile*/Shortcuts*'), get_chromeOmnibox) } \ No newline at end of file diff --git a/scripts/artifacts/chromiumSearchTerms.py b/scripts/artifacts/chromiumSearchTerms.py index 4167fa8..80de048 100644 --- a/scripts/artifacts/chromiumSearchTerms.py +++ b/scripts/artifacts/chromiumSearchTerms.py @@ -61,8 +61,8 @@ def get_chromeSearchTerms(files_found, report_folder, seeker, wrap_text): db.close() __artifacts__ = { - "chromeSearchTerems": ( + "chromeSearchTerms": ( "Browser", - ('**/home/*/.config/google-chrome/default/History*'), + ('**/home/*/.config/google-chrome/default/History*', '**/home/*/.config/google-chrome/Profile*/History*'), get_chromeSearchTerms) } \ No newline at end of file diff --git a/scripts/artifacts/chromiumSync.py b/scripts/artifacts/chromiumSync.py index 4bd4afb..018d236 100644 --- a/scripts/artifacts/chromiumSync.py +++ b/scripts/artifacts/chromiumSync.py @@ -49,6 +49,6 @@ def get_chromeSync(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeSync": ( "Browser", - ('**/home/*/.config/google-chrome/default/chromesync.data_store*'), + ('**/home/*/.config/google-chrome/default/chromesync.data_store*', '**/home/*/.config/google-chrome/Profile*/chromesync.data_store*'), get_chromeSync) } \ No newline at end of file diff --git a/scripts/artifacts/chromiumTopSites.py b/scripts/artifacts/chromiumTopSites.py index f8deb32..b15a5b2 100644 --- a/scripts/artifacts/chromiumTopSites.py +++ b/scripts/artifacts/chromiumTopSites.py @@ -59,6 +59,6 @@ def get_chromeTopSites(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeTopSites": ( "Browser", - ('**/home/*/.config/google-chrome/default/Top Sites*'), + ('**/home/*/.config/google-chrome/default/Top Sites*', '**/home/*/.config/google-chrome/Profile*/Top Sites*'), get_chromeTopSites) } \ No newline at end of file diff --git a/scripts/artifacts/chromiumWebsearch.py b/scripts/artifacts/chromiumWebsearch.py index c7d3d90..3918866 100644 --- a/scripts/artifacts/chromiumWebsearch.py +++ b/scripts/artifacts/chromiumWebsearch.py @@ -65,6 +65,6 @@ def get_chromeWebsearch(files_found, report_folder, seeker, wrap_text): __artifacts__ = { "chromeWebsearch": ( "Browser", - ('**/home/*/.config/google-chrome/default/History*'), + ('**/home/*/.config/google-chrome/default/History*', '**/home/*/.config/google-chrome/Profile*/History*'), get_chromeWebsearch) } \ No newline at end of file diff --git a/scripts/version_info.py b/scripts/version_info.py index bc2c73c..4f32560 100644 --- a/scripts/version_info.py +++ b/scripts/version_info.py @@ -1,4 +1,4 @@ -lleapp_version = '1.0.0' +lleapp_version = '1.1.0' # Contributors List # Format = [ Name, Blog-url, Twitter-handle, Github-url] From 65199bc0202abc864143918b781696d28e20fb4b Mon Sep 17 00:00:00 2001 From: Mark McKinnon Date: Sun, 17 Jul 2022 12:07:00 -0400 Subject: [PATCH 2/2] Update Spec files for running pyinstaller Update spec files for running pyinstaller. --- hook-plugin_loader.py | 1 + lleapp.spec | 5 +++-- lleappGUI.spec | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hook-plugin_loader.py b/hook-plugin_loader.py index b2c206f..f7146da 100644 --- a/hook-plugin_loader.py +++ b/hook-plugin_loader.py @@ -20,5 +20,6 @@ tmp.append("scripts.artifacts." + mod.__name__) # TODO this is a hack, if we ever move plugins this breaks print(f"{len(tmp)} plugins loaded as hidden imports") +print (list(tmp)) hiddenimports = list(tmp) diff --git a/lleapp.spec b/lleapp.spec index 3ef08a7..fc07634 100644 --- a/lleapp.spec +++ b/lleapp.spec @@ -12,9 +12,10 @@ a = Analysis(['lleapp.py'], ('.\\scripts\\feather.min.js', '.\\scripts'), ('.\\scripts\\sidebar.js', '.\\scripts'), ('.\\scripts\\custom.css', '.\\scripts'), - ('.\\scripts\\MDB-Free_4.13.0', '.\\scripts\\MDB-Free_4.13.0')], + ('.\\scripts\\MDB-Free_4.13.0', '.\\scripts\\MDB-Free_4.13.0'), + ('.\\scripts\\artifacts\\*', '.\\scripts\\artifacts')], hiddenimports=['simplekml', 'bs4'], - hookspath=[], + hookspath=['.\\'], runtime_hooks=[], excludes=[], win_no_prefer_redirects=False, diff --git a/lleappGUI.spec b/lleappGUI.spec index b1bfc05..ad3a739 100644 --- a/lleappGUI.spec +++ b/lleappGUI.spec @@ -12,9 +12,10 @@ a = Analysis(['lleappGUI.py'], ('.\\scripts\\dark-mode-switch.js', '.\\scripts'), ('.\\scripts\\sidebar.js', '.\\scripts'), ('.\\scripts\\custom.css', '.\\scripts'), - ('.\\scripts\\MDB-Free_4.13.0', '.\\scripts\\MDB-Free_4.13.0')], + ('.\\scripts\\MDB-Free_4.13.0', '.\\scripts\\MDB-Free_4.13.0'), + ('.\\scripts\\artifacts\\*', '.\\scripts\\artifacts')], hiddenimports=[], - hookspath=[], + hookspath=['.\\'], runtime_hooks=[], excludes=[], win_no_prefer_redirects=False,