Merge pull request #5266 from thc202/automation/parse-locale

automation: correct threshold/strength parsing

Author: psiinon

addOns/automation/CHANGELOG.md

@@ -4,7 +4,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
+- Correct parsing of attack strength and alert threshold in some locales.
 
 ## [0.35.0] - 2024-01-16
 ### Added

addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/JobUtils.java

@@ -87,7 +87,7 @@ public static AttackStrength parseAttackStrength(
         }
         if (o instanceof String) {
             try {
-                strength = AttackStrength.valueOf(((String) o).toUpperCase());
+                strength = AttackStrength.valueOf(((String) o).toUpperCase(Locale.ROOT));
             } catch (Exception e) {
                 progress.warn(
                         Constant.messages.getString("automation.error.ascan.strength", jobName, o));
@@ -107,7 +107,7 @@ public static AlertThreshold parseAlertThreshold(
         }
         if (o instanceof String) {
             try {
-                threshold = AlertThreshold.valueOf(((String) o).toUpperCase());
+                threshold = AlertThreshold.valueOf(((String) o).toUpperCase(Locale.ROOT));
             } catch (Exception e) {
                 progress.warn(
                         Constant.messages.getString(

addOns/automation/src/test/java/org/zaproxy/addon/automation/jobs/JobUtilsUnitTest.java

@@ -39,11 +39,16 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.quality.Strictness;
 import org.parosproxy.paros.Constant;
 import org.parosproxy.paros.control.Control;
+import org.parosproxy.paros.core.scanner.Plugin.AlertThreshold;
+import org.parosproxy.paros.core.scanner.Plugin.AttackStrength;
 import org.parosproxy.paros.extension.ExtensionLoader;
 import org.parosproxy.paros.model.Model;
 import org.zaproxy.addon.automation.AutomationEnvironment;
@@ -409,6 +414,47 @@ void shouldReturnFileFromRelativePathWithVars() {
         assertFilePath(f, "/full/path/dir/relative/path/to/file");
     }
 
+    static Stream<Locale> locales() {
+        return Stream.of(
+                Locale.ROOT, Locale.ENGLISH, new Locale.Builder().setLanguage("TR").build());
+    }
+
+    @ParameterizedTest
+    @MethodSource("locales")
+    void shouldParseAttackStrengthInDifferentLocales(Locale locale) {
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            // Given
+            Locale.setDefault(locale);
+            AutomationProgress progress = mock(AutomationProgress.class);
+            // When
+            AttackStrength attackStrength = JobUtils.parseAttackStrength("medium", "job", progress);
+            // Then
+            assertThat(attackStrength, is(equalTo(AttackStrength.MEDIUM)));
+            verifyNoInteractions(progress);
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("locales")
+    void shouldParseAlertThresholdInDifferentLocales(Locale locale) {
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            // Given
+            Locale.setDefault(locale);
+            AutomationProgress progress = mock(AutomationProgress.class);
+            // When
+            AlertThreshold alertThreshold = JobUtils.parseAlertThreshold("medium", "job", progress);
+            // Then
+            assertThat(alertThreshold, is(equalTo(AlertThreshold.MEDIUM)));
+            verifyNoInteractions(progress);
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
+
     private static void assertFilePath(File file, String path) {
         assertThat(
                 file.toPath().normalize().toAbsolutePath(), is(Paths.get(path).toAbsolutePath()));