Merge branch 'develop' of github.com:sleuthkit/autopsy into 8425-snap

Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java

@@ -126,9 +126,9 @@ public class ImageUtils {
         if (OpenCvLoader.openCvIsLoaded()) {
             try {
                 if (System.getProperty("os.arch").equals("amd64") || System.getProperty("os.arch").equals("x86_64")) { //NON-NLS
-                    System.loadLibrary("opencv_ffmpeg248_64"); //NON-NLS
+                    System.loadLibrary("opencv_ffmpeg2413_64"); //NON-NLS
                 } else {
-                    System.loadLibrary("opencv_ffmpeg248"); //NON-NLS
+                    System.loadLibrary("opencv_ffmpeg2413"); //NON-NLS
                 }
                 tempFfmpegLoaded = true;
             } catch (UnsatisfiedLinkError e) {

Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ALeappAnalyzerIngestModule.java

@@ -289,12 +289,13 @@ public class ALeappAnalyzerIngestModule implements DataSourceIngestModule {
     private ProcessBuilder buildaLeappCommand(Path moduleOutputPath, String sourceFilePath, String aLeappFileSystemType) {
 
         ProcessBuilder processBuilder = buildProcessWithRunAsInvoker(
-                "\"" + aLeappExecutable + "\"", //NON-NLS
+                aLeappExecutable.getAbsolutePath(), //NON-NLS
                 "-t", aLeappFileSystemType, //NON-NLS
                 "-i", sourceFilePath, //NON-NLS
                 "-o", moduleOutputPath.toString(),
                 "-w"
         );
+        processBuilder.directory(moduleOutputPath.toFile());
         processBuilder.redirectError(moduleOutputPath.resolve("aLeapp_err.txt").toFile());  //NON-NLS
         processBuilder.redirectOutput(moduleOutputPath.resolve("aLeapp_out.txt").toFile());  //NON-NLS
         return processBuilder;
@@ -303,9 +304,11 @@ public class ALeappAnalyzerIngestModule implements DataSourceIngestModule {
     private ProcessBuilder buildaLeappListCommand(Path moduleOutputPath) {
 
         ProcessBuilder processBuilder = buildProcessWithRunAsInvoker(
-                "\"" + aLeappExecutable + "\"", //NON-NLS
+                aLeappExecutable.getAbsolutePath(), //NON-NLS
                 "-p"
         );
+        // leapp process creates a text file in addition to outputting to stdout.
+        processBuilder.directory(moduleOutputPath.toFile());
         processBuilder.redirectError(moduleOutputPath.resolve("aLeapp_paths_error.txt").toFile());  //NON-NLS
         processBuilder.redirectOutput(moduleOutputPath.resolve("aLeapp_paths.txt").toFile());  //NON-NLS
         return processBuilder;

Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ILeappAnalyzerIngestModule.java

@@ -289,11 +289,12 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
     private ProcessBuilder buildiLeappCommand(Path moduleOutputPath, String sourceFilePath, String iLeappFileSystemType) {
 
         ProcessBuilder processBuilder = buildProcessWithRunAsInvoker(
-                "\"" + iLeappExecutable + "\"", //NON-NLS
+                iLeappExecutable.getAbsolutePath(), //NON-NLS
                 "-t", iLeappFileSystemType, //NON-NLS
                 "-i", sourceFilePath, //NON-NLS
                 "-o", moduleOutputPath.toString()
         );
+        processBuilder.directory(moduleOutputPath.toFile());
         processBuilder.redirectError(moduleOutputPath.resolve("iLeapp_err.txt").toFile());  //NON-NLS
         processBuilder.redirectOutput(moduleOutputPath.resolve("iLeapp_out.txt").toFile());  //NON-NLS
         return processBuilder;
@@ -309,9 +310,11 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
     private ProcessBuilder buildiLeappListCommand(Path moduleOutputPath) {
 
         ProcessBuilder processBuilder = buildProcessWithRunAsInvoker(
-                "\"" + iLeappExecutable + "\"", //NON-NLS
+                iLeappExecutable.getAbsolutePath(), //NON-NLS
                 "-p"
         );
+        // leapp process also outputs a file to the working directory in addition to stdout.
+        processBuilder.directory(moduleOutputPath.toFile());
         processBuilder.redirectError(moduleOutputPath.resolve("iLeapp_paths_error.txt").toFile());  //NON-NLS
         processBuilder.redirectOutput(moduleOutputPath.resolve("iLeapp_paths.txt").toFile());  //NON-NLS
         return processBuilder;

CoreLibs/nbproject/project.properties

@@ -129,7 +129,6 @@ file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31
 file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
 file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar
 file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar
-file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
 file.reference.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar
 file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar
 file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar

CoreLibs/nbproject/project.xml

@@ -1111,10 +1111,6 @@
                 <runtime-relative-path>ext/opencv-2413.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-2413.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/perfmark-api-0.23.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/perfmark-api-0.23.0.jar</binary-origin>

Running_Linux_OSX.md

@@ -9,7 +9,7 @@ When installing on Debian-based Linux or macOS systems, there are three general
 
 # Installing The Sleuth Kit
 - **Linux**: Download the .deb file for the release you want to install from the [release section](https://github.com/sleuthkit/sleuthkit/releases).  Install The Sleuth Kit package from the repositories with the following command: `sudo apt update && sudo apt install /path/to/sleuthkit-version.deb`.
-- **macOS**: Ensure that for this session, your `JAVA_HOME` variable is set to the java 17 installation by running `export JAVA_HOME=$(/usr/libexec/java_home -v 17)/bin/java`.  Then, install The Sleuth Kit from source by running [`linux_macos_install_scripts/install_tsk_from_src.sh`](./linux_macos_install_scripts/install_tsk_from_src.sh), which will download, build, and install The Sleuth Kit.  It can be run as follows: `install_tsk_from_src.sh -p ~/src/sleuthkit -b sleuthkit-4.11.1`.  Make sure that your path to download source ends with "sleuthkit" as the last directory, and the release is the corresponding tag in the [repository](https://github.com/sleuthkit/sleuthkit).
+- **macOS**: Ensure that for this session, your `JAVA_HOME` variable is set to the java 17 installation by running `export JAVA_HOME=$(/usr/libexec/java_home -v 17)`.  Then, install The Sleuth Kit from source by running [`linux_macos_install_scripts/install_tsk_from_src.sh`](./linux_macos_install_scripts/install_tsk_from_src.sh), which will download, build, and install The Sleuth Kit.  It can be run as follows: `install_tsk_from_src.sh -p ~/src/sleuthkit -b sleuthkit-4.11.1`.  Make sure that your path to download source ends with "sleuthkit" as the last directory, and the release is the corresponding tag in the [repository](https://github.com/sleuthkit/sleuthkit).
 
 # Installing Autopsy
 - Download the Autopsy zip file from [repository releases](https://github.com/sleuthkit/autopsy/releases).  The file will be marked as "autopsy-<release>.zip" (i.e. "autopsy-4.19.2.zip").

build-windows-installer.xml

@@ -28,19 +28,6 @@
             </else>
         </if> -->
 
-        <condition property="jre.home.64">
-            <isset property="env.JRE_HOME_64"/>
-        </condition>
-        <if>
-            <isset property="jre.home.64" />
-            <then>
-                <echo message="64-bit JRE found, 64-bit installer will be built."/>
-            </then>
-            <else>
-                <echo message="64-bit JRE not found. No 64-bit installer will be built. Set the JRE_HOME_64 environment variable to generate a 64-bit installer."/>
-            </else>
-        </if>
-
         <property name="lib-rel-path" value="${app.name}\modules\lib" />
         <!-- where libs are in build folder; forward slashes because not used directly by advanced installer -->
         <property name="lib-inst-path" value="${inst-path}/${app.name}/modules/lib" />
@@ -100,14 +87,27 @@
     
 
     <target name="copyJRE" description="Copy a given JRE to the installation folder">
-        <var name="new-jre-path" value="${inst-path}\jre"/>
+        <property environment="env"/>
-        <delete failonerror="false" dir="${new-jre-path}"/>
+        <if>
-        <mkdir dir="${new-jre-path}"/>
+            <isset property="env.JDK_HOME" />
-        <copy todir="${new-jre-path}" overwrite="true">
+            <then>
-            <fileset dir="${jre-path}">
+                <echo message="JDK found at: ${env.JDK_HOME}."/>
-                <include name="**/*"/>
+            </then>
-            </fileset>
+            <else>
-        </copy>
+                <fail message="Environment variable, JDK_HOME, not set.  Cannot build installer."/>
+            </else>
+        </if>
+
+
+        <exec executable="${env.JDK_HOME}/bin/jlink" dir="${inst-path}">
+            <arg value="--add-modules"/>
+            <arg value="ALL-MODULE-PATH"/>
+            <arg value="--output"/>
+            <arg value="jre"/>
+            <arg value="--no-man-pages"/>
+            <arg value="--no-header-files"/>
+            <arg value="--compress=2"/>
+        </exec>
     </target>
     
     
@@ -140,7 +140,7 @@
     
     
 
-    <target name="build64" if="jre.home.64" description="Builds the 64 bit installer IF JRE_HOME_64 is set.">
+    <target name="build64" description="Builds the 64 bit installer IF JRE_HOME_64 is set.">
         <property environment="env"/>
         <var name="aip-path" value="${aip-path-64}"/>
         

linux_macos_install_scripts/install_prereqs_macos.sh

@@ -8,5 +8,15 @@ then
     exit 1
 fi
 
+sudo ln -sfn $HOMEBREW_PREFIX/opt/openjdk@17/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-17.jdk && \
+echo "export PATH=\"$HOMEBREW_PREFIX/opt/openjdk@17/bin:$PATH\"" >> ~/.zshrc && \
+source ~/.zshrc
+
+if [[ $? -ne 0 ]] 
+then 
+    echo "Unable to properly set up java env" >> /dev/stderr
+    exit 1
+fi
+
 java_path=$(/usr/libexec/java_home -v 17)
 echo "Java 17 path: $java_path"

thirdparty/opencv/README.txt

@@ -0,0 +1,4 @@
+README:
+
+This is OpenCV jar and binaries from version 2.4.13.6 from opencv downloads:
+https://opencv.org/releases