From 15d245e09a74e970ef5e567ee0c5276107708f30 Mon Sep 17 00:00:00 2001 From: Johann POLEWCZYK Date: Sat, 13 Jul 2024 14:31:16 +0200 Subject: [PATCH 1/2] Update ilapfuncs.py - Minor fixes --- scripts/ilapfuncs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ilapfuncs.py b/scripts/ilapfuncs.py index d095798a..671453a9 100755 --- a/scripts/ilapfuncs.py +++ b/scripts/ilapfuncs.py @@ -155,7 +155,7 @@ def does_column_exist_in_db(db, table_name, col_name): if row['name'].lower() == col_name: return True except sqlite3.Error as ex: - print(f"Query error, query={query} Error={str(ex)}") + logfunc(f"Query error, query={query} Error={str(ex)}") pass return False @@ -166,7 +166,7 @@ def does_table_exist(db, table_name): cursor = db.execute(query) for row in cursor: return True - except sqlite3Error as ex: + except sqlite3.Error as ex: logfunc(f"Query error, query={query} Error={str(ex)}") return False From 3eaa22808ed1abfa0797899edd6d2e6107bd0d49 Mon Sep 17 00:00:00 2001 From: Johann POLEWCZYK Date: Sat, 13 Jul 2024 15:22:56 +0200 Subject: [PATCH 2/2] Add file_version_info.txt files for Windows binaries --- aleapp-file_version_info.txt | 28 ++++++++++++++++++++++++++++ aleapp.spec | 1 + aleappGUI-file_version_info.txt | 28 ++++++++++++++++++++++++++++ aleappGUI.spec | 1 + scripts/version_info.py | 2 +- 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 aleapp-file_version_info.txt create mode 100644 aleappGUI-file_version_info.txt diff --git a/aleapp-file_version_info.txt b/aleapp-file_version_info.txt new file mode 100644 index 00000000..733d4e77 --- /dev/null +++ b/aleapp-file_version_info.txt @@ -0,0 +1,28 @@ +VSVersionInfo( + ffi=FixedFileInfo( + filevers=(3, 2, 3, 0), + prodvers=(3, 2, 3, 0), + mask=0x3f, + flags=0x0, + OS=0x40004, + fileType=0x1, + subtype=0x0, + date=(0, 0) + ), + kids=[ + StringFileInfo( + [ + StringTable( + '040904b0', + [StringStruct('CompanyName', 'Alexis Brignoni'), + StringStruct('FileDescription', 'ALEAPP CLI'), + StringStruct('FileVersion', '3.2.3'), + StringStruct('InternalName', 'ALEAPP'), + StringStruct('LegalCopyright', 'Result of a collaborative effort in the DFIR community.'), + StringStruct('OriginalFilename', 'aleapp.exe'), + StringStruct('ProductName', 'ALEAPP'), + StringStruct('ProductVersion', '3.2.3')]) + ]), + VarFileInfo([VarStruct('Translation', [1033, 1200])]) + ] +) \ No newline at end of file diff --git a/aleapp.spec b/aleapp.spec index 01d72c30..7c5c9c09 100755 --- a/aleapp.spec +++ b/aleapp.spec @@ -29,4 +29,5 @@ exe = EXE(pyz, upx=True, upx_exclude=[], runtime_tmpdir=None, + version='aleapp-file_version_info.txt', console=True ) diff --git a/aleappGUI-file_version_info.txt b/aleappGUI-file_version_info.txt new file mode 100644 index 00000000..dd9fa279 --- /dev/null +++ b/aleappGUI-file_version_info.txt @@ -0,0 +1,28 @@ +VSVersionInfo( + ffi=FixedFileInfo( + filevers=(3, 2, 3, 0), + prodvers=(3, 2, 3, 0), + mask=0x3f, + flags=0x0, + OS=0x40004, + fileType=0x1, + subtype=0x0, + date=(0, 0) + ), + kids=[ + StringFileInfo( + [ + StringTable( + '040904b0', + [StringStruct('CompanyName', 'Alexis Brignoni'), + StringStruct('FileDescription', 'ALEAPP GUI'), + StringStruct('FileVersion', '3.2.3'), + StringStruct('InternalName', 'ALEAPP'), + StringStruct('LegalCopyright', 'Result of a collaborative effort in the DFIR community.'), + StringStruct('OriginalFilename', 'AleappGUI.exe'), + StringStruct('ProductName', 'ALEAPP'), + StringStruct('ProductVersion', '3.2.3')]) + ]), + VarFileInfo([VarStruct('Translation', [1033, 1200])]) + ] +) \ No newline at end of file diff --git a/aleappGUI.spec b/aleappGUI.spec index 91ea6b16..838ff2a7 100755 --- a/aleappGUI.spec +++ b/aleappGUI.spec @@ -29,4 +29,5 @@ exe = EXE(pyz, hide_console='hide-early', disable_windowed_traceback=False, upx_exclude=[], + version='aleappGUI-file_version_info.txt', runtime_tmpdir=None ) \ No newline at end of file diff --git a/scripts/version_info.py b/scripts/version_info.py index 63433b29..4723a523 100755 --- a/scripts/version_info.py +++ b/scripts/version_info.py @@ -1,4 +1,4 @@ -aleapp_version = '3.2.2' +aleapp_version = '3.2.3' # Contributors List # Format = [ Name, Blog-url, Twitter-handle, Github-url]