From d93da07a2a533a67b8d36ac97b3e3bf7615138a5 Mon Sep 17 00:00:00 2001
From: Hauck <67768441+hauck-jvsh@users.noreply.github.com>
Date: Thu, 15 Sep 2022 00:22:50 -0300
Subject: [PATCH] Ignore all malformed objects when ignore_malformed is true
 (#4494)

Fixes a bug to not fail the entire document when "ignore_malformed" is set to true. Allowing the valid fields
to be indexed and ignore only the malformed fields.

(cherry picked from commit 45c959762a50c1f5ecb9233b0e8d311d92f85cba)
Signed-off-by: Hauck <joaoh14@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 .../opensearch/index/mapper/FieldMapper.java  | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 472d4862aaae7..521c99904994b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Bug]: gradle check failing with java heap OutOfMemoryError (([#4328](https://github.com/opensearch-project/OpenSearch/
 - `opensearch.bat` fails to execute when install path includes spaces ([#4362](https://github.com/opensearch-project/OpenSearch/pull/4362))
 - Fixed flaky test `ResourceAwareTasksTests.testTaskIdPersistsInThreadContext` ([#4484](https://github.com/opensearch-project/OpenSearch/pull/4484))
+- Fixed the ignore_malformed setting to also ignore objects ([#4494](https://github.com/opensearch-project/OpenSearch/pull/4494))
 
 ### Security
 - CVE-2022-25857 org.yaml:snakeyaml DOS vulnerability ([#4341](https://github.com/opensearch-project/OpenSearch/pull/4341))
diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
index 137ca4be1ca87..3acf5d4ea85ee 100644
--- a/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
@@ -34,6 +34,7 @@
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
@@ -268,6 +269,8 @@ public void parse(ParseContext context) throws IOException {
         try {
             parseCreateField(context);
         } catch (Exception e) {
+            boolean ignore_malformed = false;
+            if (context.indexSettings() != null) ignore_malformed = IGNORE_MALFORMED_SETTING.get(context.indexSettings().getSettings());
             String valuePreview = "";
             try {
                 XContentParser parser = context.parser();
@@ -278,23 +281,27 @@ public void parse(ParseContext context) throws IOException {
                     valuePreview = complexValue.toString();
                 }
             } catch (Exception innerException) {
+                if (ignore_malformed == false) {
+                    throw new MapperParsingException(
+                        "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Could not parse field value preview,",
+                        e,
+                        fieldType().name(),
+                        fieldType().typeName(),
+                        context.sourceToParse().id()
+                    );
+                }
+            }
+
+            if (ignore_malformed == false) {
                 throw new MapperParsingException(
-                    "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Could not parse field value preview,",
+                    "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Preview of field's value: '{}'",
                     e,
                     fieldType().name(),
                     fieldType().typeName(),
-                    context.sourceToParse().id()
+                    context.sourceToParse().id(),
+                    valuePreview
                 );
             }
-
-            throw new MapperParsingException(
-                "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Preview of field's value: '{}'",
-                e,
-                fieldType().name(),
-                fieldType().typeName(),
-                context.sourceToParse().id(),
-                valuePreview
-            );
         }
         multiFields.parse(this, context);
     }