Init commit: same as cps/prohibit-_project-mappings branch

Author: quux00

server/src/main/java/org/elasticsearch/index/mapper/MapperRegistry.java

@@ -31,12 +31,29 @@ public final class MapperRegistry {
     private final Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers6x;
     private final Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers5x;
     private final Function<String, FieldPredicate> fieldFilter;
+    private final RootObjectMapperNamespaceValidator namespaceValidator;
 
+    // MP TODO: remove this? Or keep?
     public MapperRegistry(
         Map<String, Mapper.TypeParser> mapperParsers,
         Map<String, RuntimeField.Parser> runtimeFieldParsers,
         Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers,
         Function<String, FieldPredicate> fieldFilter
+    ) {
+        // MP TODO: remove this no-op RootObjectMapperNamespaceValidator once we know how all this is going to work
+        this(mapperParsers, runtimeFieldParsers, metadataMapperParsers, fieldFilter, new RootObjectMapperNamespaceValidator() {
+            @Override
+            public void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper) {}
+        });
+    }
+
+    // MP TODO: need to move/create tests to use this
+    public MapperRegistry(
+        Map<String, Mapper.TypeParser> mapperParsers,
+        Map<String, RuntimeField.Parser> runtimeFieldParsers,
+        Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers,
+        Function<String, FieldPredicate> fieldFilter,
+        RootObjectMapperNamespaceValidator namespaceValidator
     ) {
         this.mapperParsers = Collections.unmodifiableMap(new LinkedHashMap<>(mapperParsers));
         this.runtimeFieldParsers = runtimeFieldParsers;
@@ -50,6 +67,7 @@ public MapperRegistry(
         metadata5x.put(LegacyTypeFieldMapper.NAME, LegacyTypeFieldMapper.PARSER);
         this.metadataMapperParsers5x = metadata5x;
         this.fieldFilter = fieldFilter;
+        this.namespaceValidator = namespaceValidator;
     }
 
     /**
@@ -72,6 +90,10 @@ public Map<String, RuntimeField.Parser> getRuntimeFieldParsers() {
         return runtimeFieldParsers;
     }
 
+    public RootObjectMapperNamespaceValidator getNamespaceValidator() {
+        return namespaceValidator;
+    }
+
     /**
      * Return a map of the meta mappers that have been registered. The
      * returned map uses the name of the field as a key.

server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java

@@ -548,12 +548,17 @@ public final Optional<SourceKeepMode> sourceKeepMode() {
     }
 
     @Override
-    public void validate(MappingLookup mappers) {
+    public final void validate(MappingLookup mappers) {
         for (Mapper mapper : this.mappers.values()) {
             mapper.validate(mappers);
+            validateSubField(mapper, mappers);
         }
     }
 
+    protected void validateSubField(Mapper mapper, MappingLookup mappers) {
+        mapper.validate(mappers);
+    }
+
     protected MapperMergeContext createChildContext(MapperMergeContext mapperMergeContext, String name) {
         return mapperMergeContext.createChildContext(name, dynamic);
     }

server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java

@@ -540,4 +540,21 @@ private static boolean processField(
     public int getTotalFieldsCount() {
         return super.getTotalFieldsCount() - 1 + runtimeFields.size();
     }
+
+    // MP TODO: - this needs to move to a serverless class, right?
+    private static final String RESERVED_NAMESPACE = "_project";
+
+    @Override
+    protected void validateSubField(Mapper mapper, MappingLookup mappers) {
+        if (subobjects() == Subobjects.ENABLED) {
+            if (mapper.leafName().equals(RESERVED_NAMESPACE)) {
+                throw new IllegalArgumentException("Reserved Namespace. Fields may not start with " + RESERVED_NAMESPACE);
+            }
+        } else {
+            if (mapper.leafName().startsWith(RESERVED_NAMESPACE)) {
+                throw new IllegalArgumentException("Reserved Namespace. Fields may not start with " + RESERVED_NAMESPACE);
+            }
+        }
+        super.validateSubField(mapper, mappers);
+    }
 }

server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapperNamespaceValidator.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.index.mapper;
+
+/**
+ * TODO: DOCUMENT ME
+ */
+public interface RootObjectMapperNamespaceValidator {
+    void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper);
+}

server/src/main/java/org/elasticsearch/indices/IndicesModule.java

@@ -57,6 +57,7 @@
 import org.elasticsearch.index.mapper.ObjectMapper;
 import org.elasticsearch.index.mapper.PassThroughObjectMapper;
 import org.elasticsearch.index.mapper.RangeType;
+import org.elasticsearch.index.mapper.RootObjectMapperNamespaceValidator;
 import org.elasticsearch.index.mapper.RoutingFieldMapper;
 import org.elasticsearch.index.mapper.RuntimeField;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
@@ -94,12 +95,30 @@
 public class IndicesModule extends AbstractModule {
     private final MapperRegistry mapperRegistry;
 
+    // TODO: this needs to be loaded from serverless somehow
+    private static final String RESERVED_NAMESPACE = "_project";
+
     public IndicesModule(List<MapperPlugin> mapperPlugins) {
         this.mapperRegistry = new MapperRegistry(
             getMappers(mapperPlugins),
             getRuntimeFields(mapperPlugins),
             getMetadataMappers(mapperPlugins),
-            getFieldFilter(mapperPlugins)
+            getFieldFilter(mapperPlugins),
+            new RootObjectMapperNamespaceValidator() {
+                @Override
+                public void validateNamespace(ObjectMapper.Subobjects subobjects, Mapper mapper) {
+                    // TODO: in the future, this will be a no-op on stateful and loaded somehow dynamically in serverless
+                    if (subobjects == ObjectMapper.Subobjects.ENABLED) {
+                        if (mapper.leafName().equals(RESERVED_NAMESPACE)) {
+                            throw new IllegalArgumentException("xx reserved namespace: [" + RESERVED_NAMESPACE + ']');
+                        }
+                    } else {
+                        if (mapper.leafName().startsWith(RESERVED_NAMESPACE)) {
+                            throw new IllegalArgumentException("xx reserved namespace: [" + RESERVED_NAMESPACE + ']');
+                        }
+                    }
+                }
+            }
         );
     }