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

fix: 添加无效的 es 命令记录存储时，抛出错误提示

pull/6059/head
xinwen 2021-04-22 17:25:06 +08:00 committed by 老广
parent 9fe5496ce9
commit fd203c67c3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import pytz
from uuid import UUID from uuid import UUID
import inspect import inspect
from django.utils.translation import gettext_lazy as _
from django.db.models import QuerySet as DJQuerySet from django.db.models import QuerySet as DJQuerySet
from elasticsearch import Elasticsearch from elasticsearch import Elasticsearch
from elasticsearch.helpers import bulk from elasticsearch.helpers import bulk
@ -14,12 +15,18 @@ from elasticsearch.exceptions import RequestError
from common.utils.common import lazyproperty from common.utils.common import lazyproperty
from common.utils import get_logger from common.utils import get_logger
from common.exceptions import JMSException
from .models import AbstractSessionCommand from .models import AbstractSessionCommand
logger = get_logger(__file__) logger = get_logger(__file__)
class InvalidElasticsearch(JMSException):
default_code = 'invalid_elasticsearch'
default_detail = _('Invalid elasticsearch config')
class CommandStore(): class CommandStore():
def __init__(self, config): def __init__(self, config):
hosts = config.get("HOSTS") hosts = config.get("HOSTS")
@ -33,6 +40,8 @@ class CommandStore():
self.es = Elasticsearch(hosts=hosts, max_retries=0, **kwargs) self.es = Elasticsearch(hosts=hosts, max_retries=0, **kwargs)
def pre_use_check(self): def pre_use_check(self):
if not self.ping(timeout=3):
raise InvalidElasticsearch
self._ensure_index_exists() self._ensure_index_exists()
def _ensure_index_exists(self): def _ensure_index_exists(self):