mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-15 14:47:24 +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>
258 lines
9.0 KiB
Python
258 lines
9.0 KiB
Python
import base64
|
||
import json
|
||
from datetime import timedelta
|
||
|
||
from django.conf import settings
|
||
from django.core.cache import cache
|
||
from django.db import models
|
||
from django.utils import timezone
|
||
from django.utils.translation import ugettext_lazy as _
|
||
from rest_framework.exceptions import PermissionDenied
|
||
|
||
from assets.const import Protocol
|
||
from common.db.fields import EncryptCharField
|
||
from common.utils import lazyproperty, pretty_string, bulk_get, reverse
|
||
from common.utils.timezone import as_current_tz
|
||
from orgs.mixins.models import JMSOrgBaseModel
|
||
from terminal.models import Applet
|
||
|
||
|
||
def date_expired_default():
|
||
return timezone.now() + timedelta(seconds=settings.CONNECTION_TOKEN_EXPIRATION)
|
||
|
||
|
||
class ConnectionToken(JMSOrgBaseModel):
|
||
value = models.CharField(max_length=64, default='', verbose_name=_("Value"))
|
||
user = models.ForeignKey(
|
||
'users.User', on_delete=models.SET_NULL, null=True, blank=True,
|
||
related_name='connection_tokens', verbose_name=_('User')
|
||
)
|
||
asset = models.ForeignKey(
|
||
'assets.Asset', on_delete=models.SET_NULL, null=True, blank=True,
|
||
related_name='connection_tokens', verbose_name=_('Asset'),
|
||
)
|
||
account = models.CharField(max_length=128, verbose_name=_("Account name")) # 登录账号Name
|
||
input_username = models.CharField(max_length=128, default='', blank=True, verbose_name=_("Input username"))
|
||
input_secret = EncryptCharField(max_length=64, default='', blank=True, verbose_name=_("Input secret"))
|
||
protocol = models.CharField(max_length=16, default=Protocol.ssh, verbose_name=_("Protocol"))
|
||
connect_method = models.CharField(max_length=32, verbose_name=_("Connect method"))
|
||
user_display = models.CharField(max_length=128, default='', verbose_name=_("User display"))
|
||
asset_display = models.CharField(max_length=128, default='', verbose_name=_("Asset display"))
|
||
date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_("Date expired"))
|
||
from_ticket = models.OneToOneField(
|
||
'tickets.ApplyLoginAssetTicket', related_name='connection_token',
|
||
on_delete=models.SET_NULL, null=True, blank=True,
|
||
verbose_name=_('From ticket')
|
||
)
|
||
is_active = models.BooleanField(default=True, verbose_name=_("Active"))
|
||
|
||
class Meta:
|
||
ordering = ('-date_expired',)
|
||
verbose_name = _('Connection token')
|
||
permissions = [
|
||
('view_connectiontokensecret', _('Can view connection token secret'))
|
||
]
|
||
|
||
@property
|
||
def is_expired(self):
|
||
return self.date_expired < timezone.now()
|
||
|
||
@property
|
||
def expire_time(self):
|
||
interval = self.date_expired - timezone.now()
|
||
seconds = interval.total_seconds()
|
||
if seconds < 0:
|
||
seconds = 0
|
||
return int(seconds)
|
||
|
||
def save(self, *args, **kwargs):
|
||
self.asset_display = pretty_string(self.asset, max_length=128)
|
||
self.user_display = pretty_string(self.user, max_length=128)
|
||
return super().save(*args, **kwargs)
|
||
|
||
def expire(self):
|
||
self.date_expired = timezone.now()
|
||
self.save()
|
||
|
||
def renewal(self):
|
||
""" 续期 Token,将来支持用户自定义创建 token 后,续期策略要修改 """
|
||
self.date_expired = date_expired_default()
|
||
self.save()
|
||
|
||
@lazyproperty
|
||
def permed_account(self):
|
||
from perms.utils import PermAccountUtil
|
||
permed_account = PermAccountUtil().validate_permission(
|
||
self.user, self.asset, self.account
|
||
)
|
||
return permed_account
|
||
|
||
@lazyproperty
|
||
def actions(self):
|
||
return self.permed_account.actions
|
||
|
||
@lazyproperty
|
||
def expire_at(self):
|
||
return self.permed_account.date_expired.timestamp()
|
||
|
||
def is_valid(self):
|
||
if not self.is_active:
|
||
error = _('Connection token inactive')
|
||
raise PermissionDenied(error)
|
||
if self.is_expired:
|
||
error = _('Connection token expired at: {}').format(as_current_tz(self.date_expired))
|
||
raise PermissionDenied(error)
|
||
if not self.user or not self.user.is_valid:
|
||
error = _('No user or invalid user')
|
||
raise PermissionDenied(error)
|
||
if not self.asset or not self.asset.is_active:
|
||
is_valid = False
|
||
error = _('No asset or inactive asset')
|
||
return is_valid, error
|
||
if not self.account:
|
||
error = _('No account')
|
||
raise PermissionDenied(error)
|
||
|
||
if timezone.now() - self.date_created < timedelta(seconds=60):
|
||
return True, None
|
||
|
||
if not self.permed_account or not self.permed_account.actions:
|
||
msg = 'user `{}` not has asset `{}` permission for login `{}`'.format(
|
||
self.user, self.asset, self.account
|
||
)
|
||
raise PermissionDenied(msg)
|
||
|
||
if self.permed_account.date_expired < timezone.now():
|
||
raise PermissionDenied('Expired')
|
||
return True
|
||
|
||
@lazyproperty
|
||
def platform(self):
|
||
return self.asset.platform
|
||
|
||
@lazyproperty
|
||
def connect_method_object(self):
|
||
from common.utils import get_request_os
|
||
from jumpserver.utils import get_current_request
|
||
from terminal.connect_methods import ConnectMethodUtil
|
||
|
||
request = get_current_request()
|
||
os = get_request_os(request) if request else 'windows'
|
||
method = ConnectMethodUtil.get_connect_method(
|
||
self.connect_method, protocol=self.protocol, os=os
|
||
)
|
||
return method
|
||
|
||
def get_remote_app_option(self):
|
||
cmdline = {
|
||
'app_name': self.connect_method,
|
||
'user_id': str(self.user.id),
|
||
'asset_id': str(self.asset.id),
|
||
'token_id': str(self.id)
|
||
}
|
||
cmdline_b64 = base64.b64encode(json.dumps(cmdline).encode()).decode()
|
||
app = '||tinker'
|
||
options = {
|
||
'remoteapplicationmode:i': '1',
|
||
'remoteapplicationprogram:s': app,
|
||
'remoteapplicationname:s': app,
|
||
'alternate shell:s': app,
|
||
'remoteapplicationcmdline:s': cmdline_b64,
|
||
}
|
||
return options
|
||
|
||
def get_applet_option(self):
|
||
method = self.connect_method_object
|
||
if not method or method.get('type') != 'applet' or method.get('disabled', False):
|
||
return None
|
||
|
||
applet = Applet.objects.filter(name=method.get('value')).first()
|
||
if not applet:
|
||
return None
|
||
|
||
host_account = applet.select_host_account()
|
||
if not host_account:
|
||
return None
|
||
|
||
host, account, lock_key, ttl = bulk_get(host_account, ('host', 'account', 'lock_key', 'ttl'))
|
||
gateway = host.gateway.select_gateway() if host.domain else None
|
||
|
||
data = {
|
||
'id': account.id,
|
||
'applet': applet,
|
||
'host': host,
|
||
'gateway': gateway,
|
||
'account': account,
|
||
'remote_app_option': self.get_remote_app_option()
|
||
}
|
||
token_account_relate_key = f'token_account_relate_{account.id}'
|
||
cache.set(token_account_relate_key, lock_key, ttl)
|
||
return data
|
||
|
||
@staticmethod
|
||
def release_applet_account(account_id):
|
||
token_account_relate_key = f'token_account_relate_{account_id}'
|
||
lock_key = cache.get(token_account_relate_key)
|
||
if lock_key:
|
||
cache.delete(lock_key)
|
||
cache.delete(token_account_relate_key)
|
||
return 'released'
|
||
return 'not found or expired'
|
||
|
||
@lazyproperty
|
||
def account_object(self):
|
||
from accounts.models import Account
|
||
if not self.asset:
|
||
return None
|
||
|
||
account = self.asset.accounts.filter(name=self.account).first()
|
||
if self.account == '@INPUT' or not account:
|
||
data = {
|
||
'name': self.account,
|
||
'username': self.input_username,
|
||
'secret_type': 'password',
|
||
'secret': self.input_secret,
|
||
'su_from': None,
|
||
'org_id': self.asset.org_id
|
||
}
|
||
else:
|
||
data = {
|
||
'name': account.name,
|
||
'username': account.username,
|
||
'secret_type': account.secret_type,
|
||
'secret': account.secret or self.input_secret,
|
||
'su_from': account.su_from,
|
||
'org_id': account.org_id
|
||
}
|
||
return Account(**data)
|
||
|
||
@lazyproperty
|
||
def domain(self):
|
||
domain = self.asset.domain if self.asset else None
|
||
return domain
|
||
|
||
@lazyproperty
|
||
def gateway(self):
|
||
from assets.models import Domain
|
||
if not self.domain:
|
||
return
|
||
self.domain: Domain
|
||
return self.domain.select_gateway()
|
||
|
||
@lazyproperty
|
||
def command_filter_acls(self):
|
||
from acls.models import CommandFilterACL
|
||
kwargs = {
|
||
'user': self.user,
|
||
'asset': self.asset,
|
||
'account': self.account_object,
|
||
}
|
||
acls = CommandFilterACL.filter_queryset(**kwargs).valid()
|
||
return acls
|
||
|
||
|
||
class SuperConnectionToken(ConnectionToken):
|
||
class Meta:
|
||
proxy = True
|
||
verbose_name = _("Super connection token")
|