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

Empty rule names allowed. Left blank

Browse Source
This commit is contained in:
sidheshenator 2015-03-19 15:27:47 -04:00
parent a5b29c690b
commit 71b0c1c1c5
3 changed files with 1 additions and 18 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,9 +150,6 @@ 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) || (ruleName.isEmpty())) {
throw new IllegalArgumentException("Interesting files set rule name cannot be null or empty");
}
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");
} }

14
Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java
View File

@ -135,20 +135,6 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
* @return True if the definition is valid, false otherwise. * @return True if the definition is valid, false otherwise.
*/ */
boolean isValidRuleDefinition() { boolean isValidRuleDefinition() {
// The rule must have a name.
// If rule name is absent, set it as the Name Pattern since nameTextField cannot be left empty.
if (StringUtils.isBlank(this.ruleNameTextField.getText())) {
String ruleName = this.nameTextField.getText();
if (StringUtils.isNotBlank(ruleName)) {
this.ruleNameTextField.setText(ruleName);
} else {
NotifyDescriptor notifyDesc = new NotifyDescriptor.Message(
NbBundle.getMessage(FilesSetPanel.class, "FilesSetRulePanel.messages.emptyNameFilter"),
NotifyDescriptor.WARNING_MESSAGE);
DialogDisplayer.getDefault().notify(notifyDesc);
return false;
}
}
// The rule must have name filter text. // The rule must have name filter text.
if (this.nameTextField.getText().isEmpty()) { if (this.nameTextField.getText().isEmpty()) {

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.getName(), newRule); rules.put(newRule.toString(), 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.