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 pull request #7613 from eugene7646/merge_dev

Browse Source 
Merge develop
This commit is contained in:
eugene7646 2022-04-27 12:10:47 -04:00 committed by GitHub
commit 8b46496e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java
View File

@ -223,7 +223,9 @@ public final class MapWaypoint extends KdTree.XYZPoint implements org.jxmapviewe
menuItems.addAll(getTimelineMenuItems(dataModelWaypoint.getArtifact()));
menuItems.addAll(getDataModelActionFactoryMenuItems(artifact, content));
if (content instanceof AbstractFile) {
menuItems.add(DeleteFileContentTagAction.getInstance().getMenuForFiles(Arrays.asList((AbstractFile) content)));
}
menuItems.add(DeleteFileBlackboardArtifactTagAction.getInstance().getMenuForArtifacts(Arrays.asList(artifact)));
return menuItems.toArray(new JMenuItem[0]);

2
Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/Bundle.properties-MERGED
View File

@ -1,6 +1,6 @@
DataSourceSummaryReport.error.noDataSources=No data sources selected for report.
DataSourceSummaryReport.error.noOpenCase=No currently open case.
DataSourceSummaryReport.excelFileWriteError=Could not write the KML file.
DataSourceSummaryReport.excelFileWriteError=Could not write the xlsx file.
DataSourceSummaryReport.failedToCompleteReport=Failed to complete report.
DataSourceSummaryReport.getName.text=Data Source Summary Report
DataSourceSummaryReport.getDesc.text=Data source summary report in Excel (XLS) format.

2
Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/DataSourceSummaryReport.java
View File

@ -89,7 +89,7 @@ public class DataSourceSummaryReport implements GeneralReportModule {
"DataSourceSummaryReport.error.noOpenCase=No currently open case.",
"DataSourceSummaryReport.error.noDataSources=No data sources selected for report.",
"DataSourceSummaryReport.failedToCompleteReport=Failed to complete report.",
"DataSourceSummaryReport.excelFileWriteError=Could not write the KML file.",})
"DataSourceSummaryReport.excelFileWriteError=Could not write the xlsx file.",})
@Override
public void generateReport(GeneralReportSettings settings, ReportProgressPanel progressPanel) {
progressPanel.start();

19
Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/PieChartExport.java
View File

@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xddf.usermodel.chart.ChartTypes;
import org.apache.poi.xddf.usermodel.chart.LegendPosition;
import org.apache.poi.xddf.usermodel.chart.XDDFChartLegend;
import org.apache.poi.xddf.usermodel.chart.XDDFDataSource;
@ -157,23 +158,7 @@ class PieChartExport implements ExcelItemExportable, ExcelSheetExport {
new CellRangeAddress(tableDimensions.getRowStart() + 1, tableDimensions.getRowEnd(),
tableDimensions.getColStart() + 1, tableDimensions.getColStart() + 1));
// NOTE: There appears to be a classpath issue with POI (a version of 4.0.1 and 4.1.1 simultaneously)
// that is causing conflicts for XDDFPieChartData creation (i.e. the compiler thinks its using 4.1.1
// and the runtime thinks its using 4.0.1) Reflection is used below to use the 4.0.1 method while
// sidestepping compiler issues.
// XDDFPieChartData creation that can be used in poi >= 4.1.1:
// XDDFPieChartData data = (XDDFPieChartData) chart.createData(ChartTypes.PIE, bottomAxis, leftAxis);
// XDDFPieChartData creation that can be used in 4.0.1:
// XDDFPieChartData data = new XDDFPieChartData(chart.getCTChart().getPlotArea().addNewPieChart());
XDDFPieChartData data;
try {
Constructor<XDDFPieChartData> constructor = XDDFPieChartData.class.getConstructor(CTPieChart.class);
constructor.setAccessible(true);
data = constructor.newInstance(chart.getCTChart().getPlotArea().addNewPieChart());
} catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException | IllegalArgumentException ex) {
throw new ExcelExportException("Error while instantiating chart data.", ex);
}
XDDFPieChartData data = (XDDFPieChartData) chart.createData(ChartTypes.PIE, null, null);
data.setVaryColors(true);
data.addSeries(cat, val);

8
CoreLibs/manifest.mf
View File

@ -5,4 +5,10 @@ OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corelibs/Bundle.properti
OpenIDE-Module-Specification-Version: 1.4
AutoUpdate-Show-In-Client: true
AutoUpdate-Essential-Module: true
X-JENS-COMMENT: The following entries are to prevent image io loading issues in platforms that utilize Autopsy; See https://stackoverflow.com/a/18495658/2375948, https://stackoverflow.com/a/2026045/2375948, and JIRA-8337 for more information.
Specification-Title: CoreLibs ImageIO Fields
Specification-Version: 1.0
Specification-Vendor: CoreLibs ImageIO Fields
Implementation-Title: org.sleuthkit.autopsy.corelibs.ImageIO
Implementation-Version: 1.0
Implementation-Vendor: CoreLibs ImageIO Fields

7
thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
View File

@ -133,7 +133,12 @@ class MboxParser extends MimeJ4MessageParser implements Iterator<EmailMessage> {
// That will usually be one of the first ones.
for (CharsetEncoder encoder : encoders) {
try {
mboxIterable = MboxIterator.fromFile(mboxFile).charset(encoder.charset()).build();
mboxIterable = MboxIterator
.fromFile(mboxFile)
// use more permissive from line from mbox iterator 0.8.0, but handling CRLF/LF
.fromLine("^From .*\r?\n")
.charset(encoder.charset())
.build();
if (mboxIterable != null) {
emailIterator = new MBoxEmailIterator(mboxIterable.iterator(), encoder, fileID, wholeMsg);
}