mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-14 20:16:04 +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>
362 lines
14 KiB
Python
362 lines
14 KiB
Python
import base64
|
|
import json
|
|
import os
|
|
import urllib.parse
|
|
|
|
from django.http import HttpResponse
|
|
from django.shortcuts import get_object_or_404
|
|
from django.utils import timezone
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from rest_framework import status
|
|
from rest_framework.decorators import action
|
|
from rest_framework.exceptions import PermissionDenied
|
|
from rest_framework.request import Request
|
|
from rest_framework.response import Response
|
|
from rest_framework.serializers import ValidationError
|
|
|
|
from common.api import JMSModelViewSet
|
|
from common.utils.http import is_true
|
|
from common.utils import random_string
|
|
from common.utils.django import get_request_os
|
|
from common.exceptions import JMSException
|
|
from orgs.mixins.api import RootOrgViewMixin
|
|
from perms.models import ActionChoices
|
|
from terminal.connect_methods import NativeClient, ConnectMethodUtil
|
|
from terminal.models import EndpointRule
|
|
from ..models import ConnectionToken
|
|
from ..serializers import (
|
|
ConnectionTokenSerializer, ConnectionTokenSecretSerializer,
|
|
SuperConnectionTokenSerializer, ConnectTokenAppletOptionSerializer
|
|
)
|
|
|
|
__all__ = ['ConnectionTokenViewSet', 'SuperConnectionTokenViewSet']
|
|
|
|
|
|
class RDPFileClientProtocolURLMixin:
|
|
request: Request
|
|
get_serializer: callable
|
|
|
|
def get_rdp_file_info(self, token: ConnectionToken):
|
|
rdp_options = {
|
|
'full address:s': '',
|
|
'username:s': '',
|
|
'use multimon:i': '0',
|
|
'session bpp:i': '32',
|
|
'audiomode:i': '0',
|
|
'disable wallpaper:i': '0',
|
|
'disable full window drag:i': '0',
|
|
'disable menu anims:i': '0',
|
|
'disable themes:i': '0',
|
|
'alternate shell:s': '',
|
|
'shell working directory:s': '',
|
|
'authentication level:i': '2',
|
|
'connect to console:i': '0',
|
|
'disable cursor setting:i': '0',
|
|
'allow font smoothing:i': '1',
|
|
'allow desktop composition:i': '1',
|
|
'redirectprinters:i': '0',
|
|
'prompt for credentials on client:i': '0',
|
|
'autoreconnection enabled:i': '1',
|
|
'bookmarktype:i': '3',
|
|
'use redirection server name:i': '0',
|
|
'smart sizing:i': '1',
|
|
}
|
|
|
|
# 设置磁盘挂载
|
|
drives_redirect = is_true(self.request.query_params.get('drives_redirect'))
|
|
if drives_redirect:
|
|
if ActionChoices.contains(token.actions, ActionChoices.transfer()):
|
|
rdp_options['drivestoredirect:s'] = '*'
|
|
|
|
# 设置全屏
|
|
full_screen = is_true(self.request.query_params.get('full_screen'))
|
|
rdp_options['screen mode id:i'] = '2' if full_screen else '1'
|
|
|
|
# 设置 RDP Server 地址
|
|
endpoint = self.get_smart_endpoint(protocol='rdp', asset=token.asset)
|
|
rdp_options['full address:s'] = f'{endpoint.host}:{endpoint.rdp_port}'
|
|
|
|
# 设置用户名
|
|
rdp_options['username:s'] = '{}|{}'.format(token.user.username, str(token.id))
|
|
# rdp_options['domain:s'] = token.account_ad_domain
|
|
|
|
# 设置宽高
|
|
height = self.request.query_params.get('height')
|
|
width = self.request.query_params.get('width')
|
|
if width and height:
|
|
rdp_options['desktopwidth:i'] = width
|
|
rdp_options['desktopheight:i'] = height
|
|
rdp_options['winposstr:s:'] = f'0,1,0,0,{width},{height}'
|
|
|
|
# 设置其他选项
|
|
rdp_options['session bpp:i'] = os.getenv('JUMPSERVER_COLOR_DEPTH', '32')
|
|
rdp_options['audiomode:i'] = self.parse_env_bool('JUMPSERVER_DISABLE_AUDIO', 'false', '2', '0')
|
|
|
|
# 设置远程应用, 不是 Mstsc
|
|
if token.connect_method != NativeClient.mstsc:
|
|
remote_app_options = token.get_remote_app_option()
|
|
rdp_options.update(remote_app_options)
|
|
|
|
# 文件名
|
|
name = token.asset.name
|
|
prefix_name = f'{token.user.username}-{name}'
|
|
filename = self.get_connect_filename(prefix_name)
|
|
|
|
content = ''
|
|
for k, v in rdp_options.items():
|
|
content += f'{k}:{v}\n'
|
|
|
|
return filename, content
|
|
|
|
@staticmethod
|
|
def get_connect_filename(prefix_name):
|
|
prefix_name = prefix_name.replace('/', '_')
|
|
prefix_name = prefix_name.replace('\\', '_')
|
|
prefix_name = prefix_name.replace('.', '_')
|
|
filename = f'{prefix_name}-jumpserver'
|
|
filename = urllib.parse.quote(filename)
|
|
return filename
|
|
|
|
@staticmethod
|
|
def parse_env_bool(env_key, env_default, true_value, false_value):
|
|
return true_value if is_true(os.getenv(env_key, env_default)) else false_value
|
|
|
|
def get_client_protocol_data(self, token: ConnectionToken):
|
|
_os = get_request_os(self.request)
|
|
|
|
connect_method_name = token.connect_method
|
|
connect_method_dict = ConnectMethodUtil.get_connect_method(
|
|
token.connect_method, token.protocol, _os
|
|
)
|
|
if connect_method_dict is None:
|
|
raise ValueError('Connect method not support: {}'.format(connect_method_name))
|
|
|
|
data = {
|
|
'id': str(token.id),
|
|
'value': token.value,
|
|
'protocol': token.protocol,
|
|
'command': '',
|
|
'file': {}
|
|
}
|
|
|
|
if connect_method_name == NativeClient.mstsc or connect_method_dict['type'] == 'applet':
|
|
filename, content = self.get_rdp_file_info(token)
|
|
data.update({
|
|
'protocol': 'rdp',
|
|
'file': {
|
|
'name': filename,
|
|
'content': content,
|
|
}
|
|
})
|
|
else:
|
|
print("Connect method: {}".format(connect_method_dict))
|
|
endpoint = self.get_smart_endpoint(
|
|
protocol=connect_method_dict['endpoint_protocol'],
|
|
asset=token.asset
|
|
)
|
|
cmd = NativeClient.get_launch_command(connect_method_name, token, endpoint)
|
|
data.update({'command': cmd})
|
|
return data
|
|
|
|
def get_smart_endpoint(self, protocol, asset=None):
|
|
target_ip = asset.get_target_ip() if asset else ''
|
|
endpoint = EndpointRule.match_endpoint(
|
|
target_instance=asset, target_ip=target_ip, protocol=protocol, request=self.request
|
|
)
|
|
return endpoint
|
|
|
|
|
|
class ExtraActionApiMixin(RDPFileClientProtocolURLMixin):
|
|
request: Request
|
|
get_object: callable
|
|
get_serializer: callable
|
|
perform_create: callable
|
|
|
|
@action(methods=['POST', 'GET'], detail=True, url_path='rdp-file')
|
|
def get_rdp_file(self, *args, **kwargs):
|
|
token = self.get_object()
|
|
token.is_valid()
|
|
filename, content = self.get_rdp_file_info(token)
|
|
filename = '{}.rdp'.format(filename)
|
|
response = HttpResponse(content, content_type='application/octet-stream')
|
|
response['Content-Disposition'] = 'attachment; filename*=UTF-8\'\'%s' % filename
|
|
return response
|
|
|
|
@action(methods=['POST', 'GET'], detail=True, url_path='client-url')
|
|
def get_client_protocol_url(self, *args, **kwargs):
|
|
token = self.get_object()
|
|
token.is_valid()
|
|
try:
|
|
protocol_data = self.get_client_protocol_data(token)
|
|
except ValueError as e:
|
|
return Response(data={'error': str(e)}, status=status.HTTP_400_BAD_REQUEST)
|
|
protocol_data = json.dumps(protocol_data).encode()
|
|
protocol_data = base64.b64encode(protocol_data).decode()
|
|
data = {
|
|
'url': 'jms://{}'.format(protocol_data)
|
|
}
|
|
return Response(data=data)
|
|
|
|
@action(methods=['PATCH'], detail=True)
|
|
def expire(self, request, *args, **kwargs):
|
|
instance = self.get_object()
|
|
instance.expire()
|
|
return Response(status=status.HTTP_204_NO_CONTENT)
|
|
|
|
|
|
class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelViewSet):
|
|
filterset_fields = (
|
|
'user_display', 'asset_display'
|
|
)
|
|
search_fields = filterset_fields
|
|
serializer_classes = {
|
|
'default': ConnectionTokenSerializer,
|
|
}
|
|
rbac_perms = {
|
|
'list': 'authentication.view_connectiontoken',
|
|
'retrieve': 'authentication.view_connectiontoken',
|
|
'create': 'authentication.add_connectiontoken',
|
|
'expire': 'authentication.add_connectiontoken',
|
|
'get_rdp_file': 'authentication.add_connectiontoken',
|
|
'get_client_protocol_url': 'authentication.add_connectiontoken',
|
|
}
|
|
|
|
def get_queryset(self):
|
|
queryset = ConnectionToken.objects \
|
|
.filter(user=self.request.user) \
|
|
.filter(date_expired__gt=timezone.now())
|
|
return queryset
|
|
|
|
def get_user(self, serializer):
|
|
return self.request.user
|
|
|
|
def perform_create(self, serializer):
|
|
self.validate_serializer(serializer)
|
|
return super().perform_create(serializer)
|
|
|
|
def validate_serializer(self, serializer):
|
|
data = serializer.validated_data
|
|
user = self.get_user(serializer)
|
|
asset = data.get('asset')
|
|
account_name = data.get('account')
|
|
data['org_id'] = asset.org_id
|
|
data['user'] = user
|
|
data['value'] = random_string(16)
|
|
|
|
account = self._validate_perm(user, asset, account_name)
|
|
if account.has_secret:
|
|
data['input_secret'] = ''
|
|
if account.username != '@INPUT':
|
|
data['input_username'] = ''
|
|
|
|
ticket = self._validate_acl(user, asset, account)
|
|
if ticket:
|
|
data['from_ticket'] = ticket
|
|
data['is_active'] = False
|
|
|
|
return account
|
|
|
|
@staticmethod
|
|
def _validate_perm(user, asset, account_name):
|
|
from perms.utils.account import PermAccountUtil
|
|
account = PermAccountUtil().validate_permission(user, asset, account_name)
|
|
if not account or not account.actions:
|
|
msg = _('Account not found')
|
|
raise JMSException(code='perm_account_invalid', detail=msg)
|
|
if account.date_expired < timezone.now():
|
|
msg = _('Permission Expired')
|
|
raise JMSException(code='perm_expired', detail=msg)
|
|
return account
|
|
|
|
def _validate_acl(self, user, asset, account):
|
|
from acls.models import LoginAssetACL
|
|
acl = LoginAssetACL.filter_queryset(user, asset, account).valid().first()
|
|
if not acl:
|
|
return
|
|
if acl.is_action(acl.ActionChoices.accept):
|
|
return
|
|
if acl.is_action(acl.ActionChoices.reject):
|
|
msg = _('ACL action is reject')
|
|
raise JMSException(code='acl_reject', detail=msg)
|
|
if acl.is_action(acl.ActionChoices.review):
|
|
if not self.request.query_params.get('create_ticket'):
|
|
msg = _('ACL action is review')
|
|
raise JMSException(code='acl_review', detail=msg)
|
|
|
|
ticket = LoginAssetACL.create_login_asset_review_ticket(
|
|
user=user, asset=asset, account_username=account.username,
|
|
assignees=acl.reviewers.all(), org_id=asset.org_id
|
|
)
|
|
return ticket
|
|
|
|
|
|
class SuperConnectionTokenViewSet(ConnectionTokenViewSet):
|
|
serializer_classes = {
|
|
'default': SuperConnectionTokenSerializer,
|
|
'get_secret_detail': ConnectionTokenSecretSerializer,
|
|
}
|
|
rbac_perms = {
|
|
'create': 'authentication.add_superconnectiontoken',
|
|
'renewal': 'authentication.add_superconnectiontoken',
|
|
'get_secret_detail': 'authentication.view_connectiontokensecret',
|
|
'get_applet_info': 'authentication.view_superconnectiontoken',
|
|
'release_applet_account': 'authentication.view_superconnectiontoken',
|
|
}
|
|
|
|
def get_queryset(self):
|
|
return ConnectionToken.objects.all()
|
|
|
|
def get_user(self, serializer):
|
|
return serializer.validated_data.get('user')
|
|
|
|
@action(methods=['PATCH'], detail=False)
|
|
def renewal(self, request, *args, **kwargs):
|
|
from common.utils.timezone import as_current_tz
|
|
|
|
token_id = request.data.get('id') or ''
|
|
token = get_object_or_404(ConnectionToken, pk=token_id)
|
|
date_expired = as_current_tz(token.date_expired)
|
|
if token.is_expired:
|
|
raise PermissionDenied('Token is expired at: {}'.format(date_expired))
|
|
token.renewal()
|
|
data = {
|
|
'ok': True,
|
|
'msg': f'Token is renewed, date expired: {date_expired}'
|
|
}
|
|
return Response(data=data, status=status.HTTP_200_OK)
|
|
|
|
@action(methods=['POST'], detail=False, url_path='secret')
|
|
def get_secret_detail(self, request, *args, **kwargs):
|
|
""" 非常重要的 api, 在逻辑层再判断一下 rbac 权限, 双重保险 """
|
|
rbac_perm = 'authentication.view_connectiontokensecret'
|
|
if not request.user.has_perm(rbac_perm):
|
|
raise PermissionDenied('Not allow to view secret')
|
|
|
|
token_id = request.data.get('id') or ''
|
|
token = get_object_or_404(ConnectionToken, pk=token_id)
|
|
if token.is_expired:
|
|
raise ValidationError({'id': 'Token is expired'})
|
|
|
|
token.is_valid()
|
|
serializer = self.get_serializer(instance=token)
|
|
expire_now = request.data.get('expire_now', True)
|
|
if expire_now:
|
|
token.expire()
|
|
return Response(serializer.data, status=status.HTTP_200_OK)
|
|
|
|
@action(methods=['POST'], detail=False, url_path='applet-option')
|
|
def get_applet_info(self, *args, **kwargs):
|
|
token_id = self.request.data.get('id')
|
|
token = get_object_or_404(ConnectionToken, pk=token_id)
|
|
if token.is_expired:
|
|
return Response({'error': 'Token expired'}, status=status.HTTP_400_BAD_REQUEST)
|
|
data = token.get_applet_option()
|
|
serializer = ConnectTokenAppletOptionSerializer(data)
|
|
return Response(serializer.data)
|
|
|
|
@action(methods=['DELETE', 'POST'], detail=False, url_path='applet-account/release')
|
|
def release_applet_account(self, *args, **kwargs):
|
|
account_id = self.request.data.get('id')
|
|
msg = ConnectionToken.release_applet_account(account_id)
|
|
return Response({'msg': msg})
|