github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8608 Commits
69 Branches
245 Tags
132 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '37a52c420f'
${ noResults }
Commit Graph

697 Commits (37a52c420f5db8ec192c85221c47b66ad9f9c54a)

Author SHA1 Message Date
xinwen 16fae00e0e feat: xrdp 远程应用
3 years ago
feng626 adb9f01231 feat: 密码计划邮件提醒
3 years ago
xinwen 24bbe7c31f fix: 计算docker limit 内存使用率时区分 cgroup v1 v2
3 years ago
xinwen 36c6299a03 fix: redis 锁在redis集群环境报错
3 years ago
ibuler c85249be36 perf: 优化订阅处理，形成框架
3 years ago
xinwen a313e011ef perf: 内存使用率兼顾 docker cgroup limit
3 years ago
xinwen d94c515cfc fix: 验证码逻辑错误
3 years ago
fit2bot d2df8acd84
fix: 修复数据库连接没有关闭问题 (#7227)
3 years ago
fit2bot 17303c0550
pref: 优化MFA (#7153)
3 years ago
Jiangjie.Bai 07c60ca75d
feat: 支持二级登录资产 (#7143)
3 years ago
ibuler d484885762 perf: 修复ansible stdout 中非utf8的问题
3 years ago
xinwen 631f802961 fix: 钉钉报错的时取得字段不对
3 years ago
fit2bot f88e5de3c1
perf: 优化用户创建邮件 (#7072)
3 years ago
feng626 25d1b71448 fix: 修复分时登陆bug
3 years ago
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061)
3 years ago
feng626 dc13134b7b fix: 修复acl 选择时间段为空bug
3 years ago
ibuler 25ea3ba01d perf: 修改sdk位置
3 years ago
ibuler 072865f3e5 perf: 优化修改 sdk 位置
3 years ago
ibuler d5c9ec1c3d perf: 优化位置
3 years ago
ibuler 487c945d1d perf: 修改代码位置，用户sugestion增加到6个
3 years ago
fit2bot 00d434ceea
perf: 优化消息通知 (#7024)
3 years ago
fit2bot 9acfd461b4
feat: user login acl (#6963)
3 years ago
fit2bot 63638ed1ce
feat: 首页的 chanlege 和 MFA 统一 (#6989)
3 years ago
fit2bot fa68389028
perf: 去掉单独的flash msg (#7013)
3 years ago
halo 63b338085a feat: 修改username校验，telnet协议支持输入中文
3 years ago
ibuler 0207fe60c5 perf: 修改ip城市获取算法
3 years ago
xinwen.xu d4bdc74bd8 feat: 授权过期通知
3 years ago
jiangweidong 2f25e2b24c fix: 系统用户认证方式从托管密码更新到手动输入模式后，不填写用户名报错
3 years ago
ibuler 8c3ab31e4e fix: 修复由于修改filter引起的问题
3 years ago
Jiangjie.Bai 476e6cdc2f
Merge pull request #6932 from jumpserver/pr@dev@perf_remove_djangopo
3 years ago
ibuler 0b593f4555 perf: 优化drf filter, 修改terminal filter
3 years ago
ibuler b415ee051d perf: 去掉django.po
3 years ago
fit2bot 43f30b37da
fix: 用户手机号没有校验 (#6875)
3 years ago
xinwen bf68ddf09e fix: 腾讯短信检测是否发送成功
3 years ago
fit2bot 7a45f4d129
perf: 优化短信 (#6826)
3 years ago
feng626 f64740c2db fix: 修改翻译及建议接口
3 years ago
feng626 ea4dccbab8 fix: 修复工单bug
3 years ago
ibuler 817c02c667 fix: 修复is_app bug
3 years ago
xinwen 3e737c8cb8 fix: 修复短信问题
3 years ago
xinwen 654ec4970e 更改设置接口
3 years ago
Michael Bai 42c3c85863 fix: 修改翻译
3 years ago
xinwen b1fceca8a6 feat: 添加短信服务和用户消息通知
3 years ago
fit2cloud-jiangweidong 905014d441
feat: 改密计划支持数据库改密 (#6709)
3 years ago
fit2bot 0f87f05b3f
feat: 工单多级审批 + 模版创建 (#6640)
3 years ago
xinwen 21a7ec9fec fix: 升级时清空缓存
3 years ago
Bai aa37d86959 fix: 将flower放到web服务中；修复账号列表过滤节点的逻辑，获取所有子节点。
3 years ago
ibuler f390556a87 perf: 优化spm请求的问题
3 years ago
Bai 0c8c926aac fix: 修复校验用户登录规则的API权限
3 years ago
ibuler 1605a57df6 perf: 修复应用账号选择部分导出问题
3 years ago
fit2bot 54751a715c
feat: 添加 飞书 (#6602)
3 years ago
Bai 33236aaa47 fix: 修复启动脚本beat进程偶尔不会结束的问题
3 years ago
Bai 7959f84bba fix: 修改启动脚本
3 years ago
fit2bot 39ce60c93a
feat: 系统监控添加 Core/Celery Terminal; 修改检测终端状态逻辑; (#6570)
3 years ago
xinwen 4085df913b feat: 记录网关可连接性
3 years ago
fit2bot 66b0173e20
feat: 服务性能告警指标包含：Core服务和各组件状态；指标包括：cpu/disk/memory/is_alive (#6564)
3 years ago
fit2bot 905d0d5131
perf: 统一应用树 (#6535)
3 years ago
Bai 689bd093be 云管中心同步任务支持设置同步IP网段和协议组（修改特权用户文案）
3 years ago
ibuler f772296dff fix(assets): 修复patch system user的问题
3 years ago
fit2bot ec8dca90d6
refactor: 整合系统用户和管理用户 (#6236)
3 years ago
Bai 4fd7f0e949 fix: 修复自动生成系统用户密码中包含 {{ 双字符时测试可连接性失败的问题
3 years ago
fghbng@qq.com 35941ddf7f feat: 优化缓存，将会话的缓存拿出来
3 years ago
健健 94fc1fb53b
fix: 导入数据解析 title 时，没有过滤 read only 字段 (#6269)
3 years ago
xinwen a9bdbcf7c6 fix: metadata api view 报错
4 years ago
xinwen a809eac2b8 fix: 修复获取 Metadata 时，获取的总是 action 为 metadata
4 years ago
Michael Bai 572d0e3f27 fix: 修复parser没有处理int类型数据的问题
4 years ago
xinwen 3743761024 fix: 修复绑定企业微信&钉钉的一些问题
4 years ago
ibuler 726fd94f65 fix: 修复 xslx 提交数字类型报错
4 years ago
Bai 0ecd9fa32a fix: 修复自动生成公钥优先使用dss格式的问题(默认优先使用rsa)
4 years ago
xinwen c16319ec48 feat: 添加企业微信，钉钉扫码登录
4 years ago
ibuler 4d6d4cbc22 perf: 优化登录，cas, openid 自动登录
4 years ago
ibuler d1a005f750 perf: 优化MFA verify requierd
4 years ago
xinwen 99cce185dd fix: 添加启动失效缓存
4 years ago
xinwen 7e4f20f443 refactor: 移动 PermissionsMixin 位置
4 years ago
fit2bot 32fe8f674c
perf: csv upload (#5894)
4 years ago
ibuler 7dfd0ee8fe fix(orgs): 修复访问 current org api 错误
4 years ago
Jiangjie.Bai 64641a18e6
feat: ACL (#5696)
4 years ago
xinwen 184e8b31e6 perf: 优化下 `orgid_nodekey_assetsid_mapping`
4 years ago
xinwen c4eacbabc6 refactor: 重构缓存框架
4 years ago
xinwen ccb0509d85 feat: 批量导入解析为Json的接口添加 `title` 字段
4 years ago
xinwen 886393c539 feat: 添加批量导入时将其他格式(csv, excel)解析为Json的接口
4 years ago
fit2bot 0aa2c2016f
perf(project): 优化命名的风格 (#5693)
4 years ago
xinwen 3e7e01418d perf: 优化命令记录慢的问题
4 years ago
xinwen 09bdff4a67 fix: 缓存框架 expire_fields 可能报错
4 years ago
fit2bot f548b4bd2b
feat: serializer 添加默认值，前端可以调用 (#5666)
4 years ago
fit2bot a56ac7b34e
perf(orgs): 默认组织改为实体组织，并支持全局组织 (#5617)
4 years ago
fit2bot 6f3ead3c42
perf: 优化系统用户生成密码的复杂度 (#5648)
4 years ago
xinwen 1036d1c132 fix: 修复授权树一些问题
4 years ago
ibuler 5de5fa2e96 fix: 修复获取不到 org 的问题
4 years ago
fit2bot a7ab7da61c
feat: 添加限制用户只能从source登录的功能 (#5592)
4 years ago
xinwen d795867916 perf: 优化批量更新会查询全部数据的问题
4 years ago
xinwen 799d1e4043 feat: 资产授权规则添加是否有效的过滤条件
4 years ago
ibuler b03642847e perf: 去掉 data_tree
4 years ago
xinwen 83cc339d4b refactor: 调整组织统计数据缓存的更新策略为懒更新模式
4 years ago
xinwen 9be3cbb936 perf: 优化用户详情页授权列表加载速度&添加可重入锁
4 years ago
fit2bot 501ad698b7
添加 UnionQuertSet (#5578)
4 years ago
Jiangjie.Bai 7cf6e54f01
refactor tree (重构&优化资产树/用户授权树加载速度) (#5548) (#5549)
4 years ago
ibuler 93474766f6 perf(permission): 优化权限控制，显式的声明权限
4 years ago
fit2bot d363118911
perf(settings): 优化settings配置 (#5515)
4 years ago
Bai efb9f48c6f perf: 删除`pycryptodome`依赖包安装(因为`pycryptodome`和`pycrypto`安装包目录冲突);只安装 `pycryptodomex`依赖包; 修改 `from crypto` 为 `from cryptodome`
4 years ago
Bai 31f098449f perf: 修改 OPTION 获取 choices 字段选项; 修改display字段翻译 (显示名称)
4 years ago
xinwen e61511372c fix: 修复缓存框架组织切换问题&组织的 resource_statistics 字段是只读
4 years ago
fit2bot a7fa2331bd
feat: 添加缓存模块，添加组织资源统计 (#5407)
4 years ago
ibuler 64257823c5 pref(common): 优化drf options的filterset 可能引起的问题
4 years ago
fit2bot a7468a243d
perf: 重构工单处理流程 (#5408)
4 years ago
fit2bot 86a055638c
reactor: 重构命令&录像存储模块的Serializer及相关模块 (#5392)
4 years ago
Bai dbe969b064 perf: 解决MethodSerializer被swagger调用时parent.Serializer会互相影响所需字段显示的问题
4 years ago
ibuler e7a3c5a822 perf(api): filter_fields被filterset_fields取代
4 years ago
老广 7eedc0635e
Merge pull request #5362 from jumpserver/pr@dev@fix_adhoc_excution
4 years ago
xinwen f5fd40978e fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
4 years ago
老广 5b5c33116a
Merge pull request #5350 from hctech/dev
4 years ago
fit2bot 7167515a53
feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (#5382)
4 years ago
fit2bot 17a01a12db
reactor: 增加DynamicMappingSerializer类，实现Serializer中的字段可以动态改变的功能 (#5379)
4 years ago
Bai 3188692691 perf: 修改swagger问题
4 years ago
fit2bot 7e7e24f51f
reactor&remove: 重构applications模块 & 移除applications、perms中已不再使用的模块 (#5374)
4 years ago
fit2bot cef93abb2f
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
4 years ago
Bai 5c483084b7 feat: 优化工单模块
4 years ago
Bai 1a9a5c28f5 feat: 优化工单模块1
4 years ago
Jiangjie.Bai 3b056ff953
reactor&feat: 重构工单模块 & 支持申请应用工单 (#5352)
4 years ago
huangchao 795d1b59e0 fix:资产自动推送UUIDD数组格式化字符串失败
4 years ago
Bai b79e6799c4 fix: 修复资产导入携带disk_info信息时失败的问题
4 years ago
xinwen 4f5f92deb8 fix: 批量删除管理用户报错信息太丑
4 years ago
Bai a3a591da4b fix: 修复命令导出excel格式报错
4 years ago
Bai deedd49dc5 fix: 修复命令记录导出excel文件格式未定义的问题
4 years ago
fit2bot 5863e3e008
perf(asset): 资产树，右击增加计算节点数量的菜单，可以让后台去计算 #527 (#5207)
4 years ago
fit2bot 43b5e97b95
feat(excel): 添加Excel导入/导出 (#5124)
4 years ago
fit2bot 662c9092dc
reactor(dockerfile): 使用debian构建docker (#5169)
4 years ago
ibuler bf3056abc4 fix(django3): 修复django3兼容问题
4 years ago
fit2bot 6d39a51c36
[fix]: 兼容django 3 (#5038)
4 years ago
fit2bot 9af4d5f76f
fix(crypto): 有时解密失败 (#5003)
4 years ago
peijianbo 79b5aa68c8 feat(terminal):危险命令告警功能
4 years ago
xinwen e93be8f828 feat(crypto): 支持国密算法
4 years ago
xinwen 231332585d fix(perms): 重建授权树冲突时，响应里加 code
4 years ago
ibuler 4ebb4d1b6d chore: resolve conflict
4 years ago
ibuler ba4e6e9a9f refacter: 重构application
4 years ago
ibuler dd793a4eca perf: 优化日志保存策略
4 years ago
xinwen f7e6c14bc5 fix(assets): 向资产推送系统用户bug
4 years ago
xinwen f6031d6f5d fix(logger): 把 drf 异常放到单独的日志文件中
4 years ago
xinwen e2f540a1f4 fix(assets): 网关的密码不能包含特殊字符
4 years ago
Bai 3ccf32ed48 feat(authentication): 用户重置密码成功后，发送用户重置密码成功邮件
4 years ago
xinwen 6701a1b604 fix(perms): 用户添加到用户组报错
4 years ago
xinwen 28da819735 perf(assets): 优化节点树
4 years ago
Bai e4aafc236d fix(command): 修复命令导出选中项问题
4 years ago
Bai 95aa9781c3 fix(command): 修复命令导出选中项会导出全部的问题
4 years ago
Bai ae9bbd2683 fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题
4 years ago
herealways 8227f44058 feat: 添加AES GCM模式为默认的加密方式
4 years ago
fit2bot 9cb5985947
fix(orgs): 创建组织用户不必填 (#4515)
4 years ago
xinwen 11493b9f3d fix(tickets): 修复申请资产工单不能关闭
4 years ago
xinwen a25da8d479 feat(authentication): 超级管理员密码不能是`admin`
4 years ago
xinwen f6a4253936 feat(ticket): 工单关闭生成 Comment
4 years ago
xinwen c3c5801d2e refactor(orgs): 重构组织与用户关系接口
4 years ago
xinwen 90f03dda62 feat(authentication): 类似腾讯企业邮单点登录功能
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 de3865fa1d refactor(orgs): 重构组织表结构
4 years ago
Bai 7c12f8f462 merge: Merge to dev from branch master
4 years ago
xinwen 39a75074af [Feature] 添加申请资产工单
4 years ago
xinwen 2b6e818943 [Update] 限制上传CSV文件的大小
4 years ago
Bai cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条
4 years ago
xinwen 32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5
4 years ago
xinwen 3e993fd044 [Update] 调整`MFA`绑定策略 V2
4 years ago
xinwen 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)
5 years ago
Bai f26f7ca1e7 [Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常
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 1a6597b572 feat: 修改command filter数据结构
5 years ago
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用
5 years ago
xinwen 34c556d375
[Fix] spm (#4082)
5 years ago
ibuler 9c6f118dbd feat: 添加批量命令的relation
5 years ago
ibuler ad1c17aa7b feat: 仅支持fields_size=mini,small
5 years ago
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040)
5 years ago
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改
5 years ago
ibuler 3320e6105c [Update] 删掉没用的内容
5 years ago
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler 1540cbdcaa [Update] 修改csv render
5 years ago
xinwen e339ed1fb3 [Add] audits apis
5 years ago
老广 962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis
5 years ago
xuxinwen f4eca83a49 [feature] 添加 login-logs API
5 years ago
ibuler b6f5b335bd Merge branch 'api_perf' into lina
5 years ago
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efb5d4135a [Update] 优化api字段显示
5 years ago
BaiJiangJie e9fe5b3004
Merge pull request #3908 from jumpserver/dev
5 years ago
ibuler 3648a1458b [Update] 修改command options get view filter
5 years ago
ibuler 0d2b4d7ca3 [Update] 添加ids filter
5 years ago
Bai d1d73da322 [Update] Merge from dev
5 years ago
ibuler e7031d0ac1 [Update] 修改serailizer mixin
5 years ago
Bai ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error
5 years ago
Bai e9103ee608 [Update] 对自定义MetaDict字段值进行strip
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
老广 3c69860b24
[Update] 优化sql, or方式改为union (#3682)
5 years ago
Bai 2827a64095 [Update] 更新命令批量执行资产树（将没有ssh协议的资产设置为nocheck）
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago
BaiJiangJie b4498f2267
[Update] 修改 RemoteApp 前端 Form 渲染逻辑 (#3523)
5 years ago
BaiJiangJie 16864ca34e
[Update] 用户列表添加移除操作（在其他组织中） (#3513)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
ibuler e424315d93 [Update] 修改用户列表serializer
5 years ago
ibuler 4c801bb828 [Update] 修改用户列表
5 years ago
ibuler bf40aa8df0 [Update] 修改user list api
5 years ago
ibuler 6ce9815d51 [Update] 基本完成登录逻辑
5 years ago
BaiJiangJie 84b3e29db6
Merge pull request #3366 from jumpserver/bugfix
5 years ago
ibuler 6ebe8e16bd [Update] 修改读取日志时可能解码失败
5 years ago
BaiJiangJie a6531fedb5 [Bugfix] 修复 TreeNode bug
5 years ago
BaiJiangJie e5250294b0 Dev export (#3355)
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
老广 cff009e758
Support ws (#3291)
5 years ago
老广 c75fd3c108
Bugfix (#3286)
5 years ago
老广 118fc8c42f
Dev beta (#3281)
5 years ago
ibuler 847e37e641 [Update] 修改一些bug
5 years ago
ibuler b7021b5ecb [Update] 支持收集资产上的用户
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
老广 1457281b73
Bugfix (#3232)
5 years ago
BaiJiangJie 4797f99f60 [Bugfix] 修复用户认证序列类获取 request 的问题
5 years ago
八千流 a2376d3afd 超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
5 years ago
ibuler ec0bdcce9e [Update] 修改id cache api mixin
5 years ago
ibuler a8ac99f642 [Update] 修改asset modal table
5 years ago
ibuler 8ddda8e5af [Update] 修复页面bug和popover的问题
5 years ago
老广 dbb441dfb6
Perm cache (#3211)
5 years ago
BaiJiangJie 1eb2038ec4 [Bugfix] 解决批量创建系统用户等资源时，initial_data.get() 失败的问题
5 years ago
老广 de43980ee2
Dev beta2 (#3177)
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
BaiJiangJie 48826a9ad9
[Update] 优化切换组织时重定向页面逻辑 (#3133)
5 years ago
ibuler 8fb0d6315d [Update] 修改导入bug
5 years ago
ibuler fdef282c57 [Bugfix] 修复批量更新用户的bug, 导出字段添加 *
5 years ago
ibuler fbfbfcc274 [Update] 修复磁盘显示单位问题
5 years ago
BaiJiangJie 4254775149
Bugfix (#3065)
5 years ago
BaiJiangJie c929c1a87e [Bugfix] 解决下载导入模版时KeyError的问题（数据为空时） (#3017)
5 years ago
老广 55b049c86a
Bugfix (#2938)
5 years ago
BaiJiangJie 5f9f970abd
Perf (#2929)
5 years ago
老广 58875d9a95
Bugfix (#2831)
5 years ago
ibuler 1472f0437f [update] 修改一些性能问题
5 years ago
ibuler 2d07eeb16b [Update] 修改去掉一些print
5 years ago
ibuler 1448d23ca6 [Update] 准备优化 asset user
5 years ago
ibuler c3a54a8927 [Update] 修改session
5 years ago
ibuler 5f6af8c07d [Update] 修改command列表
5 years ago
ibuler b9f82fd0ac [Update] 优化命令记录列表
5 years ago
ibuler 7bf1555c67 [Update] 修改Minxs
5 years ago
ibuler 31d2f2a799 [Update] 去掉原来批量的view
5 years ago
八千流 768cfc7561 [Bugfix] 修复用户无权限执行批量命令却可直接访问批量执行页面的bug (#2857)
5 years ago
ibuler 8e9b3f134b [Update] 修改permission actions
5 years ago
ibuler 1a0ff422fe [Update] 优化树结构
5 years ago
ibuler 6d96b5dbaf [Update] 修改org mixin
5 years ago
ibuler e8ebc94191 [Update] 修改assets users api
5 years ago
ibuler 824ba433f6 [Update] 修改表结构
6 years ago
ibuler 327febaf59 [Update] 更改查看认证需要的MFA时间间隔
6 years ago