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

5239 prevent duplicate named rules being created

Browse Source
This commit is contained in:
William Schaefer 2019-06-28 12:50:43 -04:00
parent f2330a91d1
commit e3887088c8
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED
View File

@ -37,6 +37,9 @@ ConfigVisualPanel2.editConfiguration=Configure imager
ConfigVisualPanel2.editRuleError=Edit rule error ConfigVisualPanel2.editRuleError=Edit rule error
ConfigVisualPanel2.editRuleSet=Edit Rule ConfigVisualPanel2.editRuleSet=Edit Rule
ConfigVisualPanel2.newRule.name=New Rule ConfigVisualPanel2.newRule.name=New Rule
# {0} - ruleName
ConfigVisualPanel2.newRuleError.duplicateName=A rule with named "{0}" already exists please choose a different name
ConfigVisualPanel2.newRuleError.title=New rule error
ConfigVisualPanel2.ok=OK ConfigVisualPanel2.ok=OK
ConfigVisualPanel2.rulesTable.columnModel.title0=Rule Name ConfigVisualPanel2.rulesTable.columnModel.title0=Rule Name
ConfigVisualPanel2.rulesTable.columnModel.title1=Description ConfigVisualPanel2.rulesTable.columnModel.title1=Description

33
Core/src/org/sleuthkit/autopsy/logicalimager/configuration/ConfigVisualPanel2.java
View File

@ -442,7 +442,10 @@ final class ConfigVisualPanel2 extends JPanel {
} }
}//GEN-LAST:event_editRuleButtonActionPerformed }//GEN-LAST:event_editRuleButtonActionPerformed
@Messages({"ConfigVisualPanel2.newRule.name=New Rule"}) @Messages({"ConfigVisualPanel2.newRule.name=New Rule",
"ConfigVisualPanel2.newRuleError.title=New rule error",
"# {0} - ruleName",
"ConfigVisualPanel2.newRuleError.duplicateName=A rule with named \"{0}\" already exists please choose a different name"})
private void newRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newRuleButtonActionPerformed private void newRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newRuleButtonActionPerformed
NewRulePanel panel; NewRulePanel panel;
panel = new NewRulePanel(okButton, cancelButton); panel = new NewRulePanel(okButton, cancelButton);
@ -455,14 +458,22 @@ final class ConfigVisualPanel2 extends JPanel {
null, new Object[]{okButton, cancelButton}, okButton); null, new Object[]{okButton, cancelButton}, okButton);
if (option == JOptionPane.OK_OPTION) { if (option == JOptionPane.OK_OPTION) {
try { try {
// Save the new rule
ImmutablePair<String, LogicalImagerRule> ruleMap = panel.toRule(); ImmutablePair<String, LogicalImagerRule> ruleMap = panel.toRule();
if (ruleExists(ruleMap)) {
JOptionPane.showMessageDialog(this,
Bundle.ConfigVisualPanel2_newRuleError_duplicateName(ruleMap.getKey()),
Bundle.ConfigVisualPanel2_newRuleError_title(),
JOptionPane.ERROR_MESSAGE);
continue;
}
// Save the new rule
appendRow(ruleMap); appendRow(ruleMap);
break; break;
} catch (IOException | NumberFormatException ex) { } catch (IOException | NumberFormatException ex) {
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
ex.getMessage(), ex.getMessage(),
"New rule error", Bundle.ConfigVisualPanel2_newRuleError_title(),
JOptionPane.ERROR_MESSAGE); JOptionPane.ERROR_MESSAGE);
// let user fix the error // let user fix the error
} }
@ -767,6 +778,22 @@ final class ConfigVisualPanel2 extends JPanel {
updatePanel(configFilename, config, ruleMap.getKey()); updatePanel(configFilename, config, ruleMap.getKey());
} }
/**
* Check if a rule with the same name as this rule already exists
*
* @param ruleMap the rule to check the name of
*
* @return true if it exists, false otherwise
*/
private boolean ruleExists(ImmutablePair<String, LogicalImagerRule> ruleMap) {
for (LogicalImagerRule rule : getRuleSetFromCurrentConfig().getRules()) {
if (rule.getName().equals(ruleMap.getKey())) {
return true;
}
}
return false;
}
private void appendRow(ImmutablePair<String, LogicalImagerRule> ruleMap) { private void appendRow(ImmutablePair<String, LogicalImagerRule> ruleMap) {
getRuleSetFromCurrentConfig().getRules().add(ruleMap.getValue()); getRuleSetFromCurrentConfig().getRules().add(ruleMap.getValue());
updatePanel(configFilename, config, ruleMap.getKey()); updatePanel(configFilename, config, ruleMap.getKey());