github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5607 Commits
64 Branches
246 Tags
103 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f557c1dace'
${ noResults }
Commit Graph

2815 Commits (f557c1dace22dc51dce58a97d77f265fdfb084bd)

Author SHA1 Message Date
xinwen 9f6540afe3 fix(tickets): 调整登录确认工单 title
4 years ago
ibuler 832bb832ce fix(authentication): 修复cas退出的bug
4 years ago
ibuler 501329a8db fix: 再次修复
4 years ago
ibuler 8913aacd1e fix(authentication): 修复同时开启radius, openid引起的问题
4 years ago
xinwen e461fbdf50 fix(tickets): 修复已处理工单的 待处理人 字段
4 years ago
peijianbo 3941539408 fix(authentication):修复开启二次认证时，地址跳转出错问题
4 years ago
xinwen 605db2d905 fix(auth): 调整登录复核工单 title
4 years ago
peijianbo 4090a0b123 feat(uathentication):登录表单回车可直接提交表单
4 years ago
ibuler a55e28fc87 perf: 优化ldap超时时间
4 years ago
ibuler 82cf53181f perf(settings): 修改默认超时时间为10s
4 years ago
ibuler 78232aa900 perf(terminal): 优化命令提交
4 years ago
ibuler d2c93aff66 feat: 可以关闭工单菜单
4 years ago
peijianbo 516e2309c0 bug(authentication): 登录表单仅提交时加密（xpack）
4 years ago
peijianbo 4688e46f97 feat(authentication):将cas认证通过的登录日志记录到系统
4 years ago
peijianbo 1299f3da75 feat(authentication):登录表单仅提交时加密
4 years ago
Bai fe502cbe41 fix(assets): 修复系统用户导入模版没有密码字段的问题
4 years ago
xinwen 09bfac34f1 fix(orgs): 修复 org-memeber-relation POST 报错
4 years ago
Bai 80b9db417c feat(ldap): 获取ldap用户列表，采用线程方式
4 years ago
Bai d944b5f4ff feat(tickets): 工单添加comment字段
4 years ago
peijianbo 1b84afee0c feat(audits):修改日志默认保存时间（90->9999）
4 years ago
fit2bot 172b6edd28
feat(user):同一个账号仅允许在一台终端设备登录 (#4590)
4 years ago
Bai e6f248bfa0 feat(i18n): 添加云同步实例任务hostname_strategy字段翻译信息
4 years ago
ibuler 1f037b1933 feat(i18n): 添加新翻译
4 years ago
Bai ae9bbd2683 fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题
4 years ago
ibuler ddb71c43c4 fix(users): 修复用户在不同组织引起的问题
4 years ago
herealways 8227f44058 feat: 添加AES GCM模式为默认的加密方式
4 years ago
xinwen a28334b6d8 fix(orgs): 完善组织与用户变化时的信号
4 years ago
xinwen 15992ad5b3 fix(tickets): 修复工单comment
4 years ago
Bai 072c3155ca style(orgs): 修改组织删除失败翻译信息
4 years ago
fit2bot 9cb5985947
fix(orgs): 创建组织用户不必填 (#4515)
4 years ago
ibuler 0fd2f18240 fix(authentication): 修复登录时有时解密失败
4 years ago
xinwen 9ca8ab218c fix(authentication): 登录复核Not found
4 years ago
xinwen fcd8356e90 fix(users): 组织管理员，移除组织成员报错500 #231
4 years ago
xinwen 64d093e677 fix(users): 用户接口添加`org_roles`字段
4 years ago
xinwen 11493b9f3d fix(tickets): 修复申请资产工单不能关闭
4 years ago
xinwen 5a9c91d9dd fix(authentication): 组织成员禁用再激活，登录报错 #239
4 years ago
xinwen 25dcb9510c fix(audits): 修复超级审计员登录-日志审计-批量命令-单击主机列链接报错误信息 403
4 years ago
Bai a38a1868ca style(ticket): 修改工单状态翻译: Open:待处理;Closed:已完成 2
4 years ago
Bai bec9b97092 style(ticket): 修改工单状态翻译: Open:待处理;Closed:已完成
4 years ago
ibuler d5b9596e7d perf(config): 修改默认登录日志保存时间
4 years ago
xinwen af85d551ad fix(users): 修改用户角色显示名称
4 years ago
xinwen 0e0c9275bd fix(application): 远程应用`MySQL Workbench`添加`port`字段
4 years ago
xinwen 21b4a8600c fix(terminal): `Session` `can_join` 添加 `k8s`
4 years ago
xinwen 4cf5573c36 fix(users): 修复用户与用户组关系变化时没触发信号
4 years ago
xinwen 962ea67b84 refactor(authentication): 密码解密抽取成方法
4 years ago
xinwen 31720c9dcc feat(assets): 系统用户添加 `home` `system_groups` 字段
4 years ago
xinwen 54fe4835f6 fix(authentication): `SSO`登录添加 `next_url`
4 years ago
xinwen 91649a3908 feat(applications): 添加 k8s 应用
4 years ago
xinwen 0a242c3e81 fix(audis): 生成操作日志时间字段索引迁移脚本
4 years ago
huamaolin 25d1b3334f fix(OperateLog): 修复操作日志按时间查询慢
4 years ago
xinwen ffde306a04 fix(assets): 修复批量删除资产失败问题
4 years ago
xinwen f1e29a91f7 fix(users): 用户接口添加汇总角色字段
4 years ago
xinwen ec2b3b4cda fix(user): 调整`User`接口字段
4 years ago
xinwen 1a9d9e4145 feat(ticket): 申请资产工单添加`actions`字段
4 years ago
xinwen a14f121fad fix(orgs): 组织成员关系接口添加`role_display`字段
4 years ago
xinwen a25da8d479 feat(authentication): 超级管理员密码不能是`admin`
4 years ago
fit2bot 15fe7f810b
perf(url): 优化 /api/docs/? 都可以访问文档 (#4446)
4 years ago
xinwen f6a4253936 feat(ticket): 工单关闭生成 Comment
4 years ago
xinwen c3c5801d2e refactor(orgs): 重构组织与用户关系接口
4 years ago
ibuler 8ee7230ead fix(auth): 修复radius decode error的问题
4 years ago
xinwen 90f03dda62 feat(authentication): 类似腾讯企业邮单点登录功能
4 years ago
xinwen 2ed0927b18 fix(login): 用户登录堡垒机的时候偶尔会出现“密码解密失败”，导致无法正常登录。 #4408
4 years ago
xinwen e98235ca27 refactor(serializer): 设置 `BulkSerializerMixin` 的默认 `ListSerializer` 为 `AdaptedBulkListSerializer`
4 years ago
xinwen 1b052a8729 feat(terminal): 终端管理添加批量更新接口
4 years ago
xinwen 34b188bbe7 fix(csv): 修复`JMSCSVParser`调用`serializer`导致循环调用问题
4 years ago
xinwen f8e248f0af feat(ticket): 调整申请资产工单
4 years ago
xinwen b331730422 fix(users): 替换旧有角色常量
4 years ago
xinwen de3865fa1d refactor(orgs): 重构组织表结构
4 years ago
xinwen 1bc913ab13 feat(perms): 资产授权添加GUI复制粘贴动作
4 years ago
OrangeM21 2f11a70341 fix(authentication): 调整登录页面样式
4 years ago
xinwen c277aec561 feat(authenticaion): 添加登录页面验证码与MFA开关
4 years ago
ibuler 2a53a20808 perf(assets): 修改 系统用户 管理用户 等的用户名长度到128
4 years ago
Bai 674ad40f67 fix(perms): 修复perms api UserPermissionMixin 中 kwargs 参数传递（未发现引出其他问题）
4 years ago
github-actions 78089e01a3 fix(cas): 修复cas校验不同的问题
4 years ago
老广 5d08438dad
feat(ops): 项目启动时，清除指定的celery定时任务;添加获取celery定时任务的函数 (#4378)
4 years ago
Bai 3e541162e3 fix(authentication): 修复用户认证Radius认证中参数传递错误问题 *kwargs -> **kwargs
4 years ago
BaiJiangJie 0fca33d874
fix(radius): 修复radius认证失败问题 (#4342)
4 years ago
Bai bb60d2a1d9 fix(users): 组织管理员创建用户时，角色只能选择: 用户
4 years ago
xinwen 0014bd0cb9
fix(audits): 操作日志中的动作搜索条件，删除文件字段改成删除 (#4334)
4 years ago
xinwen 9488c8bd97
fix(cmd_filter): 命令过滤器唯一应该为 name + org_id (#4325)
4 years ago
Bai 1f30d459ae fix(command): 修复命令记录没有根据sesion进行过滤的问题
4 years ago
Bai 4e933fc1ca feat(session + db): 会话搜索添加登录来源选项
4 years ago
Bai c0f3a1f64a fix(all): 修复创建资源时，created_by字段长度限制导致创建失败的问题
4 years ago
Bai 0f70f5eccf fix(orgs): 删除组织失败时返回对应错误信息
4 years ago
Bai eef942c155 fix(gather_asset_users): 修复收集资产用户日志中用户名显示不完整的问题
4 years ago
xinwen 061592fa6b fix(terminal): 移除`CommandQueryMixin.get_filter_fields`
4 years ago
Bai ddcd4ebbfc fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock3
4 years ago
Bai 9550ea62fb fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock2
4 years ago
Bai abcb589658 fix(asset_user): 修改创建AuthBook对象锁机制，使用select_for_update替换redis_lock
4 years ago
Bai 1bb366ad94 fix(authbook): 修改创建AuthBook对象锁机制，解决并发操作堵塞问题
4 years ago
xinwen a5df7738f6 fix(audits): 日志审计模块 `Serializer` 添加 `org_id` 字段
4 years ago
xinwen da858c8998
fix(tickets): 隐藏申请资产工单URL (#4307)
4 years ago
BaiJiangJie 724a8f6324
fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题 (#4302)
4 years ago
ibuler 437df9a533 fix(assets): node asset 关系发生变化是，关联系统用户引起的问题
4 years ago
Bai 7c12f8f462 merge: Merge to dev from branch master
4 years ago
xinwen 6f5a92c21f [Update] assets/gathered_user 添加过滤字段
4 years ago
xinwen 17a76994dc [Update] 系统用户添加过滤字段
4 years ago
jym503558564 39d793bc47 fix:修改 ftp 日志按开始日期排序
4 years ago
xinwen c3eafbee8c [Fix] X-Pack/云管中心 i18n
4 years ago
xinwen 8eb6cfa9c9
fix(ticket): 修改工单获取系统用户的字段 (#4274)
4 years ago
xinwen f430c9e435
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
4 years ago
Bai a30c603bdc fix(user_group): 用户组中添加用户，取消审计员的限制
4 years ago
xinwen 39a75074af [Feature] 添加申请资产工单
4 years ago
Bai 8c7240193a fix(system_user): 修复系统用户测试可连接性失败问题（所有资产）（不应该执行校验系统用户是否可以推送的逻辑）
4 years ago
Bai b622aca9af fix(admin_user): 修复管理用户单独测试某台资产可连接性失败的情况（private_key_file)
4 years ago
Bai 69f49f7776 feat(i18n): 修改翻译
4 years ago
Bai fcd684e2db feat(assets): 资产序列类修改字段名 _name 为 _display
4 years ago
Bai 1c264399bb feat(domain + migrate): 修改网域唯一字段为：org_id + name
4 years ago
Bai 872e2546e9 feat(node): NodeModel添加方法get_or_create_child()
4 years ago
BaiJiangJie 8f347eee4d
Merge pull request #4216 from jumpserver/dev_org
4 years ago
Bai caf312c5be feat(Cloud): 组织管理ViewSet添加搜索字段
4 years ago
Bai ac6168a06c feat(Command execute): 批量命令执行配置添加默认值True
4 years ago
Bai b46e772d09 feat(login password ecrypt): 登录密码加密传输 4
4 years ago
Bai 183df82a75 feat(login password ecrypt): 登录密码加密传输 3
4 years ago
Bai 98c91d0f18 feat(login password ecrypt): 登录密码加密传输（添加翻译）
4 years ago
Bai e17d875206 feat(login password ecrypt): 登录密码加密传输2
4 years ago
Bai 4b1e84ed8a Merge branch 'dev' into dev_login_password_encrypt
4 years ago
Bai 71ee33e3be feat(login password ecrypt): 登录密码加密传输
4 years ago
xinwen 2b6e818943 [Update] 限制上传CSV文件的大小
4 years ago
BaiJiangJie 89496baae5
Merge pull request #4148 from jumpserver/v2.0
4 years ago
Bai cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条
4 years ago
xinwen 6e3369c944 [Update] sftp log页面操作翻译
5 years ago
Bai c0a153d13a [Update] UserProfileAPI 判断是否设置session过期时间，解决前端关闭浏览器session未失效的问题
5 years ago
xinwen 32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5
5 years ago
xinwen 3e993fd044 [Update] 调整`MFA`绑定策略 V2
5 years ago
xinwen 005573b53b [Fix] 重新绑定 MFA 的漏洞
5 years ago
BaiJiangJie c4bd093fd7
Merge pull request #4126 from jumpserver/v2.0
5 years ago
Michael Bai f1e5c7c2bb 添加改密计划安全模式配置项
5 years ago
Michael Bai fcb0aefe3c 更改改密计划安全模式配置项名
5 years ago
Bai 29666cc8d3 [Update] 添加改密计划安全模式配置项
5 years ago
xinwen 1d640eccf6
[Fix] `/opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list)` (#4121)
5 years ago
Bai 64064cb526 [Update] 注释节点树print
5 years ago
Eric_Lee 46941037dd
add SECURITY_COMMAND_EXECUTION (#4114)
5 years ago
xinwen 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)
5 years ago
ibuler 220ccda04d fix: 修改domain创建的assets不是必填的
5 years ago
Eric_Lee 6d30fe797c
fix ldap test bug (#4110)
5 years ago
xinwen 3318df1771
[Fix] 日志审计/FTP日志 (#4109)
5 years ago
Eric_Lee 0ccd806eca
add system user perm api (#4108)
5 years ago
xinwen 7ebe1c2916
[Update] 优化 dynamic settings (#4107)
5 years ago
ibuler 08904c2a9f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 19e34270d1 feat: gather user添加搜索字段
5 years ago
Bai afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai bcba408517 [Update] 修改用户source默认local
5 years ago
ibuler 80d94074e7 feat: 修改资产的标签搜索
5 years ago
ibuler 9347405f08 feat: terminal增加搜索
5 years ago
ibuler da4ad11a69 fix: 修改session command 翻译
5 years ago
ibuler b81e424e80 fix: 修改翻译
5 years ago
ibuler 1f15937139 feat: 修改翻译，添加settings
5 years ago
Bai f4fa011714 [Update] 修改mfa校验code无效翻译
5 years ago
xinwen c5a9a85818
[Update] 完善 作业中心/任务列表 (#4105)
5 years ago
ibuler e23bfa0f69 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 451690fe8b fix: 修改重定向
5 years ago
Eric_Lee 5bea782b9f
add assignee field for ticket (#4104)
5 years ago
Bai f26f7ca1e7 [Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常
5 years ago
Bai 927ca162d0 [Update] 修改MFA应用下载图片
5 years ago
Bai 583d295fd1 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai b51af1f7d7 [Update] 修改MFA应用下载图片
5 years ago
xinwen edcf9921fe
[Update] apps/assets/serializers/system_user.py (#4102)
5 years ago
Eric_Lee eef172d0e2
Merge pull request #4098 from jumpserver/fix-ops-adhoc
5 years ago
Eric_Lee 5b407fe8bc
Merge pull request #4095 from jumpserver/update-user
5 years ago
Bai 1bb9048910 [Update] 标签序列类assets字段required为False
5 years ago
xinwen 787cdbcadf [Fix] ops.models.adhoc (#4096)
5 years ago
xinwen b14ca14120
[Fix] ops.models.adhoc (#4096)
5 years ago
ibuler 4b2fd0d0da fix: 修复系统用户过滤权限规则的bug
5 years ago
xinwen 3393f18399 [Update] 修改 用户相关 Serializer
5 years ago
ibuler 7e1a379e47 feat: 修改org返回的数据结构
5 years ago
ibuler 213fdd461b fix: 修改翻译
5 years ago
ibuler 148c7ffb43 fix: 添加注释
5 years ago
ibuler 75be45ce43 feat: 使用新的对称加密方式: aes
5 years ago
ibuler 04eb670ada Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 66f3706142 feat: 添加aes fix: 修改时区的bug
5 years ago
xinwen 9ea98bf2b2
[Feature] 添加 会话管理/历史会话/下载 api (#4093)
5 years ago
ibuler 4695f80172 faet: 修改翻译
5 years ago
ibuler 0452d53c3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler ec30ef1f8b feat: readme添加版本说明
5 years ago
Eric_Lee 1c0ad08d80
fix ldap test i18n msg (#4092)
5 years ago
ibuler e1ab453780 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 1a6597b572 feat: 修改command filter数据结构
5 years ago
xinwen 865522953a
[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090)
5 years ago
ibuler 4d4a107101 feat: 修改oid获取顺序，添加从cookie中获取
5 years ago
ibuler 82f70cb0dc feat: ticket添加翻译
5 years ago
ibuler 820186c6d0 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 4468e2d379 feat: 限制gateway 仅有ssh协议
5 years ago
Eric_Lee bd802e6a50
add logo urls (#4088)
5 years ago
ibuler 9362c272cb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler ee4534ac4b feat: public setting添加key
5 years ago
xinwen 7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings (#4086)
5 years ago
ibuler 31daaed4cd feat: 添加auth confirm 到public setting
5 years ago
ibuler 71202e83f5 feat: 修改用户的api
5 years ago
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用
5 years ago
ibuler 076b7babcb 修改批量命令的api
5 years ago
ibuler 8569910658 feat: command exexution audit log的搜索
5 years ago
xinwen 34c556d375
[Fix] spm (#4082)
5 years ago
ibuler a43d6ad34d feat: 资产添加admin_user_display
5 years ago
ibuler ca6825008b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 9c6f118dbd feat: 添加批量命令的relation
5 years ago
Bai 5730e60089 [Update] 修改用户profile序列类
5 years ago
Bai afc7f3bb9c [Update] 修改用户public_key生成密钥的view
5 years ago
Bai c411b0a38e Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai 403b6fc563 [Update] 修改用户更新Public_key的条件判断
5 years ago