Misc fixes (#938)

* Null interpolation protection

* Rules for Cursor

* Rules for Windsurf

---------

Co-authored-by: Erik Schultink <[email protected]>

Author: aperez-worklytics

infra/modules/aws-psoxy-rest/test_script.tftpl

@@ -1,8 +1,10 @@
 #!/bin/bash
+
 METHOD=$${1:-"GET"}
 API_PATH=$${2:-${try(example_api_get_requests[0].path, "")}}
 CONTENT_TYPE=$${3:-""}
 BODY=$${4:-""}
+
 echo "Quick test of ${function_name} ..."
 
 ${command_cli_call} -u "${proxy_endpoint_url}/" --health-check
@@ -14,6 +16,7 @@ ${command_cli_call} -u "${proxy_endpoint_url}$API_PATH" ${impersonation_param} -
 %{ endif ~}
 
 echo "Invoke this script with any of the following as arguments to test other endpoints:"
+
 %{ for example_api_get_request in example_api_get_requests ~}
     printf "\t%s\n" "${example_api_get_request.method} '${example_api_get_request.path}'"
 %{ endfor ~}

infra/modules/gcp-psoxy-rest/test_script.tftpl

@@ -1,8 +1,10 @@
 #!/bin/bash
+
 METHOD=$${1:-"GET"}
 API_PATH=$${2:-${try(example_api_get_requests[0].path, "")}}
 CONTENT_TYPE=$${3:-""}
 BODY=$${4:-""}
+
 echo "Quick test of ${function_name} ..."
 
 ${command_cli_call} -u "${proxy_endpoint_url}/" --health-check
@@ -14,6 +16,7 @@ ${command_cli_call} -u "${proxy_endpoint_url}$API_PATH" ${impersonation_param} -
 %{ endif ~}
 
 echo "Invoke this script with any of the following as arguments to test other endpoints:"
+
 %{ for example_api_get_request in example_api_get_requests ~}
     printf "\t%s\n" "${example_api_get_request.method} '${example_api_get_request.path}'"
 %{ endfor ~}

java/core/src/main/java/co/worklytics/psoxy/rules/PrebuiltSanitizerRules.java

@@ -7,14 +7,16 @@
 public class PrebuiltSanitizerRules {
 
     static public final Map<String, RESTRules> DEFAULTS = ImmutableMap.<String, RESTRules>builder()
-            .put("asana", co.worklytics.psoxy.rules.asana.PrebuiltSanitizerRules.ASANA)
-            .putAll(co.worklytics.psoxy.rules.github.PrebuiltSanitizerRules.RULES_MAP)
-            .putAll(co.worklytics.psoxy.rules.google.PrebuiltSanitizerRules.GOOGLE_DEFAULT_RULES_MAP)
-            .putAll(co.worklytics.psoxy.rules.atlassian.jira.PrebuiltSanitizerRules.RULES_MAP)
-            .putAll(co.worklytics.psoxy.rules.msft.PrebuiltSanitizerRules.MSFT_DEFAULT_RULES_MAP)
-            .put("salesforce", co.worklytics.psoxy.rules.salesforce.PrebuiltSanitizerRules.SALESFORCE)
-            .putAll(co.worklytics.psoxy.rules.slack.PrebuiltSanitizerRules.SLACK_DEFAULT_RULES_MAP)
-            .putAll(co.worklytics.psoxy.rules.zoom.PrebuiltSanitizerRules.ZOOM_PREBUILT_RULES_MAP)
-            .putAll(co.worklytics.psoxy.rules.dropbox.PrebuiltSanitizerRules.DROPBOX_PREBUILT_RULES_MAP)
-            .build();
-}
+        .put("asana", co.worklytics.psoxy.rules.asana.PrebuiltSanitizerRules.ASANA)
+        .putAll(co.worklytics.psoxy.rules.cursor.PrebuiltSanitizerRules.CURSOR_DEFAULT_RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.github.PrebuiltSanitizerRules.RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.google.PrebuiltSanitizerRules.GOOGLE_DEFAULT_RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.atlassian.jira.PrebuiltSanitizerRules.RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.msft.PrebuiltSanitizerRules.MSFT_DEFAULT_RULES_MAP)
+        .put("salesforce", co.worklytics.psoxy.rules.salesforce.PrebuiltSanitizerRules.SALESFORCE)
+        .putAll(co.worklytics.psoxy.rules.slack.PrebuiltSanitizerRules.SLACK_DEFAULT_RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.windsurf.PrebuiltSanitizerRules.WINDSURF_DEFAULT_RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.zoom.PrebuiltSanitizerRules.ZOOM_PREBUILT_RULES_MAP)
+        .putAll(co.worklytics.psoxy.rules.dropbox.PrebuiltSanitizerRules.DROPBOX_PREBUILT_RULES_MAP)
+        .build();
+}

java/core/src/main/java/co/worklytics/psoxy/rules/cursor/PrebuiltSanitizerRules.java

@@ -0,0 +1,21 @@
+package co.worklytics.psoxy.rules.cursor;
+
+import co.worklytics.psoxy.rules.RESTRules;
+import co.worklytics.psoxy.rules.Rules2;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+/**
+ * Prebuilt sanitization rules for Cursor responses
+ */
+public class PrebuiltSanitizerRules {
+
+
+    static final RESTRules CURSOR = Rules2.load("sources/cursor/cursor.yaml");
+
+    static public final Map<String, RESTRules> CURSOR_DEFAULT_RULES_MAP =
+        ImmutableMap.<String, RESTRules>builder()
+            .put("cursor", CURSOR)
+            .build();
+}

java/core/src/main/java/co/worklytics/psoxy/rules/windsurf/PrebuiltSanitizerRules.java

@@ -0,0 +1,21 @@
+package co.worklytics.psoxy.rules.windsurf;
+
+import co.worklytics.psoxy.rules.RESTRules;
+import co.worklytics.psoxy.rules.Rules2;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+/**
+ * Prebuilt sanitization rules for Cursor responses
+ */
+public class PrebuiltSanitizerRules {
+
+
+    static final RESTRules WINDSURF = Rules2.load("sources/windsurf/windsurf.yaml");
+
+    static public final Map<String, RESTRules> WINDSURF_DEFAULT_RULES_MAP =
+        ImmutableMap.<String, RESTRules>builder()
+            .put("windsurf", WINDSURF)
+            .build();
+}