remove allowExplicitIndex

Signed-off-by: Karen Xu <karenxyr@gmail.com>

Author: karenyrx

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/GrpcPlugin.java

@@ -210,7 +210,7 @@ public Map<String, Supplier<AuxTransport>> getAuxTransports(
 
         return Collections.singletonMap(GRPC_TRANSPORT_SETTING_KEY, () -> {
             List<BindableService> grpcServices = new ArrayList<>(
-                List.of(new DocumentServiceImpl(client, settings), new SearchServiceImpl(client, queryUtils))
+                List.of(new DocumentServiceImpl(client), new SearchServiceImpl(client, queryUtils))
             );
             for (GrpcServiceFactory serviceFac : servicesFactory) {
                 List<BindableService> pluginServices = serviceFac.initClient(client)
@@ -261,7 +261,7 @@ public Map<String, Supplier<AuxTransport>> getSecureAuxTransports(
         }
         return Collections.singletonMap(GRPC_SECURE_TRANSPORT_SETTING_KEY, () -> {
             List<BindableService> grpcServices = new ArrayList<>(
-                List.of(new DocumentServiceImpl(client, settings), new SearchServiceImpl(client, queryUtils))
+                List.of(new DocumentServiceImpl(client), new SearchServiceImpl(client, queryUtils))
             );
             for (GrpcServiceFactory serviceFac : servicesFactory) {
                 List<BindableService> pluginServices = serviceFac.initClient(client)

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java

@@ -107,7 +107,6 @@ static MediaType detectMediaType(byte[] document) {
      * @param defaultFetchSourceContext
      * @param defaultPipeline
      * @param defaultRequireAlias
-     * @param allowExplicitIndex whether explicit index specification is allowed (security setting)
      * @return
      */
     public static DocWriteRequest<?>[] getDocWriteRequests(
@@ -116,8 +115,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
         String defaultRouting,
         FetchSourceContext defaultFetchSourceContext,
         String defaultPipeline,
-        Boolean defaultRequireAlias,
-        boolean allowExplicitIndex
+        Boolean defaultRequireAlias
     ) {
         List<BulkRequestBody> bulkRequestBodyList = request.getBulkRequestBodyList();
         DocWriteRequest<?>[] docWriteRequests = new DocWriteRequest<?>[bulkRequestBodyList.size()];
@@ -155,9 +153,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
                         pipeline,
                         ifSeqNo,
                         ifPrimaryTerm,
-                        requireAlias,
-                        defaultIndex,
-                        allowExplicitIndex
+                        requireAlias
                     );
                     break;
                 case INDEX:
@@ -173,13 +169,11 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
                         pipeline,
                         ifSeqNo,
                         ifPrimaryTerm,
-                        requireAlias,
-                        defaultIndex,
-                        allowExplicitIndex
+                        requireAlias
                     );
                     break;
                 case UPDATE:
-                    // Extract the doc field from UpdateAction (matches REST API structure)
+                    // Extract the doc field from UpdateAction
                     // Use ByteString directly to avoid unnecessary byte array allocation
                     ByteString updateDocBytes = ByteString.EMPTY;
                     if (bulkRequestBodyEntry.hasUpdateAction() && bulkRequestBodyEntry.getUpdateAction().hasDoc()) {
@@ -201,9 +195,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
                         pipeline,
                         ifSeqNo,
                         ifPrimaryTerm,
-                        requireAlias,
-                        defaultIndex,
-                        allowExplicitIndex
+                        requireAlias
                     );
                     break;
                 case DELETE:
@@ -215,9 +207,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
                         version,
                         versionType,
                         ifSeqNo,
-                        ifPrimaryTerm,
-                        defaultIndex,
-                        allowExplicitIndex
+                        ifPrimaryTerm
                     );
                     break;
                 case OPERATIONCONTAINER_NOT_SET:
@@ -246,8 +236,6 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
      * @param ifSeqNo The default sequence number for optimistic concurrency control
      * @param ifPrimaryTerm The default primary term for optimistic concurrency control
      * @param requireAlias Whether the index must be an alias
-     * @param defaultIndex The default index from the request URL (for security check)
-     * @param allowExplicitIndex Whether explicit index specification is allowed
      * @return The constructed IndexRequest
      */
     public static IndexRequest buildCreateRequest(
@@ -261,15 +249,9 @@ public static IndexRequest buildCreateRequest(
         String pipeline,
         long ifSeqNo,
         long ifPrimaryTerm,
-        boolean requireAlias,
-        String defaultIndex,
-        boolean allowExplicitIndex
+        boolean requireAlias
     ) {
-        // Check explicit index (matches REST BulkRequestParser line 218-221)
         if (createOperation.hasXIndex()) {
-            if (!allowExplicitIndex && defaultIndex != null) {
-                throw new IllegalArgumentException("explicit index in bulk is not allowed");
-            }
             index = createOperation.getXIndex();
         }
 
@@ -307,8 +289,6 @@ public static IndexRequest buildCreateRequest(
      * @param ifSeqNo The default sequence number for optimistic concurrency control
      * @param ifPrimaryTerm The default primary term for optimistic concurrency control
      * @param requireAlias Whether the index must be an alias
-     * @param defaultIndex The default index from the request URL (for security check)
-     * @param allowExplicitIndex Whether explicit index specification is allowed
      * @return The constructed IndexRequest
      */
     public static IndexRequest buildIndexRequest(
@@ -323,17 +303,11 @@ public static IndexRequest buildIndexRequest(
         String pipeline,
         long ifSeqNo,
         long ifPrimaryTerm,
-        boolean requireAlias,
-        String defaultIndex,
-        boolean allowExplicitIndex
+        boolean requireAlias
     ) {
         opType = indexOperation.hasOpType() ? indexOperation.getOpType() : opType;
 
-        // Check explicit index (matches REST BulkRequestParser line 218-221)
         if (indexOperation.hasXIndex()) {
-            if (!allowExplicitIndex && defaultIndex != null) {
-                throw new IllegalArgumentException("explicit index in bulk is not allowed");
-            }
             index = indexOperation.getXIndex();
         }
 
@@ -390,8 +364,6 @@ public static IndexRequest buildIndexRequest(
      * @param ifSeqNo The default sequence number for optimistic concurrency control
      * @param ifPrimaryTerm The default primary term for optimistic concurrency control
      * @param requireAlias Whether the index must be an alias
-     * @param defaultIndex The default index from the request URL (for security check)
-     * @param allowExplicitIndex Whether explicit index specification is allowed
      * @return The constructed UpdateRequest
      */
     public static UpdateRequest buildUpdateRequest(
@@ -406,15 +378,9 @@ public static UpdateRequest buildUpdateRequest(
         String pipeline,
         long ifSeqNo,
         long ifPrimaryTerm,
-        boolean requireAlias,
-        String defaultIndex,
-        boolean allowExplicitIndex
+        boolean requireAlias
     ) {
-        // Check explicit index (matches REST BulkRequestParser line 218-221)
         if (updateOperation.hasXIndex()) {
-            if (!allowExplicitIndex && defaultIndex != null) {
-                throw new IllegalArgumentException("explicit index in bulk is not allowed");
-            }
             index = updateOperation.getXIndex();
         }
 
@@ -550,8 +516,6 @@ static UpdateRequest fromProto(
      * @param versionType The default version type
      * @param ifSeqNo The default sequence number for optimistic concurrency control
      * @param ifPrimaryTerm The default primary term for optimistic concurrency control
-     * @param defaultIndex The default index from the request URL (for security check)
-     * @param allowExplicitIndex Whether explicit index specification is allowed
      * @return The constructed DeleteRequest
      */
     public static DeleteRequest buildDeleteRequest(
@@ -562,15 +526,9 @@ public static DeleteRequest buildDeleteRequest(
         long version,
         VersionType versionType,
         long ifSeqNo,
-        long ifPrimaryTerm,
-        String defaultIndex,
-        boolean allowExplicitIndex
+        long ifPrimaryTerm
     ) {
-        // Check explicit index (matches REST BulkRequestParser line 218-221)
         if (deleteOperation.hasXIndex()) {
-            if (!allowExplicitIndex && defaultIndex != null) {
-                throw new IllegalArgumentException("explicit index in bulk is not allowed");
-            }
             index = deleteOperation.getXIndex();
         }
 

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java

@@ -9,7 +9,6 @@
 package org.opensearch.transport.grpc.proto.request.document.bulk;
 
 import org.opensearch.action.bulk.BulkShardRequest;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.protobufs.BulkRequest;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.document.RestBulkAction;
@@ -37,11 +36,16 @@ private BulkRequestProtoUtils() {
      * Similar to {@link RestBulkAction#prepareRequest(RestRequest, NodeClient)}
      * Please ensure to keep both implementations consistent.
      *
+     * Note: Unlike REST API, gRPC does not enforce the allowExplicitIndex security setting.
+     * In REST, this setting provides network-level security by allowing proxies to filter
+     * requests based on URL paths. In gRPC, both default_index and x_index are in the
+     * request body, making this check ineffective for network-level security.
+     * For gRPC security, use mTLS, gRPC interceptors, or service mesh policies instead.
+     *
      * @param request the request to execute
-     * @param settings node settings for security and configuration
      * @return a future of the bulk action that was executed
      */
-    public static org.opensearch.action.bulk.BulkRequest prepareRequest(BulkRequest request, Settings settings) {
+    public static org.opensearch.action.bulk.BulkRequest prepareRequest(BulkRequest request) {
         org.opensearch.action.bulk.BulkRequest bulkRequest = Requests.bulkRequest();
 
         String defaultIndex = request.hasIndex() ? request.getIndex() : null;
@@ -62,9 +66,6 @@ public static org.opensearch.action.bulk.BulkRequest prepareRequest(BulkRequest
 
         bulkRequest.setRefreshPolicy(RefreshProtoUtils.getRefreshPolicy(request.getRefresh()));
 
-        // Read the allowExplicitIndex setting (matches REST BulkAction line 74)
-        boolean allowExplicitIndex = RestBulkAction.MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
-
         // Note: batch_size is deprecated in OS 3.x. Add batch_size parameter when backporting to OS 2.x
         /*
         if (request.hasBatchSize()){
@@ -80,8 +81,7 @@ public static org.opensearch.action.bulk.BulkRequest prepareRequest(BulkRequest
                 defaultRouting,
                 defaultFetchSourceContext,
                 defaultPipeline,
-                defaultRequireAlias,
-                allowExplicitIndex
+                defaultRequireAlias
             )
         );
 

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/services/DocumentServiceImpl.java

@@ -10,7 +10,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.protobufs.services.DocumentServiceGrpc;
 import org.opensearch.transport.client.Client;
 import org.opensearch.transport.grpc.listeners.BulkRequestActionListener;
@@ -26,17 +25,14 @@
 public class DocumentServiceImpl extends DocumentServiceGrpc.DocumentServiceImplBase {
     private static final Logger logger = LogManager.getLogger(DocumentServiceImpl.class);
     private final Client client;
-    private final Settings settings;
 
     /**
      * Creates a new DocumentServiceImpl.
      *
      * @param client Client for executing actions on the local node
-     * @param settings Node settings for security and configuration
      */
-    public DocumentServiceImpl(Client client, Settings settings) {
+    public DocumentServiceImpl(Client client) {
         this.client = client;
-        this.settings = settings;
     }
 
     /**
@@ -48,7 +44,7 @@ public DocumentServiceImpl(Client client, Settings settings) {
     @Override
     public void bulk(org.opensearch.protobufs.BulkRequest request, StreamObserver<org.opensearch.protobufs.BulkResponse> responseObserver) {
         try {
-            org.opensearch.action.bulk.BulkRequest bulkRequest = BulkRequestProtoUtils.prepareRequest(request, settings);
+            org.opensearch.action.bulk.BulkRequest bulkRequest = BulkRequestProtoUtils.prepareRequest(request);
             BulkRequestActionListener listener = new BulkRequestActionListener(responseObserver);
             client.bulk(bulkRequest, listener);
         } catch (RuntimeException e) {