mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-13 19:45:40 +00:00
* [Update] 初始化操作日志 * [Feature] 完成操作日志记录 * [Update] 修改mfa失败提示 * [Update] 修改增加created by内容 * [Update] 增加改密日志 * [Update] 登录日志迁移到日志审计中 * [Update] change block user logic, if login success, clean block limit * [Update] 更新中/英文翻译(ALL) (#1662) * Revert "授权页面分页问题" * 增加命令导出 (#1566) * [Update] gunicorn不使用eventlet * [Update] 添加eventlet * 替换淘宝IP查询接口 * [Feature] 添加命令记录下载功能 (#1559) * [Feature] 添加命令记录下载功能 * [Update] 文案修改,导出记录、提交,取消全部命令导出 * [Update] 命令导出,修复时间问题 * [Update] paramiko => 2.4.1 * [Update] 修改settings * [Update] 修改权限判断 * Dev (#1646) * [Update] 添加org * [Update] 修改url * [Update] 完成基本框架 * [Update] 修改一些逻辑 * [Update] 修改用户view * [Update] 修改资产 * [Update] 修改asset api * [Update] 修改协议小问题 * [Update] stash it * [Update] 修改约束 * [Update] 修改外键为org_id * [Update] 删掉Premiddleware * [Update] 修改Node * [Update] 修改get_current_org 为 proxy对象 current_org * [Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571) * [Update] 修改permission (#1574) * Tmp org (#1579) * [Update] 添加org api, 升级到django 2.0 * [Update] fix some bug * [Update] 修改一些bug * [Update] 添加授权规则org (#1580) * [Update] 修复创建授权规则,显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug; * Tmp org (#1583) * [Update] 修改一些内容 * [Update] 修改datatable 支持process * [Bugfix] 修复asset queryset 没有valid方法的bug * [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584) * [Update] 修复创建授权规则,显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug; * [Update] 在线/历史/命令model添加org * [Bugfix] 修复命令记录,保存org不成功bug * [Update] Org功能修改 * [Bugfix] 修复merge带来的问题 * [Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594) * [Bugfix] 修复资产授权添加用户,显示其他org的用户bug * [Update] org admin 显示资产详情右侧选项卡 * Tmp org (#1596) * [Update] 修改index view * [Update] 修改nav * [Update] 修改profile * [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug * [Update] 修改get_all_assets * [Bugfix] 修复节点前面有个空目录 * [Bugfix] 修复merge引起的bug * [Update] Add init * [Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None * [Update] 恢复原来的api地址 * [Update] 修改api * [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug * [Bugfix] Fix perm name unique * [Bugfix] 修复校验失败api * [Update] Merge with org * [Merge] 修改一下bug * [Update] 暂时修改一些url * [Update] 修改url 为django 2.0 path * [Update] 优化datatable 和显示组织优化 * [Update] 升级url * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613) * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode() method的bug * [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug * [Bugfix] 修复一些bug * [Bugfix] 修复一些bug * [Update] 更新org下普通用户的资产详情 (#1619) * [Update] 更新org下普通用户查看资产详情,只显示数据 * [Update] 优化org下普通用户查看资产详情前端代码 * [Update] 创建/更新用户的role选项;密码强度提示信息中英文; (#1623) * [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题 * [Update] 用户密码强度提示信息支持中英文 * [Update] 修改token返回 * [Update] Asset返回org name * [Update] 修改支持xpack * [Update] 修改url * [Bugfix] 修复不登录就能查看资产的bug * [Update] 用户修改 * [Bugfix] ... * [Bugfix] 修复跳转错误的问题 * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644) * [Update] 更新xpack下orgs的翻译信息 * [Update] 更新model Label,继承OrgModelMixin; * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; * [Bugfix] 修复小bug * [Update] 优化一些api * [Update] 优化用户资产页面 * [Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org (#1645) * [Update] 修改版本号 * [Update] 添加功能: 语言切换(中/英);修改 header_bar <商业支持、文档>显示方式 * [Update] 中/英切换文案修改;修改django_language key 从 settings 中获取 * [Update] 修改Dashboard页面文案,支持英文 * [Update] 更新中/英文翻译(ALL) * [Update] 解决翻译文件冲突 * [Update] 系统用户支持单独隋松 * [Update] 重置用户MFA * [Update] 设置session空闲时间 * [Update] 加密setting配置 * [Update] 修改单独推送和测试资产可连接性 * [Update] 添加功能:用户个人详情页添加 更改MFA操作 (#1748) * [Update] 添加功能:用户个人详情页添加 更改MFA操作 * [Update] 删除print * [Bugfix] 添加部分views的权限控制;从组织移除用户,同时从授权规则和用户组中移除此用户。 (#1746) * [Bugfix] 修复上传command log 为空 * [Update] 修复执行任务的bug * [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups * [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制 * [Update] 修改日志滚动 * [Bugfix] 修复组织权限控制的bug (#1763) * [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups * [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制
176 lines
6.5 KiB
Python
176 lines
6.5 KiB
Python
from __future__ import unicode_literals
|
|
|
|
import uuid
|
|
|
|
from django.db import models
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from django.utils import timezone
|
|
from django.conf import settings
|
|
|
|
from users.models import User
|
|
from orgs.mixins import OrgModelMixin
|
|
from common.models import common_settings
|
|
from .backends.command.models import AbstractSessionCommand
|
|
|
|
|
|
class Terminal(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
|
name = models.CharField(max_length=32, verbose_name=_('Name'))
|
|
remote_addr = models.CharField(max_length=128, verbose_name=_('Remote Address'))
|
|
ssh_port = models.IntegerField(verbose_name=_('SSH Port'), default=2222)
|
|
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')
|
|
is_deleted = models.BooleanField(default=False)
|
|
date_created = models.DateTimeField(auto_now_add=True)
|
|
comment = models.TextField(blank=True, verbose_name=_('Comment'))
|
|
|
|
@property
|
|
def is_active(self):
|
|
if self.user and self.user.is_active:
|
|
return True
|
|
return False
|
|
|
|
@is_active.setter
|
|
def is_active(self, active):
|
|
if self.user:
|
|
self.user.is_active = active
|
|
self.user.save()
|
|
|
|
def get_common_storage(self):
|
|
storage_all = settings.TERMINAL_COMMAND_STORAGE
|
|
if self.command_storage in storage_all:
|
|
storage = storage_all.get(self.command_storage)
|
|
else:
|
|
storage = storage_all.get('default')
|
|
return {"TERMINAL_COMMAND_STORAGE": storage}
|
|
|
|
def get_replay_storage(self):
|
|
storage_all = settings.TERMINAL_REPLAY_STORAGE
|
|
if self.replay_storage in storage_all:
|
|
storage = storage_all.get(self.replay_storage)
|
|
else:
|
|
storage = storage_all.get('default')
|
|
return {"TERMINAL_REPLAY_STORAGE": storage}
|
|
|
|
@property
|
|
def config(self):
|
|
configs = {}
|
|
for k in dir(settings):
|
|
if k.startswith('TERMINAL'):
|
|
configs[k] = getattr(settings, k)
|
|
configs.update(self.get_common_storage())
|
|
configs.update(self.get_replay_storage())
|
|
configs.update({
|
|
'SECURITY_MAX_IDLE_TIME': common_settings.SECURITY_MAX_IDLE_TIME or
|
|
settings.DEFAULT_SECURITY_MAX_IDLE_TIME,
|
|
})
|
|
return configs
|
|
|
|
def create_app_user(self):
|
|
random = uuid.uuid4().hex[:6]
|
|
user, access_key = User.create_app_user(name="{}-{}".format(self.name, random), comment=self.comment)
|
|
self.user = user
|
|
self.save()
|
|
return user, access_key
|
|
|
|
def delete(self, using=None, keep_parents=False):
|
|
if self.user:
|
|
self.user.delete()
|
|
self.user = None
|
|
self.is_deleted = True
|
|
self.save()
|
|
return
|
|
|
|
def __str__(self):
|
|
status = "Active"
|
|
if not self.is_accepted:
|
|
status = "NotAccept"
|
|
elif self.is_deleted:
|
|
status = "Deleted"
|
|
elif not self.is_active:
|
|
status = "Disable"
|
|
return '%s: %s' % (self.name, status)
|
|
|
|
class Meta:
|
|
ordering = ('is_accepted',)
|
|
db_table = "terminal"
|
|
|
|
|
|
class Status(models.Model):
|
|
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
|
session_online = models.IntegerField(verbose_name=_("Session Online"), default=0)
|
|
cpu_used = models.FloatField(verbose_name=_("CPU Usage"))
|
|
memory_used = models.FloatField(verbose_name=_("Memory Used"))
|
|
connections = models.IntegerField(verbose_name=_("Connections"))
|
|
threads = models.IntegerField(verbose_name=_("Threads"))
|
|
boot_time = models.FloatField(verbose_name=_("Boot Time"))
|
|
terminal = models.ForeignKey(Terminal, null=True, on_delete=models.CASCADE)
|
|
date_created = models.DateTimeField(auto_now_add=True)
|
|
|
|
class Meta:
|
|
db_table = 'terminal_status'
|
|
get_latest_by = 'date_created'
|
|
|
|
def __str__(self):
|
|
return self.date_created.strftime("%Y-%m-%d %H:%M:%S")
|
|
|
|
|
|
class Session(OrgModelMixin):
|
|
LOGIN_FROM_CHOICES = (
|
|
('ST', 'SSH Terminal'),
|
|
('WT', 'Web Terminal'),
|
|
)
|
|
PROTOCOL_CHOICES = (
|
|
('ssh', 'ssh'),
|
|
('rdp', 'rdp')
|
|
)
|
|
|
|
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
|
user = models.CharField(max_length=128, verbose_name=_("User"))
|
|
asset = models.CharField(max_length=1024, verbose_name=_("Asset"))
|
|
system_user = models.CharField(max_length=128, verbose_name=_("System user"))
|
|
login_from = models.CharField(max_length=2, choices=LOGIN_FROM_CHOICES, default="ST")
|
|
remote_addr = models.CharField(max_length=15, verbose_name=_("Remote addr"), blank=True, null=True)
|
|
is_finished = models.BooleanField(default=False)
|
|
has_replay = models.BooleanField(default=False, verbose_name=_("Replay"))
|
|
has_command = models.BooleanField(default=False, verbose_name=_("Command"))
|
|
terminal = models.ForeignKey(Terminal, null=True, on_delete=models.SET_NULL)
|
|
protocol = models.CharField(choices=PROTOCOL_CHOICES, default='ssh', max_length=8)
|
|
date_last_active = models.DateTimeField(verbose_name=_("Date last active"), default=timezone.now)
|
|
date_start = models.DateTimeField(verbose_name=_("Date start"), db_index=True, default=timezone.now)
|
|
date_end = models.DateTimeField(verbose_name=_("Date end"), null=True)
|
|
|
|
class Meta:
|
|
db_table = "terminal_session"
|
|
ordering = ["-date_start"]
|
|
|
|
def __str__(self):
|
|
return "{0.id} of {0.user} to {0.asset}".format(self)
|
|
|
|
|
|
class Task(models.Model):
|
|
NAME_CHOICES = (
|
|
("kill_session", "Kill Session"),
|
|
)
|
|
|
|
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
|
name = models.CharField(max_length=128, choices=NAME_CHOICES, verbose_name=_("Name"))
|
|
args = models.CharField(max_length=1024, verbose_name=_("Args"))
|
|
terminal = models.ForeignKey(Terminal, null=True, on_delete=models.SET_NULL)
|
|
is_finished = models.BooleanField(default=False)
|
|
date_created = models.DateTimeField(auto_now_add=True)
|
|
date_finished = models.DateTimeField(null=True)
|
|
|
|
class Meta:
|
|
db_table = "terminal_task"
|
|
|
|
|
|
class Command(AbstractSessionCommand):
|
|
|
|
class Meta:
|
|
db_table = "terminal_command"
|
|
ordering = ('-timestamp',)
|