From 9a3255df903b6cb8123660af158c7ba07f15c75d Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 28 Jun 2019 12:07:17 -0400 Subject: [PATCH 1/2] 5281 prevent user from setting 0 days within as a condition --- .../configuration/EditNonFullPathsRulePanel.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java index a48db9b2c4..2632ab15ca 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java @@ -710,9 +710,9 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { return (extensionsCheckbox.isSelected() && !StringUtils.isBlank(extensionsTextField.getText()) && !validateExtensions(extensionsTextField).isEmpty()) || (fileNamesCheckbox.isSelected() && !StringUtils.isBlank(fileNamesTextArea.getText())) || (folderNamesCheckbox.isSelected() && !StringUtils.isBlank(folderNamesTextArea.getText())) - || (minSizeCheckbox.isSelected() && !StringUtils.isBlank(minSizeTextField.getText()) && isNonZeroLong(minSizeTextField.getText())) - || (maxSizeCheckbox.isSelected() && !StringUtils.isBlank(maxSizeTextField.getText()) && isNonZeroLong(maxSizeTextField.getText())) - || (modifiedWithinCheckbox.isSelected() && !StringUtils.isBlank(modifiedWithinTextField.getText())); + || (minSizeCheckbox.isSelected() && !StringUtils.isBlank(minSizeTextField.getText()) && isNonZeroLong(minSizeTextField.getValue())) + || (maxSizeCheckbox.isSelected() && !StringUtils.isBlank(maxSizeTextField.getText()) && isNonZeroLong(maxSizeTextField.getValue())) + || (modifiedWithinCheckbox.isSelected() && !StringUtils.isBlank(modifiedWithinTextField.getText()) && isNonZeroLong(modifiedWithinTextField.getValue())); } catch (IOException ex) { logger.log(Level.WARNING, "Invalid contents of extensionsTextField", ex); return false; @@ -722,14 +722,16 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { /** * Check that value could be a non zero long * - * @param numberString the string to check + * @param numberObject the object to check * * @return true if the value is a non-zero long */ - private boolean isNonZeroLong(String numberString) { + private boolean isNonZeroLong(Object numberObject) { Long value = 0L; try { - value = Long.parseLong(numberString); + if (numberObject != null && numberObject instanceof Number) { + value = ((Number) numberObject).longValue(); + } } catch (NumberFormatException ignored) { //The string was not a number, this method will return false becaue the value is still 0L } From e866981524c3d34abd00d6c8fb0d7a7b1d5530f7 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 28 Jun 2019 16:51:13 -0400 Subject: [PATCH 2/2] 5281 remove null check codacy indicates was unnessary --- .../logicalimager/configuration/EditNonFullPathsRulePanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java index 2632ab15ca..962033eef4 100644 --- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java @@ -729,7 +729,7 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel { private boolean isNonZeroLong(Object numberObject) { Long value = 0L; try { - if (numberObject != null && numberObject instanceof Number) { + if (numberObject instanceof Number) { value = ((Number) numberObject).longValue(); } } catch (NumberFormatException ignored) {