mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modules are differentiated on the basis of file names rather than the exception thrown

Browse Source
This commit is contained in:
sidheshenator 2015-03-19 16:51:25 -04:00
parent 685df0ebcc
commit e171099f99
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java
View File

@ -285,24 +285,30 @@ public class IngestJobSettings {
*/ */
private IngestModuleIngestJobSettings loadModuleSettings(IngestModuleFactory factory) { private IngestModuleIngestJobSettings loadModuleSettings(IngestModuleFactory factory) {
IngestModuleIngestJobSettings settings = null; IngestModuleIngestJobSettings settings = null;
File settingsFile = new File(getModuleSettingsFilePath(factory)); String moduleSettingsFilePath = getModuleSettingsFilePath(factory);
if (settingsFile.exists()) { Boolean isPythonModule = false;
String pythonModuleSettingsPrefix = "org.python.proxies.";
CharSequence pythonModuleSettingsPrefixCS = pythonModuleSettingsPrefix.subSequence(0, pythonModuleSettingsPrefix.length()-1);
if(moduleSettingsFilePath.contains(pythonModuleSettingsPrefixCS)) {
isPythonModule = true;
}
File settingsFile = new File(moduleSettingsFilePath);
if (settingsFile.exists() && !isPythonModule) {
try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(settingsFile.getAbsolutePath()))) { try (NbObjectInputStream in = new NbObjectInputStream(new FileInputStream(settingsFile.getAbsolutePath()))) {
settings = (IngestModuleIngestJobSettings) in.readObject(); settings = (IngestModuleIngestJobSettings) in.readObject();
} catch(NullPointerException ex){ } catch (IOException | ClassNotFoundException ex) {
try (PythonObjectInputStream in = new PythonObjectInputStream(new FileInputStream(settingsFile.getAbsolutePath()))) {
// Reading serialized Jython module settings using NbObjectInputStream.readObject throws a NullPointerException
settings = (IngestModuleIngestJobSettings) in.readObject();
} catch( IOException | ClassNotFoundException exception) {
String warning = NbBundle.getMessage(IngestJobSettings.class, "IngestJobSettings.moduleSettingsLoad.warning", factory.getModuleDisplayName(), this.context); //NON-NLS
logger.log(Level.WARNING, warning, exception);
this.warnings.add(warning);
}
}catch (IOException | ClassNotFoundException ex) {
String warning = NbBundle.getMessage(IngestJobSettings.class, "IngestJobSettings.moduleSettingsLoad.warning", factory.getModuleDisplayName(), this.context); //NON-NLS String warning = NbBundle.getMessage(IngestJobSettings.class, "IngestJobSettings.moduleSettingsLoad.warning", factory.getModuleDisplayName(), this.context); //NON-NLS
logger.log(Level.WARNING, warning, ex); logger.log(Level.WARNING, warning, ex);
this.warnings.add(warning); this.warnings.add(warning);
} }
} else {
try (PythonObjectInputStream in = new PythonObjectInputStream(new FileInputStream(settingsFile.getAbsolutePath()))) {
settings = (IngestModuleIngestJobSettings) in.readObject();
} catch (IOException | ClassNotFoundException exception) {
String warning = NbBundle.getMessage(IngestJobSettings.class, "IngestJobSettings.moduleSettingsLoad.warning", factory.getModuleDisplayName(), this.context); //NON-NLS
logger.log(Level.WARNING, warning, exception);
this.warnings.add(warning);
}
} }
if (settings == null) { if (settings == null) {
settings = factory.getDefaultIngestJobSettings(); settings = factory.getDefaultIngestJobSettings();
@ -319,10 +325,6 @@ public class IngestJobSettings {
*/ */
private String getModuleSettingsFilePath(IngestModuleFactory factory) { private String getModuleSettingsFilePath(IngestModuleFactory factory) {
String fileName = factory.getClass().getCanonicalName() + IngestJobSettings.MODULE_SETTINGS_FILE_EXT; String fileName = factory.getClass().getCanonicalName() + IngestJobSettings.MODULE_SETTINGS_FILE_EXT;
// Check if it's a python module class.
// In case of python module class, remove the <instance number> from the fileName.
if(fileName.startsWith("org.python.proxies."))
fileName = fileName.replaceAll("[$][\\d]+.settings$", "\\$.settings");
Path path = Paths.get(this.moduleSettingsFolderPath, fileName); Path path = Paths.get(this.moduleSettingsFolderPath, fileName);
return path.toAbsolutePath().toString(); return path.toAbsolutePath().toString();
} }
@ -364,6 +366,15 @@ public class IngestJobSettings {
*/ */
private void saveModuleSettings(IngestModuleFactory factory, IngestModuleIngestJobSettings settings) { private void saveModuleSettings(IngestModuleFactory factory, IngestModuleIngestJobSettings settings) {
try { try {
String moduleSettingsFilePath = getModuleSettingsFilePath(factory);
// compiled python modules have substring org.python.proxies. It can be used to identify them.
String pythonModuleSettingsPrefix = "org.python.proxies.";
CharSequence pythonModuleSettingsPrefixCS = pythonModuleSettingsPrefix.subSequence(0, pythonModuleSettingsPrefix.length() - 1);
if (moduleSettingsFilePath.contains(pythonModuleSettingsPrefixCS)) {
// compiled python modules have variable instance number as a part of their file name.
// This block of code gets rid of that variable instance number and helps maitains constant module name over multiple runs.
moduleSettingsFilePath.replaceAll("[$][\\d]+.settings$", "\\$.settings");
}
try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(getModuleSettingsFilePath(factory)))) { try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(getModuleSettingsFilePath(factory)))) {
out.writeObject(settings); out.writeObject(settings);
} }