github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-08-09 08:03:53 +00:00
Code Issues Projects Releases Wiki Activity

修复V3对接es后，通过资产搜索命令展示结果混乱的问题

Browse Source
This commit is contained in:
shouzhiyuxian
2026-07-31 11:20:08 +08:00
parent f91483dbe7
commit 58d7bbad41
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ def get_es_client_version(**kwargs):
class ES(object):
def __init__(self, config, properties, keyword_fields, exact_fields=None, match_fields=None):
def __init__(self, config, properties, keyword_fields, exact_fields=None, fuzzy_fields=None, match_fields=None):
self.version = 7
self.config = config
hosts = self.config.get('HOSTS')
@@ -131,12 +131,14 @@ class ES(object):
self.index = None
self.query_index = None
self.properties = properties
self.exact_fields, self.match_fields, self.keyword_fields = set(), set(), set()
self.exact_fields, self.match_fields, self.keyword_fields, self.fuzzy_fields = set(), set(), set(), set()
if isinstance(keyword_fields, Iterable):
self.keyword_fields.update(keyword_fields)
if isinstance(exact_fields, Iterable):
self.exact_fields.update(exact_fields)
if isinstance(fuzzy_fields, Iterable):
self.fuzzy_fields.update(fuzzy_fields)
if isinstance(match_fields, Iterable):
self.match_fields.update(match_fields)
@@ -306,6 +308,13 @@ class ES(object):
})
return _filter
@staticmethod
def handle_fuzzy_fields(exact):
_filter = []
for k, v in exact.items():
_filter.append({'wildcard': {k: f'*{v}*'}})
return _filter
def get_query_body(self, **kwargs):
new_kwargs = {}
for k, v in kwargs.items():
@@ -321,9 +330,11 @@ class ES(object):
index_in_field = 'id__in'
exact_fields = self.exact_fields
match_fields = self.match_fields
fuzzy_fields = self.fuzzy_fields
match = {}
exact = {}
fuzzy = {}
index = {}
if index_in_field in kwargs:
@@ -332,6 +343,8 @@ class ES(object):
for k, v in kwargs.items():
if k in exact_fields:
exact[k] = v
elif k in fuzzy_fields:
fuzzy[f"{k}.keyword"] = v
elif k in match_fields:
match[k] = v
@@ -368,6 +381,7 @@ class ES(object):
],
'should': should,
'filter': self.handle_exact_fields(exact) +
self.handle_fuzzy_fields(fuzzy) +
[
{
'range': {

5
apps/terminal/backends/command/es.py
View File

@@ -28,10 +28,11 @@ class CommandStore(ES):
}
}
exact_fields = {}
match_fields = {'input', 'risk_level', 'user', 'asset', 'system_user'}
fuzzy_fields = {'input', 'user', 'asset', 'system_user'}
match_fields = {'input', 'risk_level'}
keyword_fields = {'session', 'org_id'}
super().__init__(config, properties, keyword_fields, exact_fields, match_fields)
super().__init__(config, properties, keyword_fields, exact_fields, fuzzy_fields, match_fields)
@staticmethod
def make_data(command):