Skip to content
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

Jump to bottom

Fixed rest status for the replication action failure with DLS/FLS #1677

Merged
merged 1 commit into from
Mar 15, 2022
Merged

Fixed rest status for the replication action failure with DLS/FLS #1677

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
4 changes: 3 additions & 1 deletion src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.index.query.ParsedQuery;
import org.opensearch.rest.RestStatus;
import org.opensearch.search.DocValueFormat;
import org.opensearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.BucketOrder;
Expand Down Expand Up @@ -255,7 +256,8 @@ public boolean invoke(String action, ActionRequest request, final ActionListener
}

if(action.contains("plugins/replication")) {
listener.onFailure(new OpenSearchSecurityException("Cross Cluster Replication is not supported when FLS or DLS or Fieldmasking is activated"));
listener.onFailure(new OpenSearchSecurityException("Cross Cluster Replication is not supported when FLS or DLS or Fieldmasking is activated",
RestStatus.FORBIDDEN));
return false;
}

Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/opensearch/security/dlic/dlsfls/CCReplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import org.opensearch.plugins.ActionPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.rest.RestStatus;
import org.opensearch.script.ScriptService;
import org.opensearch.security.OpenSearchSecurityPlugin;
import org.opensearch.security.support.ConfigConstants;
Expand Down Expand Up @@ -221,6 +222,7 @@ public void testReplication() throws Exception {
log.warn(ex.getMessage());
Assert.assertNotNull(ex);
Assert.assertTrue(ex.getMessage().contains("Cross Cluster Replication is not supported when FLS or DLS or Fieldmasking is activated"));
Assert.assertEquals(ex.status(), RestStatus.FORBIDDEN);
}

try (Node node = new PluginAwareNode(false, tcSettings, Netty4Plugin.class, OpenSearchSecurityPlugin.class, MockReplicationPlugin.class).start()) {
Expand All @@ -230,6 +232,7 @@ public void testReplication() throws Exception {
log.warn(ex.getMessage());
Assert.assertNotNull(ex);
Assert.assertTrue(ex.getMessage().contains("Cross Cluster Replication is not supported when FLS or DLS or Fieldmasking is activated"));
Assert.assertEquals(ex.status(), RestStatus.FORBIDDEN);
}

try (Node node = new PluginAwareNode(false, tcSettings, Netty4Plugin.class, OpenSearchSecurityPlugin.class, MockReplicationPlugin.class).start()) {
Expand All @@ -239,6 +242,7 @@ public void testReplication() throws Exception {
log.warn(ex.getMessage());
Assert.assertNotNull(ex);
Assert.assertTrue(ex.getMessage().contains("Cross Cluster Replication is not supported when FLS or DLS or Fieldmasking is activated"));
Assert.assertEquals(ex.status(), RestStatus.FORBIDDEN);
}

try (Node node = new PluginAwareNode(false, tcSettings, Netty4Plugin.class, OpenSearchSecurityPlugin.class, MockReplicationPlugin.class).start()) {
Expand Down