Skip to content

[Backport 2.19] Declare credential and *.Authorization as sensitive param in create connector API #4429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.19
Choose a base branch
from
Open

[Backport 2.19] Declare credential and *.Authorization as sensitive param in create connector API #4429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/rest/RestMLCreateConnectorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.opensearch.client.node.NodeClient;
import org.opensearch.core.xcontent.XContentParser;
Expand All @@ -22,12 +23,13 @@
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.RestRequestFilter;
import org.opensearch.rest.action.RestToXContentListener;

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;

Expand Down Expand Up @@ -76,4 +78,9 @@ MLCreateConnectorRequest getRequest(RestRequest request) throws IOException {
mlCreateConnectorInput.setTenantId(tenantId);
return new MLCreateConnectorRequest(mlCreateConnectorInput);
}

@Override
public Set<String> getFilteredFields() {
return Set.of("credential", "*.Authorization");
}
}
9 changes: 8 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/rest/RestMLRegisterModelAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.opensearch.client.node.NodeClient;
import org.opensearch.cluster.service.ClusterService;
Expand All @@ -29,12 +30,13 @@
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.RestRequestFilter;
import org.opensearch.rest.action.RestToXContentListener;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;

public class RestMLRegisterModelAction extends BaseRestHandler {
public class RestMLRegisterModelAction extends BaseRestHandler implements RestRequestFilter {
private static final String ML_REGISTER_MODEL_ACTION = "ml_register_model_action";
private final MLFeatureEnabledSetting mlFeatureEnabledSetting;

Expand Down Expand Up @@ -107,4 +109,9 @@ MLRegisterModelRequest getRequest(RestRequest request) throws IOException {
}
return new MLRegisterModelRequest(mlInput);
}

@Override
public Set<String> getFilteredFields() {
return Set.of("connector.credential", "*.Authorization");
}
}
9 changes: 8 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateConnectorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.opensearch.OpenSearchParseException;
import org.opensearch.client.node.NodeClient;
Expand All @@ -24,12 +25,13 @@
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.RestRequestFilter;
import org.opensearch.rest.action.RestToXContentListener;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;

public class RestMLUpdateConnectorAction extends BaseRestHandler {
public class RestMLUpdateConnectorAction extends BaseRestHandler implements RestRequestFilter {
private static final String ML_UPDATE_CONNECTOR_ACTION = "ml_update_connector_action";
private MLFeatureEnabledSetting mlFeatureEnabledSetting;

Expand Down Expand Up @@ -76,4 +78,9 @@ private MLUpdateConnectorRequest getRequest(RestRequest request) throws IOExcept
throw new OpenSearchParseException(illegalStateException.getMessage());
}
}

@Override
public Set<String> getFilteredFields() {
return Set.of("credential", "*.Authorization");
}
}
9 changes: 8 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/rest/RestMLUpdateModelAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.opensearch.OpenSearchParseException;
import org.opensearch.OpenSearchStatusException;
Expand All @@ -26,11 +27,12 @@
import org.opensearch.ml.settings.MLFeatureEnabledSetting;
import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.RestRequestFilter;
import org.opensearch.rest.action.RestToXContentListener;

import com.google.common.collect.ImmutableList;

public class RestMLUpdateModelAction extends BaseRestHandler {
public class RestMLUpdateModelAction extends BaseRestHandler implements RestRequestFilter {

private static final String ML_UPDATE_MODEL_ACTION = "ml_update_model_action";
private MLFeatureEnabledSetting mlFeatureEnabledSetting;
Expand Down Expand Up @@ -90,4 +92,9 @@ private MLUpdateModelRequest getRequest(RestRequest request) throws IOException
throw new OpenSearchParseException(e.getMessage());
}
}

@Override
public Set<String> getFilteredFields() {
return Set.of("connector.credential", "*.Authorization");
}
}
Loading