JumpServer {% trans 'Offline video player' %} v0.1.5
diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py
index 4d830b1b2..3601e3894 100644
--- a/apps/terminal/backends/command/es.py
+++ b/apps/terminal/backends/command/es.py
@@ -1,109 +1,18 @@
# -*- coding: utf-8 -*-
#
import pytz
-import inspect
from datetime import datetime
-from functools import reduce, partial
-from itertools import groupby
-from uuid import UUID
-from django.utils.translation import gettext_lazy as _
-from django.db.models import QuerySet as DJQuerySet
-from elasticsearch import Elasticsearch
-from elasticsearch.helpers import bulk
-from elasticsearch.exceptions import RequestError, NotFoundError
-
-from common.utils.common import lazyproperty
from common.utils import get_logger
-from common.utils.timezone import local_now_date_display, utc_now
-from common.exceptions import JMSException
-from terminal.models import Command
+from common.plugins.es import ES
+
logger = get_logger(__file__)
-class InvalidElasticsearch(JMSException):
- default_code = 'invalid_elasticsearch'
- default_detail = _('Invalid elasticsearch config')
-
-
-class NotSupportElasticsearch8(JMSException):
- default_code = 'not_support_elasticsearch8'
- default_detail = _('Not Support Elasticsearch8')
-
-
-class CommandStore(object):
+class CommandStore(ES):
def __init__(self, config):
- self.doc_type = config.get("DOC_TYPE") or '_doc'
- self.index_prefix = config.get('INDEX') or 'jumpserver'
- self.is_index_by_date = bool(config.get('INDEX_BY_DATE'))
- self.exact_fields = {}
- self.match_fields = {}
- hosts = config.get("HOSTS")
- kwargs = config.get("OTHER", {})
-
- 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.exact_fields = set()
- self.match_fields = {'input', 'risk_level', 'user', 'asset', 'system_user'}
- may_exact_fields = {'session', 'org_id'}
-
- if self.is_new_index_type():
- self.exact_fields.update(may_exact_fields)
- self.doc_type = '_doc'
- else:
- self.match_fields.update(may_exact_fields)
-
- self.init_index(config)
-
- def init_index(self, config):
- if self.is_index_by_date:
- date = local_now_date_display()
- self.index = '%s-%s' % (self.index_prefix, date)
- self.query_index = '%s-alias' % self.index_prefix
- else:
- self.index = config.get("INDEX") or 'jumpserver'
- self.query_index = config.get("INDEX") or 'jumpserver'
-
- def is_new_index_type(self):
- if not self.ping(timeout=3):
- return False
-
- info = self.es.info()
- version = info['version']['number'].split('.')[0]
-
- if version == '8':
- raise NotSupportElasticsearch8
-
- try:
- # 获取索引信息，如果没有定义，直接返回
- data = self.es.indices.get_mapping(self.index)
- except NotFoundError:
- return False
-
- try:
- if version == '6':
- # 检测索引是不是新的类型 es6
- properties = data[self.index]['mappings']['data']['properties']
- else:
- # 检测索引是不是新的类型 es7 default index type: _doc
- properties = data[self.index]['mappings']['properties']
- if properties['session']['type'] == 'keyword' \
- and properties['org_id']['type'] == 'keyword':
- return True
- except KeyError:
- return False
-
- def pre_use_check(self):
- if not self.ping(timeout=3):
- raise InvalidElasticsearch
- self._ensure_index_exists()
-
- def _ensure_index_exists(self):
properties = {
"session": {
"type": "keyword"
@@ -118,25 +27,11 @@ class CommandStore(object):
"type": "long"
}
}
- info = self.es.info()
- version = info['version']['number'].split('.')[0]
- if version == '6':
- mappings = {'mappings': {'data': {'properties': properties}}}
- else:
- mappings = {'mappings': {'properties': properties}}
+ exact_fields = {}
+ match_fields = {'input', 'risk_level', 'user', 'asset', 'system_user'}
+ keyword_fields = {'session', 'org_id'}
- if self.is_index_by_date:
- mappings['aliases'] = {
- self.query_index: {}
- }
- try:
- self.es.indices.create(self.index, body=mappings)
- return
- except RequestError as e:
- if e.error == 'resource_already_exists_exception':
- logger.warning(e)
- else:
- logger.exception(e)
+ super().__init__(config, properties, keyword_fields, exact_fields, match_fields)
@staticmethod
def make_data(command):
@@ -150,274 +45,14 @@ class CommandStore(object):
data["date"] = datetime.fromtimestamp(command['timestamp'], tz=pytz.UTC)
return data
- def bulk_save(self, command_set, raise_on_error=True):
- actions = []
- for command in command_set:
- data = dict(
- _index=self.index,
- _type=self.doc_type,
- _source=self.make_data(command),
- )
- actions.append(data)
- return bulk(self.es, actions, index=self.index, raise_on_error=raise_on_error)
-
- def save(self, command):
- """
- 保存命令到数据库
- """
- data = self.make_data(command)
- return self.es.index(index=self.index, doc_type=self.doc_type, body=data)
-
- def filter(self, query: dict, from_=None, size=None, sort=None):
- try:
- data = self._filter(query, from_, size, sort)
- except Exception as e:
- logger.error('ES filter error: {}'.format(e))
- data = []
- return data
-
- def _filter(self, query: dict, from_=None, size=None, sort=None):
- body = self.get_query_body(**query)
-
- data = self.es.search(
- index=self.query_index, doc_type=self.doc_type, body=body, from_=from_, size=size,
- sort=sort
- )
- source_data = []
- for item in data['hits']['hits']:
- if item:
- item['_source'].update({'id': item['_id']})
- source_data.append(item['_source'])
-
- return Command.from_multi_dict(source_data)
-
- def count(self, **query):
- try:
- body = self.get_query_body(**query)
- data = self.es.count(index=self.query_index, doc_type=self.doc_type, body=body)
- count = data["count"]
- except Exception as e:
- logger.error('ES count error: {}'.format(e))
- count = 0
- return count
-
- def __getattr__(self, item):
- return getattr(self.es, item)
-
- def all(self):
- """返回所有数据"""
- raise NotImplementedError("Not support")
-
- def ping(self, timeout=None):
- try:
- return self.es.ping(request_timeout=timeout)
- except Exception:
- return False
-
- def get_query_body(self, **kwargs):
- new_kwargs = {}
- for k, v in kwargs.items():
- new_kwargs[k] = str(v) if isinstance(v, UUID) else v
- kwargs = new_kwargs
-
- index_in_field = 'id__in'
- exact_fields = self.exact_fields
- match_fields = self.match_fields
-
- match = {}
- exact = {}
- index = {}
-
- if index_in_field in kwargs:
- index['values'] = kwargs[index_in_field]
-
- for k, v in kwargs.items():
- if k in exact_fields:
- exact[k] = v
- elif k in match_fields:
- match[k] = v
-
- # 处理时间
- timestamp__gte = kwargs.get('timestamp__gte')
- timestamp__lte = kwargs.get('timestamp__lte')
+ @staticmethod
+ def handler_time_field(data):
+ timestamp__gte = data.get('timestamp__gte')
+ timestamp__lte = data.get('timestamp__lte')
timestamp_range = {}
if timestamp__gte:
timestamp_range['gte'] = timestamp__gte
if timestamp__lte:
timestamp_range['lte'] = timestamp__lte
-
- # 处理组织
- should = []
- org_id = match.get('org_id')
-
- real_default_org_id = '00000000-0000-0000-0000-000000000002'
- root_org_id = '00000000-0000-0000-0000-000000000000'
-
- if org_id == root_org_id:
- match.pop('org_id')
- elif org_id in (real_default_org_id, ''):
- match.pop('org_id')
- should.append({
- 'bool': {
- 'must_not': [
- {
- 'wildcard': {'org_id': '*'}
- }
- ]}
- })
- should.append({'match': {'org_id': real_default_org_id}})
-
- # 构建 body
- body = {
- 'query': {
- 'bool': {
- 'must': [
- {'match': {k: v}} for k, v in match.items()
- ],
- 'should': should,
- 'filter': [
- {
- 'term': {k: v}
- } for k, v in exact.items()
- ] + [
- {
- 'range': {
- 'timestamp': timestamp_range
- }
- }
- ] + [
- {
- 'ids': {k: v}
- } for k, v in index.items()
- ]
- }
- },
- }
- return body
-
-
-class QuerySet(DJQuerySet):
- _method_calls = None
- _storage = None
- _command_store_config = None
- _slice = None # (from_, size)
- default_days_ago = 5
- max_result_window = 10000
-
- def __init__(self, command_store_config):
- self._method_calls = []
- self._command_store_config = command_store_config
- self._storage = CommandStore(command_store_config)
-
- # 命令列表模糊搜索时报错
- super().__init__()
-
- @lazyproperty
- def _grouped_method_calls(self):
- _method_calls = {k: list(v) for k, v in groupby(self._method_calls, lambda x: x[0])}
- return _method_calls
-
- @lazyproperty
- def _filter_kwargs(self):
- _method_calls = self._grouped_method_calls
- filter_calls = _method_calls.get('filter')
- if not filter_calls:
- return {}
- names, multi_args, multi_kwargs = zip(*filter_calls)
- kwargs = reduce(lambda x, y: {**x, **y}, multi_kwargs, {})
-
- striped_kwargs = {}
- for k, v in kwargs.items():
- k = k.replace('__exact', '')
- k = k.replace('__startswith', '')
- k = k.replace('__icontains', '')
- striped_kwargs[k] = v
- return striped_kwargs
-
- @lazyproperty
- def _sort(self):
- order_by = self._grouped_method_calls.get('order_by')
- if order_by:
- for call in reversed(order_by):
- fields = call[1]
- if fields:
- field = fields[-1]
-
- if field.startswith('-'):
- direction = 'desc'
- else:
- direction = 'asc'
- field = field.lstrip('-+')
- sort = f'{field}:{direction}'
- return sort
-
- def __execute(self):
- _filter_kwargs = self._filter_kwargs
- _sort = self._sort
- from_, size = self._slice or (None, None)
- data = self._storage.filter(_filter_kwargs, from_=from_, size=size, sort=_sort)
- return data
-
- def __stage_method_call(self, item, *args, **kwargs):
- _clone = self.__clone()
- _clone._method_calls.append((item, args, kwargs))
- return _clone
-
- def __clone(self):
- uqs = QuerySet(self._command_store_config)
- uqs._method_calls = self._method_calls.copy()
- uqs._slice = self._slice
- uqs.model = self.model
- return uqs
-
- def count(self, limit_to_max_result_window=True):
- filter_kwargs = self._filter_kwargs
- count = self._storage.count(**filter_kwargs)
- if limit_to_max_result_window:
- count = min(count, self.max_result_window)
- return count
-
- def __getattribute__(self, item):
- if any((
- item.startswith('__'),
- item in QuerySet.__dict__,
- )):
- return object.__getattribute__(self, item)
-
- origin_attr = object.__getattribute__(self, item)
- if not inspect.ismethod(origin_attr):
- return origin_attr
-
- attr = partial(self.__stage_method_call, item)
- return attr
-
- def __getitem__(self, item):
- max_window = self.max_result_window
- if isinstance(item, slice):
- if self._slice is None:
- clone = self.__clone()
- from_ = item.start or 0
- if item.stop is None:
- size = self.max_result_window - from_
- else:
- size = item.stop - from_
-
- if from_ + size > max_window:
- if from_ >= max_window:
- from_ = max_window
- size = 0
- else:
- size = max_window - from_
- clone._slice = (from_, size)
- return clone
- return self.__execute()[item]
-
- def __repr__(self):
- return self.__execute().__repr__()
-
- def __iter__(self):
- return iter(self.__execute())
-
- def __len__(self):
- return self.count()
+ return 'timestamp', timestamp_range
diff --git a/apps/terminal/migrations/0054_alter_session_protocol.py b/apps/terminal/migrations/0054_alter_session_protocol.py
new file mode 100644
index 000000000..fe0e859f4
--- /dev/null
+++ b/apps/terminal/migrations/0054_alter_session_protocol.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.14 on 2022-11-04 07:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('terminal', '0053_auto_20221009_1755'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='session',
+ name='protocol',
+ field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('vnc', 'vnc'), ('telnet', 'telnet'), ('mysql', 'mysql'), ('oracle', 'oracle'), ('mariadb', 'mariadb'), ('sqlserver', 'sqlserver'), ('postgresql', 'postgresql'), ('redis', 'redis'), ('mongodb', 'MongoDB'), ('clickhouse', 'ClickHouse'), ('k8s', 'kubernetes')], db_index=True, default='ssh', max_length=16),
+ ),
+ ]
diff --git a/apps/terminal/models/session.py b/apps/terminal/models/session.py
index 8eff9368b..3f6a8c338 100644
--- a/apps/terminal/models/session.py
+++ b/apps/terminal/models/session.py
@@ -38,6 +38,7 @@ class Session(OrgModelMixin):
POSTGRESQL = 'postgresql', 'postgresql'
REDIS = 'redis', 'redis'
MONGODB = 'mongodb', 'MongoDB'
+ CLICKHOUSE = 'clickhouse', 'ClickHouse'
K8S = 'k8s', 'kubernetes'
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
@@ -150,7 +151,7 @@ class Session(OrgModelMixin):
def db_protocols(self):
_PROTOCOL = self.PROTOCOL
return [_PROTOCOL.MYSQL, _PROTOCOL.MARIADB, _PROTOCOL.ORACLE,
- _PROTOCOL.POSTGRESQL, _PROTOCOL.SQLSERVER,
+ _PROTOCOL.POSTGRESQL, _PROTOCOL.SQLSERVER, _PROTOCOL.CLICKHOUSE,
_PROTOCOL.REDIS, _PROTOCOL.MONGODB]
@property
diff --git a/apps/terminal/models/storage.py b/apps/terminal/models/storage.py
index 555c44aea..c333c5498 100644
--- a/apps/terminal/models/storage.py
+++ b/apps/terminal/models/storage.py
@@ -10,6 +10,7 @@ from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from common.mixins import CommonModelMixin
+from common.plugins.es import QuerySet as ESQuerySet
from common.utils import get_logger
from common.db.fields import EncryptJsonDictTextField
from common.utils.timezone import local_now_date_display
@@ -117,7 +118,8 @@ class CommandStorage(CommonStorageModelMixin, CommonModelMixin):
if self.type in TYPE_ENGINE_MAPPING:
engine_mod = import_module(TYPE_ENGINE_MAPPING[self.type])
- qs = engine_mod.QuerySet(self.config)
+ store = engine_mod.CommandStore(self.config)
+ qs = ESQuerySet(store)
qs.model = Command
return qs
diff --git a/apps/terminal/models/terminal.py b/apps/terminal/models/terminal.py
index 4b585cfff..6d7b67815 100644
--- a/apps/terminal/models/terminal.py
+++ b/apps/terminal/models/terminal.py
@@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from common.utils import get_logger
+from common.const.signals import SKIP_SIGNAL
from users.models import User
from orgs.utils import tmp_to_root_org
from .status import Status
@@ -107,8 +108,8 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
http_port = models.IntegerField(verbose_name=_('HTTP Port'), default=5000)
command_storage = models.CharField(max_length=128, verbose_name=_("Command storage"), default='default')
replay_storage = models.CharField(max_length=128, verbose_name=_("Replay storage"), default='default')
- user = models.OneToOneField(User, related_name='terminal', verbose_name='Application User', null=True, on_delete=models.CASCADE)
- is_accepted = models.BooleanField(default=False, verbose_name='Is Accepted')
+ user = models.OneToOneField(User, related_name='terminal', verbose_name=_('Application User'), null=True, on_delete=models.CASCADE)
+ is_accepted = models.BooleanField(default=False, verbose_name=_('Is Accepted'))
is_deleted = models.BooleanField(default=False)
date_created = models.DateTimeField(auto_now_add=True)
comment = models.TextField(blank=True, verbose_name=_('Comment'))
@@ -159,6 +160,7 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
def delete(self, using=None, keep_parents=False):
if self.user:
+ setattr(self.user, SKIP_SIGNAL, True)
self.user.delete()
self.user = None
self.is_deleted = True
diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py
index 91509a901..700bfde9b 100644
--- a/apps/terminal/notifications.py
+++ b/apps/terminal/notifications.py
@@ -70,6 +70,9 @@ class CommandAlertMessage(CommandAlertMixin, SystemMessage):
def __init__(self, command):
self.command = command
+ def __str__(self):
+ return str(self.message_type_label)
+
@classmethod
def gen_test_msg(cls):
command = Command.objects.first().to_dict()
diff --git a/apps/tickets/migrations/0019_alter_applyapplicationticket_apply_type.py b/apps/tickets/migrations/0019_alter_applyapplicationticket_apply_type.py
new file mode 100644
index 000000000..c4c844f71
--- /dev/null
+++ b/apps/tickets/migrations/0019_alter_applyapplicationticket_apply_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.14 on 2022-11-04 07:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tickets', '0018_applyapplicationticket_apply_actions'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='applyapplicationticket',
+ name='apply_type',
+ field=models.CharField(choices=[('mysql', 'MySQL'), ('mariadb', 'MariaDB'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('sqlserver', 'SQLServer'), ('redis', 'Redis'), ('mongodb', 'MongoDB'), ('clickhouse', 'ClickHouse'), ('chrome', 'Chrome'), ('mysql_workbench', 'MySQL Workbench'), ('vmware_client', 'vSphere Client'), ('custom', 'Custom'), ('k8s', 'Kubernetes')], max_length=16, verbose_name='Type'),
+ ),
+ ]
diff --git a/apps/users/forms/profile.py b/apps/users/forms/profile.py
index 4917f8353..ca9db9e0c 100644
--- a/apps/users/forms/profile.py
+++ b/apps/users/forms/profile.py
@@ -99,8 +99,11 @@ class UserTokenResetPasswordForm(forms.Form):
class UserForgotPasswordForm(forms.Form):
- email = forms.EmailField(label=_("Email"))
- captcha = CaptchaField(label=_("Captcha"))
+ username = forms.CharField(label=_("Username"))
+ email = forms.CharField(label=_("Email"), required=False)
+ phone = forms.CharField(label=_('Phone'), required=False, max_length=11)
+ code = forms.CharField(label=_('Verify code'), max_length=6, required=False)
+ form_type = forms.CharField(widget=forms.HiddenInput({'value': 'email'}))
class UserPasswordForm(UserTokenResetPasswordForm):
diff --git a/apps/users/migrations/0003_auto_20180101_0046.py b/apps/users/migrations/0003_auto_20180101_0046.py
index 46a85be54..6795a1782 100644
--- a/apps/users/migrations/0003_auto_20180101_0046.py
+++ b/apps/users/migrations/0003_auto_20180101_0046.py
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='user',
name='is_first_login',
- field=models.BooleanField(default=True),
+ field=models.BooleanField(default=True, verbose_name='Is first login'),
),
]
diff --git a/apps/users/migrations/0021_auto_20190625_1104.py b/apps/users/migrations/0021_auto_20190625_1104.py
index 4112a8693..f2575b933 100644
--- a/apps/users/migrations/0021_auto_20190625_1104.py
+++ b/apps/users/migrations/0021_auto_20190625_1104.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='user',
name='_otp_secret_key',
- field=common.db.fields.EncryptCharField(blank=True, max_length=128, null=True),
+ field=common.db.fields.EncryptCharField(blank=True, max_length=128, null=True, verbose_name='OTP secret key'),
),
migrations.AlterField(
model_name='user',
diff --git a/apps/users/migrations/0032_userpasswordhistory.py b/apps/users/migrations/0032_userpasswordhistory.py
index 8fcf1d2d1..5088b7968 100644
--- a/apps/users/migrations/0032_userpasswordhistory.py
+++ b/apps/users/migrations/0032_userpasswordhistory.py
@@ -1,8 +1,8 @@
# Generated by Django 3.1 on 2021-04-27 12:43
+import common.db.models
from django.conf import settings
from django.db import migrations, models
-import django.db.models.deletion
import uuid
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
('password', models.CharField(max_length=128)),
('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
- ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_passwords', to=settings.AUTH_USER_MODEL, verbose_name='User')),
+ ('user', models.ForeignKey(on_delete=common.db.models.CASCADE_SIGNAL_SKIP, related_name='history_passwords', to=settings.AUTH_USER_MODEL, verbose_name='User')),
],
),
]
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 6830c2ac5..f08a487c2 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -16,11 +16,12 @@ from django.contrib.auth.models import AbstractUser
from django.contrib.auth.hashers import check_password
from django.utils.translation import ugettext_lazy as _
from django.shortcuts import reverse
+from django.utils.module_loading import import_string
from orgs.utils import current_org
from orgs.models import Organization
from rbac.const import Scope
-from common.db import fields
+from common.db import fields, models as jms_models
from common.utils import (
date_expired_default, get_logger, lazyproperty, random_string, bulk_create_with_signal
)
@@ -602,8 +603,11 @@ class MFAMixin:
@staticmethod
def get_user_mfa_backends(user):
- from authentication.mfa import MFA_BACKENDS
- backends = [cls(user) for cls in MFA_BACKENDS if cls.global_enabled()]
+ backends = []
+ for cls in settings.MFA_BACKENDS:
+ cls = import_string(cls)
+ if cls.global_enabled():
+ backends.append(cls(user))
return backends
def get_active_mfa_backend_by_type(self, mfa_type):
@@ -691,7 +695,9 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
mfa_level = models.SmallIntegerField(
default=0, choices=MFAMixin.MFA_LEVEL_CHOICES, verbose_name=_('MFA')
)
- otp_secret_key = fields.EncryptCharField(max_length=128, blank=True, null=True)
+ otp_secret_key = fields.EncryptCharField(
+ max_length=128, blank=True, null=True, verbose_name=_('OTP secret key')
+ )
# Todo: Auto generate key, let user download
private_key = fields.EncryptTextField(
blank=True, null=True, verbose_name=_('Private key')
@@ -705,7 +711,7 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
comment = models.TextField(
blank=True, null=True, verbose_name=_('Comment')
)
- is_first_login = models.BooleanField(default=True)
+ is_first_login = models.BooleanField(default=True, verbose_name=_('Is first login'))
date_expired = models.DateTimeField(
default=date_expired_default, blank=True, null=True,
db_index=True, verbose_name=_('Date expired')
@@ -927,7 +933,7 @@ class UserPasswordHistory(models.Model):
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
password = models.CharField(max_length=128)
user = models.ForeignKey("users.User", related_name='history_passwords',
- on_delete=models.CASCADE, verbose_name=_('User'))
+ on_delete=jms_models.CASCADE_SIGNAL_SKIP, verbose_name=_('User'))
date_created = models.DateTimeField(auto_now_add=True, verbose_name=_("Date created"))
def __str__(self):
diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html
index 16c784250..a5770fdcc 100644
--- a/apps/users/templates/users/forgot_password.html
+++ b/apps/users/templates/users/forgot_password.html
@@ -4,12 +4,29 @@
{% load bootstrap3 %}
{% block custom_head_css_js %}
{% endblock %}
@@ -17,22 +34,111 @@
{% block title %} {% trans 'Forgot password' %}?{% endblock %}
{% block content %}
- {% if errors %}
-
{{ errors }}
- {% endif %}
-
+
{% trans 'Input your email, that will send a mail to your' %}
+
+ Enter your phone number and a verification code will be sent to your phone
+
+
{% endblock %}
diff --git a/apps/users/views/profile/reset.py b/apps/users/views/profile/reset.py
index cc14f6d53..bef98789a 100644
--- a/apps/users/views/profile/reset.py
+++ b/apps/users/views/profile/reset.py
@@ -4,15 +4,13 @@ from __future__ import unicode_literals
from django.views.generic import RedirectView
from django.shortcuts import reverse, redirect
from django.utils.translation import ugettext as _
-from django.views.generic.base import TemplateView
from django.conf import settings
from django.urls import reverse_lazy
from django.views.generic import FormView
-from users.notifications import ResetPasswordSuccessMsg, ResetPasswordMsg
+from users.notifications import ResetPasswordSuccessMsg
from common.utils import get_object_or_none, FlashMessageUtil
-from common.permissions import IsValidUser
-from common.mixins.views import PermissionsMixin
+from common.utils.verify_code import SendAndVerifyCodeUtil
from ...models import User
from ...utils import (
get_password_check_rules, check_password_rules,
@@ -34,35 +32,49 @@ class UserForgotPasswordView(FormView):
template_name = 'users/forgot_password.html'
form_class = forms.UserForgotPasswordForm
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ form = context['form']
+ if getattr(form, 'errors', None):
+ e = getattr(form, 'errors')
+ context['errors'] = e
+ context['form_type'] = 'email'
+ context['XPACK_ENABLED'] = settings.XPACK_ENABLED
+ cleaned_data = getattr(form, 'cleaned_data', {})
+ for k, v in cleaned_data.items():
+ if v:
+ context[k] = v
+ return context
+
@staticmethod
- def get_redirect_message_url():
- message_data = {
- 'title': _('Send reset password message'),
- 'message': _('Send reset password mail success, '
- 'login your mail box and follow it '),
- 'redirect_url': reverse('authentication:login'),
- }
- url = FlashMessageUtil.gen_message_url(message_data)
- return url
+ def get_redirect_url(user):
+ query_params = '?token=%s' % user.generate_reset_token()
+ reset_password_url = reverse('authentication:reset-password')
+ return reset_password_url + query_params
def form_valid(self, form):
- email = form.cleaned_data['email']
- user = get_object_or_none(User, email=email)
+ form_type = form.cleaned_data['form_type']
+ code = form.cleaned_data['code']
+ username = form.cleaned_data['username']
+ if settings.XPACK_ENABLED and form_type == 'phone':
+ backend = 'sms'
+ target = form.cleaned_data['phone']
+ else:
+ backend = 'email'
+ target = form.cleaned_data['email']
+ try:
+ sender_util = SendAndVerifyCodeUtil(target, backend=backend)
+ sender_util.verify(code)
+ except Exception as e:
+ form.add_error('code', str(e))
+ return super().form_invalid(form)
+
+ user = get_object_or_none(User, **{'username': username, form_type: target})
if not user:
- error = _('Email address invalid, please input again')
- form.add_error('email', error)
- return self.form_invalid(form)
+ form.add_error('username', _('User does not exist: {}').format(username))
+ return super().form_invalid(form)
- if not user.is_local:
- error = _(
- 'The user is from {}, please go to the corresponding system to change the password'
- ).format(user.get_source_display())
- form.add_error('email', error)
- return self.form_invalid(form)
-
- ResetPasswordMsg(user).publish_async()
- url = self.get_redirect_message_url()
- return redirect(url)
+ return redirect(self.get_redirect_url(user))
class UserResetPasswordView(FormView):
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 5e94c69e5..26c277dcc 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -37,6 +37,7 @@ jms-storage==0.0.44
simplejson==3.17.6
six==1.16.0
sshpubkeys==3.3.1
+sshtunnel==0.4.0
uritemplate==4.1.1
urllib3==1.26.9
vine==5.0.0
@@ -62,7 +63,7 @@ jsonfield2==4.0.0.post0
geoip2==4.5.0
ipip-ipdb==1.6.1
# Django environment
-Django==3.2.15
+Django==3.2.16
django-bootstrap3==14.2.0
django-filter==2.4.0
django-formtools==2.2
@@ -83,7 +84,7 @@ Pillow==9.1.1
pytz==2022.1
# Runtime
django-proxy==1.2.1
-channels-redis==3.4.0
+channels-redis==4.0.0
channels==3.0.4
daphne==3.0.2
python-daemon==2.3.0
diff --git a/utils/start_celery_beat.py b/utils/start_celery_beat.py
index f6259ddcc..247906f5c 100644
--- a/utils/start_celery_beat.py
+++ b/utils/start_celery_beat.py
@@ -6,7 +6,8 @@ import signal
import subprocess
import redis_lock
-from redis import Redis
+
+from redis import Redis, Sentinel
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
APPS_DIR = os.path.join(BASE_DIR, 'apps')
@@ -19,18 +20,35 @@ os.environ.setdefault('PYTHONOPTIMIZE', '1')
if os.getuid() == 0:
os.environ.setdefault('C_FORCE_ROOT', '1')
-params = {
- 'host': settings.REDIS_HOST,
- 'port': settings.REDIS_PORT,
+connection_params = {
'password': settings.REDIS_PASSWORD,
- 'ssl': settings.REDIS_USE_SSL,
- 'ssl_cert_reqs': settings.REDIS_SSL_REQUIRED,
- 'ssl_keyfile': settings.REDIS_SSL_KEY,
- 'ssl_certfile': settings.REDIS_SSL_CERT,
- 'ssl_ca_certs': settings.REDIS_SSL_CA
}
-print("Pamras: ", params)
-redis = Redis(**params)
+
+if settings.REDIS_USE_SSL:
+ connection_params['ssl'] = settings.REDIS_USE_SSL
+ connection_params['ssl_cert_reqs'] = settings.REDIS_SSL_REQUIRED
+ connection_params['ssl_keyfile'] = settings.REDIS_SSL_KEY
+ connection_params['ssl_certfile'] = settings.REDIS_SSL_CERT
+ connection_params['ssl_ca_certs'] = settings.REDIS_SSL_CA
+
+REDIS_SENTINEL_SERVICE_NAME = settings.REDIS_SENTINEL_SERVICE_NAME
+REDIS_SENTINELS = settings.REDIS_SENTINELS
+REDIS_SENTINEL_PASSWORD = settings.REDIS_SENTINEL_PASSWORD
+REDIS_SENTINEL_SOCKET_TIMEOUT = settings.REDIS_SENTINEL_SOCKET_TIMEOUT
+if REDIS_SENTINEL_SERVICE_NAME and REDIS_SENTINELS:
+ connection_params['sentinels'] = REDIS_SENTINELS
+ sentinel_client = Sentinel(
+ **connection_params, sentinel_kwargs={
+ 'password': REDIS_SENTINEL_PASSWORD,
+ 'socket_timeout': REDIS_SENTINEL_SOCKET_TIMEOUT
+ }
+ )
+ redis_client = sentinel_client.master_for(REDIS_SENTINEL_SERVICE_NAME)
+else:
+ connection_params['host'] = settings.REDIS_HOST
+ connection_params['port'] = settings.REDIS_PORT
+ redis_client = Redis(**connection_params)
+
scheduler = "django_celery_beat.schedulers:DatabaseScheduler"
processes = []
cmd = [
@@ -52,7 +70,7 @@ def main():
# 父进程结束通知子进程结束
signal.signal(signal.SIGTERM, stop_beat_process)
- with redis_lock.Lock(redis, name="beat-distribute-start-lock", expire=60, auto_renewal=True):
+ with redis_lock.Lock(redis_client, name="beat-distribute-start-lock", expire=60, auto_renewal=True):
print("Get beat lock start to run it")
process = subprocess.Popen(cmd, cwd=APPS_DIR)
processes.append(process)