From a5179d159667d3c0036d2dad17f5db0d25367a24 Mon Sep 17 00:00:00 2001 From: xinwen Date: Mon, 29 Mar 2021 12:01:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20es=20=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=20https=20=E8=AF=81=E4=B9=A6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/backends/command/es.py | 4 ++++ apps/terminal/serializers/storage.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py index 009435a5b..fc0f247f4 100644 --- a/apps/terminal/backends/command/es.py +++ b/apps/terminal/backends/command/es.py @@ -25,6 +25,10 @@ class CommandStore(): kwargs = config.get("OTHER", {}) self.index = config.get("INDEX") or 'jumpserver' 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) @staticmethod diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 7cc0628ba..7f5dec2fe 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -181,7 +181,10 @@ class CommandStorageTypeESSerializer(serializers.Serializer): max_length=1024, default='jumpserver', label=_('Index'), 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