Merge pull request #810 from akto-api-security/feature_test_chaining_…

…fixes Feature test chaining fixes
akto-api-security · Jan 11, 2024 · 842f4bb · 842f4bb
2 parents c6e9a22 + b3bfd96
commit 842f4bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java b/apps/testing/src/main/java/com/akto/test_editor/execution/VariableResolver.java
@@ -230,7 +230,7 @@ public static String resolveAuthContext(String expression, Map<String, List<Stri
     }
 
     public static Boolean isWordListVariable(Object key, Map<String, Object> varMap) {
-        if (key == null || !(key instanceof String)) {
+        if (key == null) {
             return false;
         }
 
@@ -363,7 +363,7 @@ public static Map<String, List<String>> resolveWordList(Map<String, List<String>
     }
 
 
-    public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, List<String>>  sampleDataMap, ApiInfo.ApiInfoKey apiInfoKey) {
+    public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, List<String>> sampleDataMap, ApiInfo.ApiInfoKey apiInfoKey) {
 
         for (String k: varMap.keySet()) {
             if (!k.contains("wordList_")) {
@@ -404,9 +404,9 @@ public static void resolveWordList(Map<String, Object> varMap, Map<ApiInfoKey, L
                     if (infoKey.getApiCollectionId() != apiInfoKey.getApiCollectionId()) {
                         continue;
                     }
-                    if (infoKey.equals(apiInfoKey)) {
-                        sample.remove(0);
-                    }
+                    // if (infoKey.equals(apiInfoKey)) {
+                    //     sample.remove(0);
+                    // }
                     modifiedSampleDataMap.put(infoKey, sample);
                 }
             } else {

diff --git a/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java b/apps/testing/src/main/java/com/akto/test_editor/filter/FilterAction.java
@@ -623,7 +623,8 @@ public void extractQueryParams(FilterActionRequest filterActionRequest, Map<Stri
 
         Object val = null;
         List<String> querySet = (List<String>) filterActionRequest.getQuerySet();
-        String key = querySet.get(0);
+        Object k = querySet.get(0);
+        String key = k.toString();
 
         String queryParams = rawApi.getRequest().getQueryParams();
         String url = filterActionRequest.getApiInfoKey().getUrl();