diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java index 662cf7a067..d1a14e60ba 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java @@ -223,7 +223,9 @@ public final class MapWaypoint extends KdTree.XYZPoint implements org.jxmapviewe menuItems.addAll(getTimelineMenuItems(dataModelWaypoint.getArtifact())); menuItems.addAll(getDataModelActionFactoryMenuItems(artifact, content)); - menuItems.add(DeleteFileContentTagAction.getInstance().getMenuForFiles(Arrays.asList((AbstractFile) 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]); diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/Bundle.properties-MERGED index 03d1661133..8926eefa80 100755 --- a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/Bundle.properties-MERGED @@ -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. diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/DataSourceSummaryReport.java b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/DataSourceSummaryReport.java index a52f897897..2506a99720 100755 --- a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/DataSourceSummaryReport.java +++ b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/DataSourceSummaryReport.java @@ -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(); diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/PieChartExport.java b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/PieChartExport.java index 395637acb1..e019fe40bc 100644 --- a/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/PieChartExport.java +++ b/Core/src/org/sleuthkit/autopsy/report/modules/datasourcesummaryexport/PieChartExport.java @@ -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 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); diff --git a/CoreLibs/manifest.mf b/CoreLibs/manifest.mf index 95267126df..b8faef2527 100644 --- a/CoreLibs/manifest.mf +++ b/CoreLibs/manifest.mf @@ -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 \ No newline at end of file diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java index a3256d3aa2..a0628c593b 100644 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java @@ -133,7 +133,12 @@ class MboxParser extends MimeJ4MessageParser implements Iterator { // 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); }