mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-29 21:51:31 +00:00
1.5.7 Merge to dev (#3766)
* [Update] 暂存，优化解决不了问题 * [Update] 待续（小白） * [Update] 修改asset user * [Update] 计划再次更改 * [Update] 修改asset user * [Update] 暂存与喜爱 * [Update] Add id in * [Update] 阶段性完成ops task该做 * [Update] 修改asset user api * [Update] 修改asset user 任务，查看认证等 * [Update] 基本完成asset user改造 * [Update] dynamic user only allow 1 * [Update] 修改asset user task * [Update] 修改node admin user task api * [Update] remove file header license * [Update] 添加sftp root * [Update] 暂存 * [Update] 暂存 * [Update] 修改翻译 * [Update] 修改系统用户改为同名后，用户名改为空 * [Update] 基本完成CAS调研 * [Update] 支持cas server * [Update] 支持cas server * [Update] 添加requirements * [Update] 为方便调试添加mysql ipython到包中 * [Update] 添加huaweiyun翻译 * [Update] 增加下载session 录像 * [Update] 只有第一次通知replay离线的使用方法 * [Update] 暂存一下 * [Bugfix] 获取系统用户信息报错 * [Bugfix] 修改system user info * [Update] 改成清理10天git status * [Update] 修改celery日志保留时间 * [Update]修复部分pip包依赖的版本不兼容问题 (#3672) * [Update] 修复用户更新页面会清空用户public_key的问题 * Fix broken dependencies Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> * [Update] 修改获取系统用户auth info * [Update] Remove log * [Bugfix] 修复sftp home设置的bug * [Update] 授权的系统用户添加sftp root * [Update] 修改系统用户关联的用户 * [Update] 修改placeholder * [Update] 优化获取授权的系统用户 * [Update] 修改tasks * [Update] tree service update * [Update] 暂存 * [Update] 基本完成用户授权树和资产树改造 * [Update] Dashbaord perf * [update] Add huawei cloud sdk requirements * [Updte] 优化dashboard页面 * [Update] system user auth info 添加id * [Update] 修改系统用户serializer * [Update] 优化api * [Update] LDAP Test Util (#3720) * [Update] LDAPTestUtil 1 * [Update] LDAPTestUtil 2 * [Update] LDAPTestUtil 3 * [Update] LDAPTestUtil 4 * [Update] LDAPTestUtil 5 * [Update] LDAPTestUtil 6 * [Update] LDAPTestUtil 7 * [Update] session 已添加is success，并且添加display serializer * [Bugfix] 修复无法删除空节点的bug * [Update] 命令记录分组织显示 * [Update] Session is_success 添加迁移文件 * [Update] 批量命令添加org_id * [Update] 修复一些文案，修改不绑定MFA，不能ssh登录 * [Update] 修改replay api, 返回session信息 * [Update] 解决无效es导致访问命令记录页面失败的问题 * [Update] 拆分profile view * [Update] 修改一个翻译 * [Update] 修改aysnc api框架 * [Update] 命令列表添加risk level * [Update] 完成录像打包下载 * [Update] 更改登陆otp页面 * [Update] 修改command 存储redis_level * [Update] 修改翻译 * [Update] 修改系统用户的用户列表字段 * [Update] 使用新logo和统一Jumpserver为JumpServer * [Update] 优化cloud task * [Update] 统一period task * [Update] 统一period form serializer字段 * [Update] 修改period task * [Update] 修改资产网关信息 * [Update] 用户授权资产树资产信息添加domain * [Update] 修改翻译 * [Update] 测试可连接性 * 1.5.7 bai (#3764) * [Update] 修复index页面Bug；修复测试资产用户可连接性问题； * [Update] 修改测试资产用户可连接 * [Bugfix] 修复backends问题 * [Update] 修改marksafe依赖版本 * [Update] 修改测试资产用户可连接性 * [Update] 修改检测服务器性能时获取percent值 * [Update] 更新依赖boto3=1.12.14 Co-authored-by: Yanzhe Lee <lee.yanzhe@yanzhe.org> Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Co-authored-by: Bai <bugatti_it@163.com>
This commit is contained in:
老广
GitHub
@@ -16,7 +16,7 @@ provide this ability, not common, You should write it on your app utils.
|
||||
## Celery usage
|
||||
|
||||
|
||||
Jumpserver use celery to run task async. Using redis as the broker, so
|
||||
JumpServer use celery to run task async. Using redis as the broker, so
|
||||
you should run a redis instance
|
||||
|
||||
#### Run redis
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
import time
|
||||
from hashlib import md5
|
||||
from threading import Thread
|
||||
|
||||
from django.core.cache import cache
|
||||
from django.http import JsonResponse
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.settings import api_settings
|
||||
|
||||
from common.drf.filters import IDSpmFilter, CustomFilter
|
||||
from ..utils import lazyproperty
|
||||
|
||||
__all__ = [
|
||||
"JSONResponseMixin", "CommonApiMixin",
|
||||
"IDSpmFilterMixin",
|
||||
"IDSpmFilterMixin", 'AsyncApiMixin',
|
||||
]
|
||||
|
||||
|
||||
@@ -62,3 +69,122 @@ class ExtraFilterFieldsMixin:
|
||||
|
||||
class CommonApiMixin(SerializerMixin, ExtraFilterFieldsMixin):
|
||||
pass
|
||||
|
||||
|
||||
class InterceptMixin:
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
self.args = args
|
||||
self.kwargs = kwargs
|
||||
request = self.initialize_request(request, *args, **kwargs)
|
||||
self.request = request
|
||||
self.headers = self.default_response_headers # deprecate?
|
||||
|
||||
try:
|
||||
self.initial(request, *args, **kwargs)
|
||||
|
||||
# Get the appropriate handler method
|
||||
if request.method.lower() in self.http_method_names:
|
||||
handler = getattr(self, request.method.lower(),
|
||||
self.http_method_not_allowed)
|
||||
else:
|
||||
handler = self.http_method_not_allowed
|
||||
|
||||
response = self.do(handler, request, *args, **kwargs)
|
||||
|
||||
except Exception as exc:
|
||||
response = self.handle_exception(exc)
|
||||
|
||||
self.response = self.finalize_response(request, response, *args, **kwargs)
|
||||
return self.response
|
||||
|
||||
|
||||
class AsyncApiMixin(InterceptMixin):
|
||||
def get_request_user_id(self):
|
||||
user = self.request.user
|
||||
if hasattr(user, 'id'):
|
||||
return str(user.id)
|
||||
return ''
|
||||
|
||||
@lazyproperty
|
||||
def async_cache_key(self):
|
||||
method = self.request.method
|
||||
path = self.get_request_md5()
|
||||
user = self.get_request_user_id()
|
||||
key = '{}_{}_{}'.format(method, path, user)
|
||||
return key
|
||||
|
||||
def get_request_md5(self):
|
||||
path = self.request.path
|
||||
query = {k: v for k, v in self.request.GET.items()}
|
||||
query.pop("_", None)
|
||||
query.pop('refresh', None)
|
||||
query = "&".join(["{}={}".format(k, v) for k, v in query.items()])
|
||||
full_path = "{}?{}".format(path, query)
|
||||
return md5(full_path.encode()).hexdigest()
|
||||
|
||||
@lazyproperty
|
||||
def initial_data(self):
|
||||
data = {
|
||||
"status": "running",
|
||||
"start_time": time.time(),
|
||||
"key": self.async_cache_key,
|
||||
}
|
||||
return data
|
||||
|
||||
def get_cache_data(self):
|
||||
key = self.async_cache_key
|
||||
if self.is_need_refresh():
|
||||
cache.delete(key)
|
||||
return None
|
||||
data = cache.get(key)
|
||||
return data
|
||||
|
||||
def do(self, handler, *args, **kwargs):
|
||||
if not self.is_need_async():
|
||||
return handler(*args, **kwargs)
|
||||
resp = self.do_async(handler, *args, **kwargs)
|
||||
return resp
|
||||
|
||||
def is_need_refresh(self):
|
||||
if self.request.GET.get("refresh"):
|
||||
return True
|
||||
return False
|
||||
|
||||
def is_need_async(self):
|
||||
return False
|
||||
|
||||
def do_async(self, handler, *args, **kwargs):
|
||||
data = self.get_cache_data()
|
||||
if not data:
|
||||
t = Thread(
|
||||
target=self.do_in_thread,
|
||||
args=(handler, *args),
|
||||
kwargs=kwargs
|
||||
)
|
||||
t.start()
|
||||
resp = Response(self.initial_data)
|
||||
return resp
|
||||
status = data.get("status")
|
||||
resp = data.get("resp")
|
||||
if status == "ok" and resp:
|
||||
resp = Response(**resp)
|
||||
else:
|
||||
resp = Response(data)
|
||||
return resp
|
||||
|
||||
def do_in_thread(self, handler, *args, **kwargs):
|
||||
key = self.async_cache_key
|
||||
data = self.initial_data
|
||||
cache.set(key, data, 600)
|
||||
try:
|
||||
response = handler(*args, **kwargs)
|
||||
data["status"] = "ok"
|
||||
data["resp"] = {
|
||||
"data": response.data,
|
||||
"status": response.status_code
|
||||
}
|
||||
cache.set(key, data, 600)
|
||||
except Exception as e:
|
||||
data["error"] = str(e)
|
||||
data["status"] = "error"
|
||||
cache.set(key, data, 600)
|
||||
|
||||
@@ -5,7 +5,6 @@ from django.db import models
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
||||
__all__ = [
|
||||
"NoDeleteManager", "NoDeleteModelMixin", "NoDeleteQuerySet",
|
||||
"CommonModelMixin"
|
||||
@@ -65,3 +64,5 @@ class DebugQueryManager(models.Manager):
|
||||
print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
|
||||
queryset = super().get_queryset()
|
||||
return queryset
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
from itertools import chain
|
||||
from .utils import lazyproperty
|
||||
|
||||
|
||||
class Stack(list):
|
||||
@@ -23,3 +25,82 @@ class Stack(list):
|
||||
|
||||
def push(self, item):
|
||||
self.append(item)
|
||||
|
||||
|
||||
class QuerySetChain:
|
||||
def __init__(self, querysets):
|
||||
self.querysets = querysets
|
||||
|
||||
@lazyproperty
|
||||
def querysets_counts(self):
|
||||
counts = [s.count() for s in self.querysets]
|
||||
return counts
|
||||
|
||||
def count(self):
|
||||
return self.total_count
|
||||
|
||||
@lazyproperty
|
||||
def total_count(self):
|
||||
return sum(self.querysets_counts)
|
||||
|
||||
def __iter__(self):
|
||||
self._chain = chain(*self.querysets)
|
||||
return self
|
||||
|
||||
def __next__(self):
|
||||
return next(self._chain)
|
||||
|
||||
def __getitem__(self, ndx):
|
||||
querysets_count_zip = zip(self.querysets, self.querysets_counts)
|
||||
length = 0 # 加上本数组后的大数组长度
|
||||
pre_length = 0 # 不包含本数组的大数组长度
|
||||
items = [] # 返回的值
|
||||
loop = 0
|
||||
|
||||
if isinstance(ndx, slice):
|
||||
ndx_start = ndx.start or 0
|
||||
ndx_stop = ndx.stop or self.total_count
|
||||
ndx_step = ndx.step or 1
|
||||
else:
|
||||
ndx_start = ndx
|
||||
ndx_stop, ndx_step = None, None
|
||||
|
||||
for queryset, count in querysets_count_zip:
|
||||
length += count
|
||||
loop += 1
|
||||
# 取当前数组的start角标, 存在3中情况
|
||||
# 1. start角标在当前数组
|
||||
if length > ndx_start >= pre_length:
|
||||
start = ndx_start - pre_length
|
||||
# print("[loop {}] Start is: {}".format(loop, start))
|
||||
if ndx_step is None:
|
||||
return queryset[start]
|
||||
# 2. 不包含当前数组，因为起始已经超过了当前数组的长度
|
||||
elif ndx_start >= length:
|
||||
pre_length += count
|
||||
continue
|
||||
# 3. 不在当前数组，但是应该从当前数组0开始计算
|
||||
else:
|
||||
start = 0
|
||||
|
||||
# 可能取单个值, ndx_stop 为None, 不应该再找
|
||||
if ndx_stop is None:
|
||||
pre_length += count
|
||||
continue
|
||||
|
||||
# 取当前数组的stop角标, 存在2中情况
|
||||
# 不存在第3中情况是因为找到了会提交结束循环
|
||||
# 1. 结束角标小于length代表 结束位在当前数组上
|
||||
if ndx_stop < length:
|
||||
stop = ndx_stop - pre_length
|
||||
# 2. 结束位置包含改数组到了最后
|
||||
else:
|
||||
stop = count
|
||||
# print("[loop {}] Slice: {} {} {}".format(loop, start, stop, ndx_step))
|
||||
items.extend(list(queryset[slice(start, stop, ndx_step)]))
|
||||
pre_length += count
|
||||
|
||||
# 如果结束再当前数组，则结束循环
|
||||
if ndx_stop < length:
|
||||
break
|
||||
return items
|
||||
|
||||
@@ -199,11 +199,15 @@ logger = get_logger(__name__)
|
||||
|
||||
def timeit(func):
|
||||
def wrapper(*args, **kwargs):
|
||||
logger.debug("Start call: {}".format(func.__name__))
|
||||
if hasattr(func, '__name__'):
|
||||
name = func.__name__
|
||||
else:
|
||||
name = func
|
||||
logger.debug("Start call: {}".format(name))
|
||||
now = time.time()
|
||||
result = func(*args, **kwargs)
|
||||
using = (time.time() - now) * 1000
|
||||
msg = "End call {}, using: {:.1f}ms".format(func.__name__, using)
|
||||
msg = "End call {}, using: {:.1f}ms".format(name, using)
|
||||
logger.debug(msg)
|
||||
return result
|
||||
return wrapper
|
||||
|
||||
39
apps/common/utils/random.py
Normal file
39
apps/common/utils/random.py
Normal file
@@ -0,0 +1,39 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
import socket
|
||||
import struct
|
||||
import random
|
||||
|
||||
|
||||
def random_datetime(date_start, date_end):
|
||||
random_delta = (date_end - date_start) * random.random()
|
||||
return date_start + random_delta
|
||||
|
||||
|
||||
def random_ip():
|
||||
return socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
|
||||
|
||||
|
||||
|
||||
# def strTimeProp(start, end, prop, fmt):
|
||||
# time_start = time.mktime(time.strptime(start, fmt))
|
||||
# time_end = time.mktime(time.strptime(end, fmt))
|
||||
# ptime = time_start + prop * (time_end - time_start)
|
||||
# return int(ptime)
|
||||
#
|
||||
#
|
||||
# def randomTimestamp(start, end, fmt='%Y-%m-%d %H:%M:%S'):
|
||||
# return strTimeProp(start, end, random.random(), fmt)
|
||||
#
|
||||
#
|
||||
# def randomDate(start, end, frmt='%Y-%m-%d %H:%M:%S'):
|
||||
# return time.strftime(frmt, time.localtime(strTimeProp(start, end, random.random(), frmt)))
|
||||
#
|
||||
#
|
||||
# def randomTimestampList(start, end, n, frmt='%Y-%m-%d %H:%M:%S'):
|
||||
# return [randomTimestamp(start, end, frmt) for _ in range(n)]
|
||||
#
|
||||
#
|
||||
# def randomDateList(start, end, n, frmt='%Y-%m-%d %H:%M:%S'):
|
||||
# return [randomDate(start, end, frmt) for _ in range(n)]
|
||||
|
||||
Reference in New Issue
Block a user