Fix exceptions with newer option (#21)

Load the option with the method that defaults to a given value when it does not exist, otherwise this will lead to `NoSuchElementException` until the option is set. Also, use the primitive boolean which is the most appropriate type and prevents `NullPointerException`s as it was null by default. Signed-off-by: thc202 <[email protected]>
SasanLabs · Oct 21, 2023 · 1ea458a · 1ea458a
1 parent 63ec7ba
commit 1ea458a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this add-on will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
+### Fixed
+- Fix exceptions using option introduced in previous version.
 
 ## [1.2.0] - 2023-10-19
  - Ensure i18n resources are always initialized.

diff --git a/src/main/java/org/sasanlabs/fileupload/attacks/FileUploadAttackExecutor.java b/src/main/java/org/sasanlabs/fileupload/attacks/FileUploadAttackExecutor.java
@@ -72,7 +72,7 @@ public FileUploadAttackExecutor(
 
     public boolean executeAttack() throws FileUploadException {
 
-        Boolean shouldSendRequestsAfterFindingVulnerability =
+        boolean shouldSendRequestsAfterFindingVulnerability =
                 FileUploadConfiguration.getInstance().getSendRequestsAfterFindingVulnerability();
 
         for (AttackVector attackVector : attackVectors) {

diff --git a/src/main/java/org/sasanlabs/fileupload/configuration/FileUploadConfiguration.java b/src/main/java/org/sasanlabs/fileupload/configuration/FileUploadConfiguration.java
@@ -47,7 +47,7 @@ public class FileUploadConfiguration extends VersionedAbstractParam {
     private String parseResponseStartIdentifier;
     private String parseResponseEndIdentifier;
 
-    private Boolean sendRequestsAfterFindingVulnerability;
+    private boolean sendRequestsAfterFindingVulnerability;
 
     private static volatile FileUploadConfiguration fileUploadConfiguration;
 
@@ -109,7 +109,7 @@ public void setParseResponseEndIdentifier(String parseResponseEndIdentifier) {
                         parseResponseEndIdentifier);
     }
 
-    public Boolean getSendRequestsAfterFindingVulnerability() {
+    public boolean getSendRequestsAfterFindingVulnerability() {
         return sendRequestsAfterFindingVulnerability;
     }
 
@@ -142,7 +142,7 @@ protected void parseImpl() {
         this.setParseResponseEndIdentifier(
                 getConfig().getString(PARAM_PARSE_RESPONSE_CONFIGURATION_END_IDENTIFIER));
         this.setSendRequestsAfterFindingVulnerability(
-                getConfig().getBoolean(PARAM_SEND_REQUESTS_AFTER_FINDING_VULNERABILITY_IDENTIFIER));
+                getBoolean(PARAM_SEND_REQUESTS_AFTER_FINDING_VULNERABILITY_IDENTIFIER, false));
     }
 
     @Override