github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: ES non-global organizations cannot be queried

pull/15501/head
feng 2025-05-23 19:04:31 +08:00 committed by feng626
parent 1ade652381
commit 8a3acb649e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/plugins/es.py
View File

@ -340,8 +340,19 @@ class ES(object):
if index_in_field in kwargs: if index_in_field in kwargs:
index['values'] = kwargs[index_in_field] index['values'] = kwargs[index_in_field]
mapping = self.es.indices.get_mapping(index=self.query_index)
props = (
mapping
.get(self.query_index, {})
.get('mappings', {})
.get('properties', {})
)
org_id_type = props.get('org_id', {}).get('type', 'keyword')
for k, v in kwargs.items(): for k, v in kwargs.items():
if k in exact_fields.union(keyword_fields): if k == 'org_id' and org_id_type == 'keyword':
exact[k] = v
elif k in exact_fields.union(keyword_fields):
exact['{}.keyword'.format(k)] = v exact['{}.keyword'.format(k)] = v
elif k in match_fields: elif k in match_fields:
match[k] = v match[k] = v