Custom analyzer to reject unknown parameters

docs/changelog/89112.yaml

@@ -0,0 +1,6 @@
+pr: 89112
+summary: Make param check when create custom analyzer
+area: Search/Analysis
+type: enhancement
+issues:
+ - 85710

modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

@@ -59,3 +59,22 @@
     - match:  { detail.tokenizer.tokens.0.token: ABc }
     - match:  { detail.tokenfilters.0.name: lowercase }
     - match:  { detail.tokenfilters.0.tokens.0.token: abc }
+
+---
+"Custom analyzer with not supported param in request":
+  - do:
+      catch: bad_request
+      indices.create:
+        index: test
+        body:
+          settings:
+            analysis:
+              analyzer:
+                my_analyzer:
+                  type: custom
+                  tokenizer: standard
+                  foo: bar
+
+  - match: { status: 400 }
+  - match: { error.type: illegal_argument_exception }
+  - match: { error.reason: "Custom Analyzer not support [foo] now" }

modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/10_match.yml

@@ -16,7 +16,6 @@
                   tokenizer: standard
                   filter: [lowercase]
                 search:
-                  rest_total_hits_as_int: true
                   tokenizer: standard
                   filter: [lowercase, keyword_repeat, porter_stem, unique_stem]
               filter:

server/src/main/java/org/elasticsearch/index/analysis/AnalyzerComponents.java

@@ -44,6 +44,12 @@ static AnalyzerComponents createComponents(
         final Map<String, CharFilterFactory> charFilters,
         final Map<String, TokenFilterFactory> tokenFilters
     ) {
+        for (String key : analyzerSettings.keySet()) {
+            switch (key) {
+                case "tokenizer", "char_filter", "filter", "type", "position_increment_gap" -> {}
+                default -> throw new IllegalArgumentException("Custom Analyzer not support [" + key + "] now");
+            }
+        }
         String tokenizerName = analyzerSettings.get("tokenizer");
         if (tokenizerName == null) {
             throw new IllegalArgumentException("Custom Analyzer [" + name + "] must be configured with a tokenizer");

server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java

@@ -9,10 +9,14 @@
 package org.elasticsearch.index.analysis;
 
 import org.apache.lucene.analysis.CharArraySet;
+import org.elasticsearch.Version;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.TestEnvironment;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.test.ESTestCase;
+import org.junit.BeforeClass;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
@@ -27,9 +31,18 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.elasticsearch.index.analysis.AnalyzerComponents.createComponents;
 import static org.hamcrest.Matchers.is;
 
 public class AnalysisTests extends ESTestCase {
+    private static TestAnalysis testAnalysis;
+    private static Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
+
+    @BeforeClass
+    public static void setup() throws IOException {
+        testAnalysis = createTestAnalysis(new Index("test", "_na_"), settings);
+    }
+
     public void testParseStemExclusion() {
         /* Comma separated list */
         Settings settings = Settings.builder().put("stem_exclusion", "foo,bar").build();
@@ -103,4 +116,15 @@ public void testParseWordList() throws IOException {
         List<String> wordList = Analysis.getWordList(env, nodeSettings, "foo.bar");
         assertEquals(Arrays.asList("hello", "world"), wordList);
     }
+
+    public void testCustomAnalyzerWithNotSupportKey() {
+        Settings analyzerSettings = Settings.builder().put("tokenizer", "standard").put("foo", "bar").put("type", "custom").build();
+
+        try {
+            createComponents("my_analyzer", analyzerSettings, testAnalysis.tokenizer, testAnalysis.charFilter, testAnalysis.tokenFilter);
+            fail("expected failure");
+        } catch (IllegalArgumentException e) {
+            assertEquals(e.getMessage(), "Custom Analyzer not support [foo] now");
+        }
+    }
 }