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

null ruleName handled. Empty ruleName permitted. hashCode used in rules HashMap

Browse Source
This commit is contained in:
sidheshenator 2015-03-19 17:32:04 -04:00 committed by Richard Cordovano
parent d8761d1547
commit ac37d2641d
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java
View File

@ -150,6 +150,9 @@ final class FilesSet {
* @param pathFilter A file path filter, may be null. * @param pathFilter A file path filter, may be null.
*/ */
Rule(String ruleName, FileNameFilter fileNameFilter, MetaTypeFilter metaTypeFilter, ParentPathFilter pathFilter) { Rule(String ruleName, FileNameFilter fileNameFilter, MetaTypeFilter metaTypeFilter, ParentPathFilter pathFilter) {
if (ruleName == null) {
throw new NullPointerException("Interesting files set rule name cannot be null");
}
if (fileNameFilter == null) { if (fileNameFilter == null) {
throw new IllegalArgumentException("Interesting files set rule file name filter cannot be null"); throw new IllegalArgumentException("Interesting files set rule file name filter cannot be null");
} }

5
Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsManager.java
View File

@ -402,11 +402,6 @@ final class InterestingItemDefsManager extends Observable {
private static String readRuleName(Element elem) { private static String readRuleName(Element elem) {
// The rule must have a name. // The rule must have a name.
String ruleName = elem.getAttribute(FilesSetXML.NAME_ATTR); String ruleName = elem.getAttribute(FilesSetXML.NAME_ATTR);
if (ruleName.isEmpty()) {
// Assume a TSK Framework definitions file is being read and
// synthesize a rule name.
ruleName = UNNAMED_LEGACY_RULE_PREFIX + Integer.toString(FilesSetXML.unnamedLegacyRuleCounter++);
}
return ruleName; return ruleName;
} }

2
Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
View File

@ -306,7 +306,7 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
rules.remove(selectedRule.getName()); rules.remove(selectedRule.getName());
} }
FilesSet.Rule newRule = new FilesSet.Rule(panel.getRuleName(), panel.getFileNameFilter(), panel.getMetaTypeFilter(), panel.getPathFilter()); FilesSet.Rule newRule = new FilesSet.Rule(panel.getRuleName(), panel.getFileNameFilter(), panel.getMetaTypeFilter(), panel.getPathFilter());
rules.put(newRule.toString(), newRule); rules.put(Integer.toString(newRule.hashCode()), newRule);
// Add the new/edited files set definition, replacing any previous // Add the new/edited files set definition, replacing any previous
// definition with the same name and refreshing the display. // definition with the same name and refreshing the display.