Fixed Security Exceptions For Requests Wihtout PPL Access

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
opensearch-project · Aug 29, 2023 · f03a9ea · f03a9ea
1 parent 627189b
commit f03a9ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
@@ -18,6 +18,7 @@
 import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.OpenSearchException;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.rest.RestStatus;
@@ -134,6 +135,9 @@ public void onFailure(Exception e) {
                       "Failed to explain the query due to error: " + e.getMessage());
                 } else if (e instanceof IllegalAccessException) {
                   reportError(channel, e, BAD_REQUEST);
+                } else if (e instanceof OpenSearchException) {
+                  OpenSearchException exception = (OpenSearchException) e;
+                  reportError(channel, exception, exception.status());
                 } else {
                   LOG.error("Error happened during query handling", e);
                   if (isClientError(e)) {

diff --git a/...eus/src/main/java/org/opensearch/sql/prometheus/exceptions/PrometheusClientException.java b/...eus/src/main/java/org/opensearch/sql/prometheus/exceptions/PrometheusClientException.java
@@ -0,0 +1,2 @@
+package org.opensearch.sql.prometheus.exceptions;public class PrometheusClientException {
+}