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

fixed writing to disk

Browse Source
This commit is contained in:
Greg DiCristofaro 2020-06-02 11:44:12 -04:00
parent 7d000f4e08
commit 000ee2d1de
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Core/src/org/sleuthkit/autopsy/modules/interestingitems/StandardInterestingFilesSetsLoader.java
View File

@ -26,7 +26,9 @@ import java.io.InputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
@ -130,7 +132,7 @@ public class StandardInterestingFilesSetsLoader implements Runnable {
*/ */
private static void copyRulesDirectory(File rulesConfigDir) { private static void copyRulesDirectory(File rulesConfigDir) {
for (String resourceFile : INTERESTING_FILESETS_RULES_NAMES) { for (String resourceFile : INTERESTING_FILESETS_RULES_NAMES) {
String resourcePath = "./" + CONFIG_DIR + "/" + resourceFile; String resourcePath = String.join("/", CONFIG_DIR, resourceFile);
if (StandardInterestingFilesSetsLoader.class.getResource(resourcePath) == null) { if (StandardInterestingFilesSetsLoader.class.getResource(resourcePath) == null) {
LOGGER.log(Level.SEVERE, String.format("Expected resource: %s could not be found at %s.", resourceFile, resourcePath)); LOGGER.log(Level.SEVERE, String.format("Expected resource: %s could not be found at %s.", resourceFile, resourcePath));
} else { } else {
@ -165,6 +167,20 @@ public class StandardInterestingFilesSetsLoader implements Runnable {
return; return;
} }
// ensure that read resources are standard sets
resourceFilesSet = resourceFilesSet.values()
.stream()
.map((origFilesSet) -> new FilesSet(
origFilesSet.getName(),
origFilesSet.getDescription(),
origFilesSet.ignoresKnownFiles(),
origFilesSet.ingoresUnallocatedSpace(),
origFilesSet.getRules(),
true,
origFilesSet.getVersionNumber()
))
.collect(Collectors.toMap(FilesSet::getName, Function.identity()));
if (configDirFile.exists()) { if (configDirFile.exists()) {
Map<String, FilesSet> configDirFilesSet = null; Map<String, FilesSet> configDirFilesSet = null;
try { try {
@ -177,10 +193,17 @@ public class StandardInterestingFilesSetsLoader implements Runnable {
} }
try { try {
InterestingItemsFilesSetSettings.writeDefinitionsFile(configDirFile.getAbsolutePath(), resourceFilesSet); rulesConfigDir.mkdirs();
} catch (FilesSetsManager.FilesSetsManagerException ex) { } catch (SecurityException ex) {
String configDirFilePath = configDirFile.getAbsolutePath(); LOGGER.log(Level.WARNING, "Unable to write FilesSet data to disk at: " + configDirFile.getAbsolutePath(), ex);
LOGGER.log(Level.WARNING, "Unable to write FilesSet data to disk at: " + configDirFilePath, ex); return;
}
boolean successfulWrite = InterestingItemsFilesSetSettings.exportXmlDefinitionsFile(configDirFile,
resourceFilesSet.values().stream().collect(Collectors.toList()));
if (!successfulWrite) {
LOGGER.log(Level.WARNING, "Unable to write FilesSet data to disk at: " + configDirFile.getAbsolutePath());
} }
} }