From d74e0e05f5424a28297033bf5aca29d5533a936f Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Thu, 18 Mar 2021 02:17:16 +0200
Subject: [PATCH] Fix 89878 (#94793) (#94833)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../es_query/es_query/filter_matches_index.test.ts | 14 ++++++++++++++
 .../es_query/es_query/filter_matches_index.ts      |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/src/plugins/data/common/es_query/es_query/filter_matches_index.test.ts b/src/plugins/data/common/es_query/es_query/filter_matches_index.test.ts
index a8c9b9144707d..ad4d7ff8d78e2 100644
--- a/src/plugins/data/common/es_query/es_query/filter_matches_index.test.ts
+++ b/src/plugins/data/common/es_query/es_query/filter_matches_index.test.ts
@@ -31,6 +31,20 @@ describe('filterMatchesIndex', () => {
     expect(filterMatchesIndex(filter, indexPattern)).toBe(true);
   });
 
+  it('should return true if custom filter for the same index is passed', () => {
+    const filter = { meta: { index: 'foo', key: 'bar', type: 'custom' } } as Filter;
+    const indexPattern = { id: 'foo', fields: [{ name: 'bara' }] } as IIndexPattern;
+
+    expect(filterMatchesIndex(filter, indexPattern)).toBe(true);
+  });
+
+  it('should return false if custom filter for a different index is passed', () => {
+    const filter = { meta: { index: 'foo', key: 'bar', type: 'custom' } } as Filter;
+    const indexPattern = { id: 'food', fields: [{ name: 'bara' }] } as IIndexPattern;
+
+    expect(filterMatchesIndex(filter, indexPattern)).toBe(false);
+  });
+
   it('should return false if the filter key does not match a field name', () => {
     const filter = { meta: { index: 'foo', key: 'baz' } } as Filter;
     const indexPattern = { id: 'foo', fields: [{ name: 'bar' }] } as IIndexPattern;
diff --git a/src/plugins/data/common/es_query/es_query/filter_matches_index.ts b/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
index 9fd8567b76e2b..478263d5ce601 100644
--- a/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
+++ b/src/plugins/data/common/es_query/es_query/filter_matches_index.ts
@@ -18,5 +18,12 @@ export function filterMatchesIndex(filter: Filter, indexPattern?: IIndexPattern
   if (!filter.meta?.key || !indexPattern) {
     return true;
   }
+
+  // Fixes https://github.com/elastic/kibana/issues/89878
+  // Custom filters may refer multiple fields. Validate the index id only.
+  if (filter.meta?.type === 'custom') {
+    return filter.meta.index === indexPattern.id;
+  }
+
   return indexPattern.fields.some((field: IFieldType) => field.name === filter.meta.key);
 }