From 62a1b183954ddeeac9a86c49f746986b8fb63082 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 13 Oct 2025 16:09:35 -0400 Subject: [PATCH 1/3] Declare credential.openai_key as sensitive param in create connector API Signed-off-by: Craig Perkins --- .../opensearch/ml/rest/RestMLCreateConnectorAction.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java index c41fe3784e..a0398deb6f 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.util.List; import java.util.Locale; +import java.util.Set; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.ml.common.settings.MLFeatureEnabledSetting; @@ -21,13 +22,14 @@ import org.opensearch.ml.common.transport.connector.MLCreateConnectorRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; +import org.opensearch.rest.RestRequestFilter; import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.transport.client.node.NodeClient; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -public class RestMLCreateConnectorAction extends BaseRestHandler { +public class RestMLCreateConnectorAction extends BaseRestHandler implements RestRequestFilter { private static final String ML_CREATE_CONNECTOR_ACTION = "ml_create_connector_action"; private final MLFeatureEnabledSetting mlFeatureEnabledSetting; @@ -76,4 +78,9 @@ MLCreateConnectorRequest getRequest(RestRequest request) throws IOException { mlCreateConnectorInput.setTenantId(tenantId); return new MLCreateConnectorRequest(mlCreateConnectorInput); } + + @Override + public Set getFilteredFields() { + return Set.of("credential.openai_key"); + } } From cf0c5bfacec1edb2e2ccb0c95cbd49c956386b4f Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 13 Oct 2025 16:15:44 -0400 Subject: [PATCH 2/3] Do the same for headers Signed-off-by: Craig Perkins --- .../org/opensearch/ml/rest/RestMLCreateConnectorAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java index a0398deb6f..6f8c37fc7b 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java @@ -81,6 +81,6 @@ MLCreateConnectorRequest getRequest(RestRequest request) throws IOException { @Override public Set getFilteredFields() { - return Set.of("credential.openai_key"); + return Set.of("credential.openai_key", "actions.headers"); } } From 9bbfcf792bad24ccf14bc13e54b6c8adf3ff6625 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 13 Oct 2025 16:16:17 -0400 Subject: [PATCH 3/3] Revert actions.headers Signed-off-by: Craig Perkins --- .../org/opensearch/ml/rest/RestMLCreateConnectorAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java index 6f8c37fc7b..a0398deb6f 100644 --- a/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java +++ b/plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java @@ -81,6 +81,6 @@ MLCreateConnectorRequest getRequest(RestRequest request) throws IOException { @Override public Set getFilteredFields() { - return Set.of("credential.openai_key", "actions.headers"); + return Set.of("credential.openai_key"); } }