github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,412 Commits
68 Branches
246 Tags
108 MiB
Commit Graph

111 Commits (1b1c91bab01f1f874c5a76541aa55f44b4c8502b)

Author SHA1 Message Date
ibuler 3336f2ba67 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 15:28:32 +08:00
ibuler 795e952dc1 perf: change tree api 2022-12-27 13:20:18 +08:00
Bai ed35ac2930 perf: 修改 OPTION 获取字段 org_id label 为 Organization ID 2022-12-26 19:32:07 +08:00
Bai d0f70f4316 perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID 2022-12-26 19:16:11 +08:00
ibuler 0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
feng ec462e09e0 fix: action 2022-11-16 19:35:16 +08:00
Jiangjie.Bai 21d24ae4bc fix: 修复创建授权规则时不包含actions报错的问题 2022-11-16 16:23:39 +08:00
Jiangjie.Bai 582a8e0c52 fix: 修改 BitChoicesField to_representation swagger 调用报错的问题 2022-11-15 14:59:22 +08:00
jiangweidong 6411642ced perf: 优化操作日志一些内容 2022-11-14 09:50:42 +08:00
ibuler 9c5b3a03c6 pref: 优化 permission actionss 2022-11-11 17:28:13 +08:00
ibuler f6e403fd8b pref: 修改 asset permission 2022-11-11 15:04:31 +08:00
jiangweidong 2029e9f8df
feat: 重构操作日志 (#8941) 
* feat：重构操作日志模块

* feat: 改密计划增加操作日志记录

* feat: 支持操作日志接入ES，且接口limit支持自定义限制大小

* feat：翻译

* feat: 生成迁移文件

* feat: 优化迁移文件

* feat: 优化多对多日志记录

* feat: 命令存储ES部分和日志存储ES部分代码优化

* feat: 优化敏感字段脱敏

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-11-04 14:22:38 +08:00
ibuler b0ae9b47ca pref: 修改 applet host 2022-11-03 16:55:38 +08:00
ibuler 23e44c49b5 pref: 修改 applet deployments 2022-11-02 19:07:07 +08:00
Aaron3S 64e03a4412 feat: 增加异步任务api 2022-10-24 20:14:18 +08:00
ibuler d6e36c873d pref: 修改 filter 2022-10-19 10:21:05 +08:00
ibuler 9b44ed55c2 pref: 修改 secret encrypt 2022-10-18 20:37:17 +08:00
ibuler 9a0bae5bfd perf: 修改 ansible 执行 2022-10-10 16:56:32 +08:00
ibuler 6ed3b51928 perf: 优化 serailizer 统一到 drf 目录中 2022-09-26 10:43:18 +08:00
ibuler 234acd6317 perf: 修改 accounts 2022-09-23 18:59:19 +08:00
feng626 615f36c6f6 perf: 收集账号 2022-09-20 16:18:23 +08:00
ibuler 3e794ec41a perf: 修改 serializer 2022-09-13 10:41:49 +08:00
ibuler 984b8dfb28 perf: 修改 m2m 日志记录 2022-09-06 13:27:47 +08:00
ibuler 7ae395f7e8 perf: 修改 metadata 2022-09-01 21:00:04 +08:00
ibuler d7d9fe2718 perf: 修改 model 2022-09-01 14:46:31 +08:00
ibuler 2ede152663 Merge remote-tracking branch 'origin/v3' into v3 
# Conflicts:
#	apps/assets/api/platform.py
 2022-08-31 11:55:30 +08:00
feng626 60eb385c1e 账号过滤 2022-08-31 11:42:20 +08:00
ibuler 728dc43b6c perf: 修改 fields 支持 display choices 2022-08-31 10:06:16 +08:00
ibuler c950508873 Merge remote-tracking branch 'origin/v3' into v3 2022-08-29 20:11:21 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
ibuler a0b6849ccb perf: 优化 platform 2022-08-29 15:50:25 +08:00
ibuler 05f913ab18 perf: 修改 platform 2022-08-18 17:58:59 +08:00
Jiangjie.Bai 9a4b32cb3c perf: 优化 metadata 类型添加 float 2022-08-15 16:08:56 +08:00
ibuler 1ca0bdf843 perf: 修改 category 2022-08-09 16:53:43 +08:00
ibuler 87df92ea92 perf: 修改脚本 2022-08-08 14:34:57 +08:00
ibuler 93a89509d6 perf: merge with dev 2022-07-17 14:28:55 +08:00
Jiangjie.Bai 011e9ffec4 fix: 修复导入导出文件时对于bool类型字段的判断问题 2022-06-30 18:28:07 +08:00
fit2bot 0c71190337
fix: 修改 EncryptedField 字段的 write_only 属性 (#8259) 
* fix: 修改 EncryptedField 字段的 write_only 属性

fix: 修改 EncryptedField 字段的 write_only 属性

* fix: 修改 EncryptedField 字段的 write_only 属性

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-17 21:12:59 +08:00
ibuler 7eec50804c perf: 优化 encrypted field 2022-05-17 20:04:46 +08:00
ibuler 475678e29b fix: 修复密码 write only 2022-05-16 12:19:52 +08:00
fit2bot aff5b0035d
perf: 优化加密 (#8206) 
* perf: 优化加密

* perf: 优化加密

* perf: 优化加密传输

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-10 17:28:10 +08:00
fit2bot 031077c298
perf: password 等使用 rsa 加密传输 (#8188) 
* perf: 修改 model fields 路径

* stash it

* pref: 统一加密方式，密码字段采用 rsa 加密

* pref: 临时密码使用 rsa

* perf: 去掉 debug msg

* perf: 去掉 Debug

* perf: 去掉 debug

* perf: 抽出来

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-07 16:20:12 +08:00
ibuler 7025d46070 perf: 控制平台创建 2022-05-02 21:37:42 +08:00
ibuler 69f3c85195 perf: 添加 category api 2022-04-28 22:54:18 +08:00
ibuler 3de881fa19 perf: 打算重构 asset application 2022-04-02 18:35:46 +08:00
Jiangjie.Bai aa9ae14e46 fix: 修复view action获取 2022-03-16 18:33:55 +08:00
feng626 3a26b9d102 fix: 修复工单相应bug 2022-03-16 17:40:51 +08:00
ibuler d5c9ec1c3d perf: 优化位置 2021-10-21 17:39:28 +08:00
ibuler 8c3ab31e4e fix: 修复由于修改filter引起的问题 2021-09-27 18:50:29 +08:00