mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-04-04 11:22:44 +00:00
* perf:automation * pref: 修改账号推送 * perf: 修改 assets * perf: 修改 accounts * feat: 优化代码 * fix: 修复 ObjectRelatedField 获取 value attr 时先判断是否有 attr 属性 * perf: 增加翻译 * feat: 增加部分翻译 * feat: 去除无用列 * perf: ticket remove app * fix: 修复创建账号备份任务失败的问题 * perf: 添加 accounts app * perf: ticket type serializer (#9252) Co-authored-by: feng <1304903146@qq.com> * perf: ticket * perf: 修改 accounts api * perf: 优化 AssetPermissionSerializer fields 顺序 * perf: 修改 accounts * feat: 限制常用用户名api返回长度 * feat: 限制常用用户名api返回长度 * perf: 修改 LoginAssetACL 序列类,增加 users_username_group, accounts_username_group... 字段 * perf: 修改 CommandFilterACLSerializer 增加 command_groups_amount 字段 * perf: 修改rbac API啥的 (#9254) * perf: migrate * perf: 修改 AssetPermedSerializer domain 字段类型 * perf: 放开push account 权限位 * perf: 修改 accounts * perf: 修改 LoginACLSerializer 字段类型 * pref: 修改数据库 migrations * perf: filter asset systemuser * perf: 修改 SessionSerializer 字段类型 * pref: 修改 applet host * perf: 修改 SessionCommandSerializer 字段类型 * perf: 修改 accounts import * perf: 修改 celery datetime * perf: 修改 asset serializer * pref: 修改 labeled field * feat: 修改翻译 * perf: 修改 JobSerializer 字段类型 * feat: 支持使用 ws 发送终断任务 * perf: add AccessTokenAuthentication * perf: 修改 BaseStorageSerializer 字段类型 * perf: 修改 AppletHostSerializer 字段类型 * perf: signal event * perf: asset types automations (#9259) Co-authored-by: feng <1304903146@qq.com> * perf: 修改下载 rdp 文件时返回的 address 地址信息为空的问题 * perf: 修改 AssetSerializer.accounts.secret 为 write_only; 修改 DomainWithGatewaySerializer.gateways 返回 account 信息及 secret 字段; * perf: automation 干库 (#9260) Co-authored-by: feng <1304903146@qq.com> * perf: account push api * feat: 修改迁移文件 * feat: 删除无用代码 * feat: 优化部分资源无操作日志 * perf: 修改 account * perf: perm tree * perf: asset serializers retrieve * perf: 格式化代码 * perf: AutomationExecution (#9268) Co-authored-by: feng <1304903146@qq.com> * perf: AssetDetailSerializer 和 Asset Model 添加 specific_info 字段; * perf: 修改账号推送 * feat: handle ws heartbeat status * perf: k8s tree (#9269) Co-authored-by: feng <1304903146@qq.com> * perf: 修改账号推送 * perf: 修改 asset detail serializer * fix: 修复 windows 不能运行 powershell 命令的问题 * feat: 支持按照资源时间线查看操作活动 * feat: 翻译 * feat: 优化操作日志 * perf: asset clone * fix: 错误的修改改回去 * perf: create asset account * feat: 增加task 刷新续传功能 * fix: applet host deloypment filter host * perf: 修改了 common 结构,和 push accounts * perf: 整理 common 结构 * perf: 修改 const import * perf: 修改 allow bulk destroy * fix: applet host search fileds * perf: applet bulk delete * fix: applet list 404 * perf: 修改 common view * feat: 增加一些翻译, 修复 playbook 上传的错误 * fix: 修改错别字 * perf: 修改 applets status * perf: 修改网关 api * perf: automateion (#9281) Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> * perf: 失效 connect methods 当 applet 删除 或者 host 删除 * perf: 网关账号的密码类型改成 LabelField * perf: chrome applet script * perf: verify code ttl (#9282) Co-authored-by: feng <1304903146@qq.com> * perf: database ping * perf: ws * perf: 修改网关创建 * perf: account task org (#9285) Co-authored-by: feng <1304903146@qq.com> * perf: asset test api * perf: port 添加 account * pref: 修改 db mapper permission * fix: db port mapper list api * perf: account change secret (#9286) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 setup_eager_loading * perf: SecretStrategy * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * pref: web database 信号转发 * perf: account push automation * perf: push filter account * perf: 修改 publish 版本 * perf: 修改网关 * fix: 修改资产 Specific 信息中 JSONField 字段返回 json.loads 对象 * feat: 远程应用内置Navicat Premium 16 * feat: 更新下载链接 * feat: 整理代码格式 * perf: 修改 terminal point * perf: update chrome applet script * fix: 资产 specific 获取 JSONField 时, 判断值的类型不为 list, dict * perf: domain (#9292) Co-authored-by: feng <1304903146@qq.com> * perf: 优化 endpoint 监听端口,仅 oracle 动态 * perf: 修改翻译 * perf: 修改文案 * perf: 修改缺失的翻译 * perf: 修改 endpoint help text * feat: 还原格式 * feat: 去掉基类 * feat: 增加特权账号字段 * perf: decode content * fix: check pid * perf: 修改 smart endpoint * perf: 修改 endpoint mysql default port * feat: 优化 * perf: 修改 endpoint mysql default port * perf: gateway test (#9295) Co-authored-by: feng <1304903146@qq.com> * perf: migrate * perf: 修改 endpoint mysql default port * fix: 修复获取任务执行结果死循环 * feat: 作业审计日志增加字段 * fix: add on_transaction_commit task post save * perf: gateway (#9297) Co-authored-by: feng <1304903146@qq.com> * feat: 过滤 jumpserver 自动产生的用户 * fix: 修复ops节点选择的问题 * fix: 修改 统一 connection-token 和 command 的 review API 返回数据 from_ticket_info * perf: change secret (#9298) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 db port manager * perf: 修改 db port manager * perf: add celery log mark * perf: remove debug log data * fix: navicat use manual type * fix: remove navicate download url * perf: push_account_enabled (#9301) Co-authored-by: feng <1304903146@qq.com> * fix: 修改navicat启动程序MD5值 * perf: push account (#9303) Co-authored-by: feng <1304903146@qq.com> * feat: Redis/MongoDB 支持SSL * fix: 修改授权规则过滤字段 node_name,node_id; 修复获取授权节点下的资产为空的问题; * perf: push account button (#9305) Co-authored-by: feng <1304903146@qq.com> * perf: account push * fix: 修复获取 /user//assets/tree/ 返回用户授权的所有资产 * perf: asset ping (#9307) Co-authored-by: feng <1304903146@qq.com> * perf: asset enabled_info * perf: 优化activity记录都保存至operatelog中 * feat: 远程应用navicat支持试用版连接 * perf: 优化迁移文件 * perf: 修改资产列表 API category type 字段 choices 根据 category 进行返回 * fix * perf: 修改账号列表 API 解决根据 node_id asset_id 搜索账号列表无效的问题 * fix: navicat dba账号登录 * perf: 优化navicat连接 * perf: 修改账号列表 Model Manager 继承自 OrgManager,解决组织过滤问题 * perf: 修改账号列表 Filter 支持根据 platform,category,type 字段搜索 * perf: change secret email (#9312) Co-authored-by: feng <1304903146@qq.com> * feat: 保证认证信息一定清理 * perf: add mariadb * perf: 修改资产类型树数量统计资产或账号 * perf: applet chrome quit * perf: 优化关闭欢迎页面 * fix * perf: executed amount * perf: 修改 built-in applet installation * perf: 修改资产列表增加标签搜索 * perf: 修改资产列表增加标签搜索 * perf: account task automation (#9319) Co-authored-by: feng <1304903146@qq.com> * perf: account trigger * perf: 修改系统设置文案:批量命令执行 -> 作业中心 * perf: 优化migrate (#9320) Co-authored-by: feng <1304903146@qq.com> * perf: 修改资产节点树 API,支持搜索资产、节点 * perf: audit dashboard (#9321) Co-authored-by: feng <1304903146@qq.com> * fix: 修改 has_perm 权限判断兼容 list 和 str 类型 * perf: 修改一些换行 * perf: 修改 ansible config * fix: oracle依赖文件地址错误 (#9324) * perf: ansible mudules * perf: 修改 runner host cwd Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Aaron3S <chenyang@fit2cloud.com> Co-authored-by: Bai <baijiangjie@gmail.com> Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> Co-authored-by: Eric <xplzv@126.com> Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com> Co-authored-by: jiangweidong <80373698+Hi-JWD@users.noreply.github.com>
168 lines
5.3 KiB
Python
168 lines
5.3 KiB
Python
# ~*~ coding: utf-8 ~*~
|
||
|
||
import json
|
||
import os
|
||
import re
|
||
import time
|
||
|
||
import pytz
|
||
from channels.db import database_sync_to_async
|
||
from django.conf import settings
|
||
from django.core.exceptions import MiddlewareNotUsed
|
||
from django.core.handlers.asgi import ASGIRequest
|
||
from django.http.response import HttpResponseForbidden
|
||
from django.shortcuts import HttpResponse
|
||
from django.utils import timezone
|
||
|
||
from authentication.backends.drf import (SignatureAuthentication,
|
||
AccessTokenAuthentication)
|
||
from .utils import set_current_request
|
||
|
||
|
||
class TimezoneMiddleware:
|
||
def __init__(self, get_response):
|
||
self.get_response = get_response
|
||
|
||
def __call__(self, request):
|
||
tzname = request.META.get('HTTP_X_TZ')
|
||
if not tzname or tzname == 'undefined':
|
||
return self.get_response(request)
|
||
try:
|
||
tz = pytz.timezone(tzname)
|
||
timezone.activate(tz)
|
||
except pytz.UnknownTimeZoneError:
|
||
pass
|
||
response = self.get_response(request)
|
||
return response
|
||
|
||
|
||
class DemoMiddleware:
|
||
DEMO_MODE_ENABLED = os.environ.get("DEMO_MODE", "") in ("1", "ok", "True")
|
||
SAFE_URL_PATTERN = re.compile(
|
||
r'^/users/login|'
|
||
r'^/api/terminal/v1/.*|'
|
||
r'^/api/terminal/.*|'
|
||
r'^/api/users/v1/auth/|'
|
||
r'^/api/users/v1/profile/'
|
||
)
|
||
SAFE_METHOD = ("GET", "HEAD")
|
||
|
||
def __init__(self, get_response):
|
||
self.get_response = get_response
|
||
|
||
if self.DEMO_MODE_ENABLED:
|
||
print("Demo mode enabled, reject unsafe method and url")
|
||
raise MiddlewareNotUsed
|
||
|
||
def __call__(self, request):
|
||
if self.DEMO_MODE_ENABLED and request.method not in self.SAFE_METHOD \
|
||
and not self.SAFE_URL_PATTERN.match(request.path):
|
||
return HttpResponse("Demo mode, only safe request accepted", status=403)
|
||
else:
|
||
response = self.get_response(request)
|
||
return response
|
||
|
||
|
||
class RequestMiddleware:
|
||
def __init__(self, get_response):
|
||
self.get_response = get_response
|
||
|
||
def __call__(self, request):
|
||
set_current_request(request)
|
||
response = self.get_response(request)
|
||
is_request_api = request.path.startswith('/api')
|
||
if not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE and \
|
||
not is_request_api:
|
||
age = request.session.get_expiry_age()
|
||
request.session.set_expiry(age)
|
||
return response
|
||
|
||
|
||
class RefererCheckMiddleware:
|
||
def __init__(self, get_response):
|
||
if not settings.REFERER_CHECK_ENABLED:
|
||
raise MiddlewareNotUsed
|
||
self.get_response = get_response
|
||
self.http_pattern = re.compile('https?://')
|
||
|
||
def check_referer(self, request):
|
||
referer = request.META.get('HTTP_REFERER', '')
|
||
referer = self.http_pattern.sub('', referer)
|
||
if not referer:
|
||
return True
|
||
remote_host = request.get_host()
|
||
return referer.startswith(remote_host)
|
||
|
||
def __call__(self, request):
|
||
match = self.check_referer(request)
|
||
if not match:
|
||
return HttpResponseForbidden('CSRF CHECK ERROR')
|
||
response = self.get_response(request)
|
||
return response
|
||
|
||
|
||
class StartMiddleware:
|
||
def __init__(self, get_response):
|
||
self.get_response = get_response
|
||
if not settings.DEBUG_DEV:
|
||
raise MiddlewareNotUsed
|
||
|
||
def __call__(self, request):
|
||
request._s_time_start = time.time()
|
||
response = self.get_response(request)
|
||
request._s_time_end = time.time()
|
||
if request.path == '/api/health/':
|
||
data = response.data
|
||
data['pre_middleware_time'] = request._e_time_start - request._s_time_start
|
||
data['api_time'] = request._e_time_end - request._e_time_start
|
||
data['post_middleware_time'] = request._s_time_end - request._e_time_end
|
||
response.content = json.dumps(data)
|
||
response.headers['Content-Length'] = str(len(response.content))
|
||
return response
|
||
return response
|
||
|
||
|
||
class EndMiddleware:
|
||
def __init__(self, get_response):
|
||
self.get_response = get_response
|
||
if not settings.DEBUG_DEV:
|
||
raise MiddlewareNotUsed
|
||
|
||
def __call__(self, request):
|
||
request._e_time_start = time.time()
|
||
response = self.get_response(request)
|
||
request._e_time_end = time.time()
|
||
return response
|
||
|
||
|
||
@database_sync_to_async
|
||
def get_signature_user(scope):
|
||
headers = dict(scope["headers"])
|
||
if not headers.get(b'authorization'):
|
||
return
|
||
if scope['type'] == 'websocket':
|
||
scope['method'] = 'GET'
|
||
try:
|
||
# 因为 ws 使用的是 scope,所以需要转换成 request 对象,用于认证校验
|
||
request = ASGIRequest(scope, None)
|
||
backends = [SignatureAuthentication(),
|
||
AccessTokenAuthentication()]
|
||
for backend in backends:
|
||
user, _ = backend.authenticate(request)
|
||
if user:
|
||
return user
|
||
except Exception as e:
|
||
print(e)
|
||
return None
|
||
|
||
|
||
class WsSignatureAuthMiddleware:
|
||
def __init__(self, app):
|
||
self.app = app
|
||
|
||
async def __call__(self, scope, receive, send):
|
||
user = await get_signature_user(scope)
|
||
if user:
|
||
scope['user'] = user
|
||
return await self.app(scope, receive, send)
|