Changed layer.xml so that report is instanciated

This commit is contained in:
Eugene Livis 2018-11-05 10:23:50 -05:00
parent 35c00ec388
commit 2db0e6a602
3 changed files with 8 additions and 2 deletions

View File

@ -337,6 +337,11 @@
<attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.modules.stix.STIXReportModule.getDefault"/>
<attr name="position" intvalue="910"/>
</file>
<file name="org-sleuthkit-autopsy-report-ReportCaseUco.instance">
<attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
<attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportCaseUco.getDefault"/>
<attr name="position" intvalue="911"/>
</file>
<!--<folder name="JavaHelp">
<file name="casemodule-helpset.xml" url="casemodule-helpset.xml">
<attr name="position" intvalue="3075"/>

View File

@ -45,6 +45,7 @@ ReportBodyFile.progress.processing=Now processing {0}...
ReportBodyFile.getName.text=TSK Body File
ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
ReportBodyFile.getFilePath.text=BodyFile.txt
ReportCaseUco.progress.initializing=Creating directories...
ReportCaseUco.progress.querying=Querying files...
ReportCaseUco.ingestWarning.text=Warning, this report was run before ingest services completed\!
ReportCaseUco.progress.loading=Loading files...

View File

@ -32,7 +32,6 @@ import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@ -89,7 +88,7 @@ class ReportCaseUco implements GeneralReportModule {
}
progressPanel.setIndeterminate(false);
progressPanel.start();
progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.querying"));
progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.initializing"));
// Create the JSON generator
jsonGeneratorFactory = new JsonFactory();
@ -110,6 +109,7 @@ class ReportCaseUco implements GeneralReportModule {
try {
masterCatalog = jsonGeneratorFactory.createGenerator(reportFile, JsonEncoding.UTF8);
progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportCaseUco.progress.querying"));
// exclude non-fs files/dirs and . and .. files
final String query = "select obj_id, name, size, ctime, crtime, atime, mtime, md5, parent_path, mime_type, extension from tsk_files where type = " + TskData.TSK_DB_FILES_TYPE_ENUM.FS.getFileType() //NON-NLS
+ " AND name != '.' AND name != '..'"; //NON-NLS