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

feat: 增加 es 忽略 https 证书验证

pull/5862/head
xinwen 2021-03-29 12:01:24 +08:00 committed by 老广
parent 85d226eb07
commit 07bd44990b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,10 @@ class CommandStore():
kwargs = config.get("OTHER", {}) kwargs = config.get("OTHER", {})
self.index = config.get("INDEX") or 'jumpserver' self.index = config.get("INDEX") or 'jumpserver'
self.doc_type = config.get("DOC_TYPE") or 'command_store' self.doc_type = config.get("DOC_TYPE") or 'command_store'
ignore_verify_certs = kwargs.pop('ignore_verify_certs', False)
if ignore_verify_certs:
kwargs['verify_certs'] = None
self.es = Elasticsearch(hosts=hosts, max_retries=0, **kwargs) self.es = Elasticsearch(hosts=hosts, max_retries=0, **kwargs)
@staticmethod @staticmethod

5
apps/terminal/serializers/storage.py
View File

@ -181,7 +181,10 @@ class CommandStorageTypeESSerializer(serializers.Serializer):
max_length=1024, default='jumpserver', label=_('Index'), allow_null=True max_length=1024, default='jumpserver', label=_('Index'), allow_null=True
) )
DOC_TYPE = ReadableHiddenField(default='command', label=_('Doc type'), allow_null=True) DOC_TYPE = ReadableHiddenField(default='command', label=_('Doc type'), allow_null=True)
ignore_verify_certs = serializers.BooleanField(
default=False, label=_('Ignore Certificate Verification'),
source='OTHER.ignore_verify_certs', allow_null=True,
)
# mapping # mapping