mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop', remote-tracking branch 'upstream' into Bitlocker-support

Browse Source
This commit is contained in:
Mark McKinnon 2024-08-07 20:28:45 -04:00
commit d2ae93e6ba
13 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/build.xml
View File

@ -134,8 +134,8 @@
<property environment="env"/> <property environment="env"/>
<copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-${TSK_VERSION}.jar" <copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-${TSK_VERSION}.jar"
tofile="${ext.dir}/sleuthkit-${TSK_VERSION}.jar"/> tofile="${ext.dir}/sleuthkit-${TSK_VERSION}.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.42.0.1.jar" <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.46.0.0.jar"
tofile="${ext.dir}/sqlite-jdbc-3.42.0.1.jar"/> tofile="${ext.dir}/sqlite-jdbc-3.46.0.0.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-42.7.3.jar" <copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-42.7.3.jar"
tofile="${ext.dir}/postgresql-42.7.3.jar"/> tofile="${ext.dir}/postgresql-42.7.3.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.5.jar" <copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.5.jar"

2
Core/nbproject/project.properties
View File

@ -91,7 +91,7 @@ file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar
file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar
file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.jar file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.jar
file.reference.sqlite-jdbc-3.42.0.1.jar=release/modules/ext/sqlite-jdbc-3.42.0.1.jar file.reference.sqlite-jdbc-3.46.0.0.jar=release/modules/ext/sqlite-jdbc-3.46.0.0.jar
file.reference.txw2-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar file.reference.txw2-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar
file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar
file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar

4
Core/nbproject/project.xml
View File

@ -742,8 +742,8 @@
<binary-origin>release/modules/ext/spotbugs-annotations-4.6.0.jar</binary-origin> <binary-origin>release/modules/ext/spotbugs-annotations-4.6.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path> <runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin> <binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/txw2-2.3.3.jar</runtime-relative-path> <runtime-relative-path>ext/txw2-2.3.3.jar</runtime-relative-path>

4
Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
View File

@ -38,8 +38,8 @@ public class GeneralFilter extends FileFilter {
@NbBundle.Messages("GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)") @NbBundle.Messages("GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)")
public static final String ENCASE_IMAGE_DESC = Bundle.GeneralFilter_encaseImageDesc_text(); public static final String ENCASE_IMAGE_DESC = Bundle.GeneralFilter_encaseImageDesc_text();
public static final List<String> VIRTUAL_MACHINE_EXTS = Arrays.asList(".vmdk", ".vhd"); //NON-NLS public static final List<String> VIRTUAL_MACHINE_EXTS = Arrays.asList(".vmdk", ".vhd", ".vhdx"); //NON-NLS
@NbBundle.Messages("GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd)") @NbBundle.Messages("GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd, *.vhdx)")
public static final String VIRTUAL_MACHINE_DESC = Bundle.GeneralFilter_virtualMachineImageDesc_text(); public static final String VIRTUAL_MACHINE_DESC = Bundle.GeneralFilter_virtualMachineImageDesc_text();
public static final List<String> EXECUTABLE_EXTS = Arrays.asList(".exe"); //NON-NLS public static final List<String> EXECUTABLE_EXTS = Arrays.asList(".exe"); //NON-NLS

5
Core/src/org/sleuthkit/autopsy/core/Installer.java
View File

@ -67,7 +67,7 @@ public class Installer extends ModuleInstall {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String JAVA_TEMP = "java.io.tmpdir"; private static final String JAVA_TEMP = "java.io.tmpdir";
private static final String AUTOPSY_TEMP_DIR = "autopsy_temp"; private static final String AUTOPSY_TEMP_DIR_SUFFIX = "_temp";
private static final String TSK_TEMP = "tsk.tmpdir"; private static final String TSK_TEMP = "tsk.tmpdir";
private final List<ModuleInstall> packageInstallers; private final List<ModuleInstall> packageInstallers;
@ -93,7 +93,8 @@ public class Installer extends ModuleInstall {
private static void setTskTemp() { private static void setTskTemp() {
try { try {
String curTemp = System.getProperty(JAVA_TEMP, ""); String curTemp = System.getProperty(JAVA_TEMP, "");
String tskTemp = curTemp + (curTemp.endsWith(File.separator) ? "" : File.separator) + AUTOPSY_TEMP_DIR; String autopsyTempDir = StringUtils.defaultIfBlank(UserPreferences.getAppName(), "autopsy").replaceAll("[^a-zA-Z0-9_\\-]", "_") + AUTOPSY_TEMP_DIR_SUFFIX;
String tskTemp = Paths.get(StringUtils.defaultString(curTemp), autopsyTempDir).toString();
System.setProperty(TSK_TEMP, tskTemp); System.setProperty(TSK_TEMP, tskTemp);
File tskTempDir = new File(tskTemp); File tskTempDir = new File(tskTemp);
tskTempDir.mkdirs(); tskTempDir.mkdirs();

2
ImageGallery/nbproject/project.properties
View File

@ -1,4 +1,4 @@
file.reference.sqlite-jdbc-3.42.0.1.jar=release/modules/ext/sqlite-jdbc-3.42.0.1.jar file.reference.sqlite-jdbc-3.46.0.0.jar=release/modules/ext/sqlite-jdbc-3.46.0.0.jar
javac.source=17 javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
license.file=LICENSE-2.0.txt license.file=LICENSE-2.0.txt

4
ImageGallery/nbproject/project.xml
View File

@ -142,8 +142,8 @@
</module-dependencies> </module-dependencies>
<public-packages/> <public-packages/>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path> <runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin> <binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
</data> </data>
</configuration> </configuration>

2
RecentActivity/nbproject/project.properties
View File

@ -1,6 +1,6 @@
javac.source=17 javac.source=17
file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar
file.reference.sqlite-jdbc-3.42.0.1.jar=release/modules/ext/sqlite-jdbc-3.42.0.1.jar file.reference.sqlite-jdbc-3.46.0.0.jar=release/modules/ext/sqlite-jdbc-3.46.0.0.jar
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/ nbm.homepage=http://www.sleuthkit.org/autopsy/

4
RecentActivity/nbproject/project.xml
View File

@ -88,8 +88,8 @@
<binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin> <binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path> <runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin> <binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension> </class-path-extension>
</data> </data>
</configuration> </configuration>

2
docs/doxygen-dev/footer.html
View File

@ -1,5 +1,5 @@
<hr/> <hr/>
<p><i>Copyright &#169; 2012-2022 Basis Technology. Generated on $date<br/> <p><i>Copyright &#169; 2012-2024 Sleuth Kit Labs. Generated on $date<br/>
This work is licensed under a This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>. <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.
</i></p> </i></p>

2
docs/doxygen-user/footer.html
View File

@ -1,5 +1,5 @@
<hr/> <hr/>
<p><i>Copyright &#169; 2012-2023 BasisTech. Generated on $date<br/> <p><i>Copyright &#169; 2012-2024 Sleuth Kit Labs. Generated on $date<br/>
This work is licensed under a This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>. <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.
</i></p> </i></p>

2
docs/doxygen/footer.html
View File

@ -1,5 +1,5 @@
<hr/> <hr/>
<p><i>Copyright &#169; 2012-2022 Basis Technology. Generated on: $date<br/> <p><i>Copyright &#169; 2012-2024 Sleuth Kit Labs. Generated on: $date<br/>
This work is licensed under a This work is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>. <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.
</i></p> </i></p>

2
linux_macos_install_scripts/install_tsk_from_src.sh
View File

@ -34,7 +34,7 @@ if [[ -z "${SLEUTHKIT_SRC_DIR}" ]]; then
exit 1 exit 1
fi fi
if [[ ! -d $SLEUTHKIT_SRC_DIR ]]; then if [[ ! -d $SLEUTHKIT_SRC_DIR/.git ]]; then
TSK_REPO_PATH=$(dirname "$SLEUTHKIT_SRC_DIR") TSK_REPO_PATH=$(dirname "$SLEUTHKIT_SRC_DIR")
echo "Cloning Sleuthkit to $TSK_REPO_PATH..." echo "Cloning Sleuthkit to $TSK_REPO_PATH..."
mkdir -p $TSK_REPO_PATH && mkdir -p $TSK_REPO_PATH &&