codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-04 06:50:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2343 from wishdasher/AUT-2226_error_loading_stix_file

Browse Source 
Modified exception throwing and moved logging to upper levels
This commit is contained in:
Richard Cordovano
2016-09-15 15:13:52 -04:00
committed by GitHub
parent a004da6fef 4c36a1d353
commit 7c2e8a91c9
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
View File

@@ -171,7 +171,7 @@ public class STIXReportModule implements GeneralReportModule {
}
try {
processFile(file.getAbsolutePath(), progressPanel, output);
} catch (TskCoreException ex) {
} catch (TskCoreException | JAXBException ex) {
logger.log(Level.SEVERE, String.format("Unable to process STIX file %s", file), ex); //NON-NLS
MessageNotifyUtil.Notify.show("STIXReportModule", //NON-NLS
ex.getLocalizedMessage(),
@@ -213,10 +213,11 @@ public class STIXReportModule implements GeneralReportModule {
* @param stixFile - Name of the file
* @param progressPanel - Progress panel (for updating)
*
* @throws JAXBException
* @throws TskCoreException
*/
private void processFile(String stixFile, ReportProgressPanel progressPanel, BufferedWriter output) throws
TskCoreException {
JAXBException, TskCoreException {
// Load the STIX file
STIXPackage stix;
@@ -244,23 +245,18 @@ public class STIXReportModule implements GeneralReportModule {
*
* @return Unmarshalled file contents
*
* @throws TskCoreException
* @throws JAXBException
*/
private STIXPackage loadSTIXFile(String stixFileName) throws TskCoreException {
try {
// Create STIXPackage object from xml.
File file = new File(stixFileName);
JAXBContext jaxbContext = JAXBContext.newInstance("org.mitre.stix.stix_1:org.mitre.stix.common_1:org.mitre.stix.indicator_2:" //NON-NLS
+ "org.mitre.cybox.objects:org.mitre.cybox.cybox_2:org.mitre.cybox.common_2"); //NON-NLS
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
STIXPackage stix = (STIXPackage) jaxbUnmarshaller.unmarshal(file);
return stix;
} catch (JAXBException ex) {
logger.log(Level.SEVERE, String.format("Unable to load STIX file %s", stixFileName), ex.getLocalizedMessage()); //NON-NLS
throw new TskCoreException("Error loading STIX file (" + ex.toString() + ")"); //NON-NLS
}
private STIXPackage loadSTIXFile(String stixFileName) throws JAXBException {
// Create STIXPackage object from xml.
File file = new File(stixFileName);
JAXBContext jaxbContext = JAXBContext.newInstance("org.mitre.stix.stix_1:org.mitre.stix.common_1:org.mitre.stix.indicator_2:" //NON-NLS
+ "org.mitre.cybox.objects:org.mitre.cybox.cybox_2:org.mitre.cybox.common_2"); //NON-NLS
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
STIXPackage stix = (STIXPackage) jaxbUnmarshaller.unmarshal(file);
return stix;
}
/**
* Do the initial processing of the list of observables. For each
* observable, save it in a map using the ID as key.