github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,755 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

1486 Commits (8f9eb64c8df124689bee4585428847303eea7708)

Author SHA1 Message Date
Jiangjie.Bai 572f03d844 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-15 10:47:05 +08:00
Jiangjie.Bai d23446016d refactor: 添加授权相关的获取资产账号API、Model method 2022-09-15 10:46:57 +08:00
ibuler 37bbf75f66 perf: 修改数据库迁移文件 2022-09-14 20:55:14 +08:00
ibuler ae189ebdfe perf: 修改 account serializer 2022-09-13 21:18:04 +08:00
ibuler 4fcbdfa3f4 perf: 优化 account 添加 name 2022-09-13 21:07:20 +08:00
ibuler 9a734e7069 perf: 修改结构 2022-09-13 14:06:25 +08:00
ibuler 3e794ec41a perf: 修改 serializer 2022-09-13 10:41:49 +08:00
ibuler 6bf7f7cb48 perf: 修改 migrations 2022-09-09 19:17:25 +08:00
ibuler 910eaf1228 perf: 修改 web 表结构 2022-09-09 19:07:45 +08:00
ibuler f6fdc258b1 perf: 修改 playbook 目录结构 2022-09-09 15:47:40 +08:00
ibuler 894f153638 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-09 11:00:18 +08:00
ibuler aed7b32d6c perf: 修改 assets api 2022-09-09 11:00:09 +08:00
ibuler 25bded69ab perf: 修改平台和资产 2022-09-08 20:31:04 +08:00
Jiangjie.Bai ca6b8ee960 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-08 10:43:29 +08:00
ibuler 706488d293 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-08 10:04:32 +08:00
ibuler 50cf40eaeb perf: 完美解决 accounts 创建 2022-09-07 20:24:48 +08:00
ibuler e9bb5223eb perf: 修改 platforms 2022-09-07 20:01:04 +08:00
feng626 b910180a12 自动化策略 表 2022-09-07 19:49:42 +08:00
Jiangjie.Bai 746c6e4242 fix: 修改资产、授权创建时的小问题 2022-09-07 18:33:34 +08:00
ibuler 56abf0da23 pref: 修改平台协议配置 2022-09-07 17:12:53 +08:00
ibuler 585ce6b46a perf: 修改表结构 2022-09-06 19:57:03 +08:00
ibuler 984b8dfb28 perf: 修改 m2m 日志记录 2022-09-06 13:27:47 +08:00
feng626 757e688ab3 账号备份优化 2022-09-04 16:33:36 +08:00
ibuler 7ae395f7e8 perf: 修改 metadata 2022-09-01 21:00:04 +08:00
ibuler 81219e1e7c pref: 添加各种 field 2022-09-01 17:42:48 +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 ffd08eef74 Merge remote-tracking branch 'origin/v3' into v3 2022-08-30 19:48:10 +08:00
feng626 d5c13df6be 补全资产api 2022-08-30 17:29:54 +08:00
ibuler 5c73cb9b4e perf: 修改 v3 2022-08-30 14:13:33 +08:00
ibuler 585f0c64cd perf: 修改 v3 2022-08-30 11:56:56 +08:00
ibuler 951d4e4e0d perf: 合并冲突 2022-08-30 10:07:03 +08:00
ibuler c950508873 Merge remote-tracking branch 'origin/v3' into v3 2022-08-29 20:11:21 +08:00
feng626 794ec39446 修复备份bug 2022-08-29 19:59:00 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
feng626 3e1c832964 账号备份 2022-08-29 19:49:45 +08:00
ibuler f35cef7abb perf: 修改校验方式 2022-08-29 16:19:37 +08:00
ibuler a0b6849ccb perf: 优化 platform 2022-08-29 15:50:25 +08:00
ibuler 5358f35c08 perf: 修改 host info 2022-08-29 10:49:53 +08:00
feng626 d441f04a6c Merge remote-tracking branch 'origin/v3' into v3 2022-08-24 16:39:25 +08:00
feng626 76390d013e 账号模版 2022-08-24 16:36:42 +08:00
ibuler 063c42b94d perf: 修改 terminal session 2022-08-24 16:14:32 +08:00
ibuler dca1388a67 perf: 修改依赖 2022-08-24 14:23:42 +08:00
ibuler cd8adc6d3d perf: 修改 migrations 2022-08-24 10:57:44 +08:00
ibuler 1e57a0eb1f perf: merge v3 2022-08-23 10:26:43 +08:00
ibuler ab46194039 perf: 修改 导入 2022-08-23 10:23:48 +08:00
feng626 97c6e2c0b2 修复migrate bug 2022-08-22 18:48:07 +08:00
ibuler 09607a1885 perf: 修改 perms 2022-08-22 18:32:33 +08:00
ibuler dd0b8e988c perf: stash it 2022-08-22 13:25:57 +08:00
feng626 a7d193464e 添加 choices 获取 label方法 2022-08-22 11:47:45 +08:00
feng626 fe4df4b179 fix: 修复swagger 2022-08-19 19:01:26 +08:00
ibuler 05f913ab18 perf: 修改 platform 2022-08-18 17:58:59 +08:00
ibuler a9bf4eddea perf: 修改 migrations 2022-08-18 13:02:10 +08:00
ibuler 2c3239e238 perf: 修改数据库 migrations 2022-08-18 11:15:17 +08:00
ibuler 8282a6869a perf: remove system users 2022-08-17 15:44:59 +08:00
ibuler 3f47e63080 perf: remove system user 2022-08-17 11:54:18 +08:00
ibuler 2948d5af7f perf: 删除一部分 system user 2022-08-16 16:34:16 +08:00
ibuler 85acd4b2ac perf: 修改 command filter 2022-08-16 11:09:30 +08:00
ibuler 31eadd3dc9 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 
t po v3# 以 '#' 开始的行将被忽略，而空的提交说明将终止提交。
 2022-08-15 18:45:56 +08:00
ibuler 0bf8878228 perf: 添加 token 2022-08-15 18:31:57 +08:00
feng626 a748f5d57d account template model 2022-08-11 17:39:44 +08:00
ibuler d402ba5d92 perf: 修改资产名称 2022-08-11 15:45:03 +08:00
feng626 cfa5de13ab feat: 节点树搜索 2022-08-11 14:08:45 +08:00
ibuler 497204d777 perf: account remove protocol 2022-08-11 14:05:45 +08:00
ibuler 9d4a828c53 perf: 修改平台 2022-08-10 19:27:08 +08:00
ibuler 1ca0bdf843 perf: 修改 category 2022-08-09 16:53:43 +08:00
ibuler 3011b18eaa perf: 干掉 applications 2022-08-09 15:42:06 +08:00
feng626 a7c82f94cc perf: 修复接口文档 修复迁移文件 2022-08-08 19:18:45 +08:00
ibuler 87df92ea92 perf: 修改脚本 2022-08-08 14:34:57 +08:00
ibuler 11d9a0e9cc perf: 支持嵌套创建 2022-08-08 11:39:55 +08:00
ibuler c0cb58c001 perf: 添加 tree api 2022-08-08 10:41:37 +08:00
ibuler 698ea3f2ea perf: 添加 category node view 2022-08-05 19:11:17 +08:00
ibuler 8dfb8eeb75 perf: 修改权限 2022-08-05 18:31:57 +08:00
ibuler 88d4bf932c perf: change asset 2022-08-05 16:17:45 +08:00
ibuler 196e38897f perf: 修改 protcols 2022-08-05 15:46:36 +08:00
ibuler 6c57db0897 stash it 2022-08-04 10:44:11 +08:00
ibuler d43acd8612 perf: v3 2022-08-03 16:21:34 +08:00
ibuler 65423ea893 perf: 优化migrations 2022-08-03 15:58:06 +08:00
Jiangjie.Bai 9ff345747b fix: 修复系统平台不能导入的问题 2022-08-02 14:55:32 +08:00
ibuler 109db8886b perf: 还原回 model 2022-07-28 19:27:42 +08:00
ibuler 0dc3d43ee5 perf: 修改系统用户 2022-07-28 19:12:27 +08:00
ibuler fb0fb71ea3 perf: 修改系统用户 2022-07-28 18:50:58 +08:00
ibuler 43d3791ddc stash 2022-07-27 16:51:39 +08:00
ibuler d176ccde4b perf: stash 2022-07-20 16:52:01 +08:00
feng626 626b6da9c4 fix cmd为空时bug 2022-07-20 13:43:04 +08:00
ibuler c9becca633 stash 2022-07-20 12:56:41 +08:00
ibuler b961d1f9ee perf: 修改 accounts 2022-07-18 11:12:21 +08:00
ibuler 93a89509d6 perf: merge with dev 2022-07-17 14:28:55 +08:00
halo e1b3851be3 perf: 优化资产节点搜索，查询全路径 2022-07-17 14:18:20 +08:00
ibuler fd94713583 Merge branch 'dev' into pr@dev@refactor_system_user_account 2022-07-17 14:17:18 +08:00
ibuler 8b188f020d perf: 修改备注 2022-07-17 14:17:16 +08:00
ibuler 008b18eced perf: 修改为账号模版 2022-07-17 13:57:13 +08:00
ibuler 0d46834fbf pref: 修改暂存 2022-07-15 18:57:52 +08:00
ibuler 29c9c6d680 perf: 优化 accounts 2022-07-15 18:03:32 +08:00
ibuler d3c67d2f04 perf: 暂存一下 2022-07-14 10:56:09 +08:00
fit2bot 4a3d7a8524
perf: history account model queryset (#8588) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 17:13:02 +08:00
ibuler dac0b44b99 perf: 优化重构 2022-07-13 16:36:49 +08:00
ibuler e89765a9ad refactor: 重构系统用户 2022-07-12 10:54:23 +08:00
fit2bot 27cbbfbc79
refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) (#8559) 
* refactor: 重构 Connection Token 模块 (完成 Model 设计和创建 Token 的API逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Token 详细信息的 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 RDP 文件 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Client url API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection token 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection)

* refactor: 重构 Connection Token 模块 (完善序列类字段)

* refactor: 重构 Connection Token 模块 (完善expire API)

* refactor: 重构 Connection Token 模块 (完善迁移文件)

* refactor: 重构 Connection Token 模块 (完善翻译文件)

* refactor: 重构 Connection Token 模块 (拆分Connection ViewSet)

* refactor: 重构 Connection Token 模块 (修改翻译)

* refactor: 重构 Connection Token 模块 （优化)

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-11 18:09:06 +08:00
fit2bot 0aad0b7279
feat: 账号历史信息 (#8500) 
* feat: 账号历史信息

* del app

Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 18:54:47 +08:00
fit2bot a6cc8a8b05
perf: 优化confirm接口 (#8451) 
* perf: 优化confirm接口

* perf: 修改 校验

* perf: 优化 confirm API 逻辑

* Delete django.po

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-07-04 11:29:39 +08:00
feng626 af2d927c1f perf: del pandas 2022-06-30 20:20:09 +08:00
fit2bot 067a90ff9a
fix: 修复工单数据库命令复合bug (#8511) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-30 11:17:12 +08:00
Jiangjie.Bai fd41fd78cf fix: 修改 private_key 的序列类长度为 16384 2022-06-24 19:24:21 +08:00
feng626 9388f37c39 fix: ticket bug 2022-06-23 18:35:53 +08:00
feng626 b264db3e7e fix: 修复工单迁移文件 2022-06-23 17:45:34 +08:00
fit2bot 7e2f81a418
perf: 重构 ticket (#8281) 
* perf: 重构 ticket

* perf: 优化 tickets

* perf: 暂存

* perf: 建立 ticket model

* perf: 暂存一下

* perf: 修改 tickets

* perf: 修改 import

* perf: 修改model

* perf: 暂存一波

* perf: 修改...

* del process_map field

* 工单重构

* 资产 应用对接前端

* perf: 修改 ticket

* fix: bug

* 修改迁移文件

* 添加其他api

* 去掉process_map

* perf: 优化去掉 signal

* perf: 修改这里

* 修改一点

* perf: 修改工单

* perf: 修改状态

* perf: 修改工单流转

* step 状态切换

* perf: 修改 ticket open

* perf: 修改流程

* perf: stash it

* 改又改

* stash it

* perf: stash

* stash

* migrate

* perf migrate

* 调整一下

* 修复bug

* 修改一点

* 修改一点

* 优化一波

* perf: ticket migrations

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-06-23 13:52:28 +08:00
Jiangjie.Bai 5ed65ca2ff fix: 修复post方法调用AuthBook接口时500的问题 2022-06-22 17:11:35 +08:00
Jiangjie.Bai 81598a5264 perf: 推送系统用户用户名提示信息 2022-06-16 18:04:03 +08:00
ibuler e2f199606e stash it 2022-06-16 11:32:36 +08:00
Jiangjie.Bai a882ca0d51 fix: 修改推送系统用户提示文案 2022-06-15 15:20:08 +08:00
ibuler cc167f1b49 xxx 2022-06-14 19:49:07 +08:00
Jiangjie.Bai 2aebfa51b2 fix: 过滤系统用户密码过滤ansible不支持的字符 2022-06-14 18:49:35 +08:00
Jiangjie.Bai 95f8b12912 fix: 修复部分 password encrypted field extra kwargs 参数不生效问题 2022-06-13 16:44:01 +08:00
Jiangjie.Bai 3755f8f33a fix: 修复推送动态用户 comment 中包含空格导致推送失败的问题 2022-06-13 14:54:29 +08:00
Jiangjie.Bai 9d1e94d3c2 fix: 修复手动登录系统用户连接RemoteApp应用获取不到认证信息的问题 2022-06-10 18:35:39 +08:00
ibuler 09ef72a4a8 fix: 修复 Migrations 错误 2022-05-24 11:01:26 +08:00
ibuler fe3059c1fd fix: 修复获取密码失败 2022-05-17 23:50:30 +08:00
ibuler c3c0f87c01 perf: domain gateway 也添加 2022-05-17 21:32:31 +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
feng626 14710e9c9e feat: 工单审批人中去除申请人 2022-05-17 20:56:53 +08:00
fit2bot d675b1d4fc
fix: k8s token 解密 (#8252) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-17 16:53:15 +08:00
fit2bot 3b253e276c
perf: 优化翻译 (#8244) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-16 17:50:28 +08:00
feng626 525538e775 fix: 修复密码密钥翻译问题 2022-05-16 17:48:28 +08:00
jiangweidong 55e04e8e9f feat: 内置AIX系统，根据系统选择算法加密密码 2022-05-07 16:25:03 +08:00
jiangweidong 5e70a8af15 feat: 支持平台关联算法，支持AIX改密 2022-05-07 16:25:03 +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 e53aa9696b perf: 修改 serializer 2022-05-05 16:18:05 +08:00
jiangweidong e151548701
perf: 账号管理中查看密码记录日志 (#8157) 2022-05-05 14:42:09 +08:00
Jiangjie.Bai 2493647e5c fix: 修复windows执行ansible显示sudo失败的问题 2022-05-05 11:40:12 +08:00
ibuler 8de57773aa stash it 2022-05-04 09:57:45 +08:00
ibuler 7025d46070 perf: 控制平台创建 2022-05-02 21:37:42 +08:00
ibuler 7e6964e0fc perf: 修改 platform 2022-04-30 23:19:43 +08:00
ibuler 246710128e perf: stash 2022-04-29 18:28:12 +08:00
ibuler 69f3c85195 perf: 添加 category api 2022-04-28 22:54:18 +08:00
ibuler e3f2878b0f perf: 修改迁移 2022-04-28 12:50:41 +08:00
ibuler ba0a017aa4 perf: 修改迁移 2022-04-28 12:47:39 +08:00
ibuler 770d2508d7 perf: 其他 asset model 2022-04-26 21:30:11 +08:00
ibuler 0a2b2ad127 perf: 其他 asset model 2022-04-26 21:30:01 +08:00
ibuler 44d192cbe7 perf: stash 2022-04-26 11:24:08 +08:00
fit2bot 7647438792
perf: 账号备份log (#8106) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-20 11:18:50 +08:00
ibuler 54e772741b perf: 修改 base 2022-04-20 10:15:20 +08:00
ibuler 832228e184 stash 2022-04-19 15:30:56 +08:00
ibuler 516cb05d69 perf: 修改翻译 2022-04-19 13:33:28 +08:00
ibuler 5101aae5ae perf: 修改.. 2022-04-12 19:24:59 +08:00
ibuler 9f927f9703 stash 2022-04-12 17:53:56 +08:00
fit2bot f481463c64
feat: 添加Endpoint (#8041) 
* feat: add Endpoint EndpointRule EndpointProtocol model

* feat: add Endpoint EndpointRule EndpointProtocol API

* feat: modify protocols field

* feat: 修改序列类

* feat: 获取connect-url连接地址

* feat: 获取connect-url连接地址

* feat: 优化后台获取smart-endpoint逻辑

* feat: 优化后台获取smart-endpoint逻辑

* feat: 删除配置KOKO、XRDP、MAGNUS

* feat: 删除配置KOKO、XRDP、MAGNUS

* feat: 修改翻译

* feat: 修改smart endpoint

* feat: 修改翻译

* feat: smart API 添加token解析

* feat: 删除 smart serializer

* feat: 修改迁移逻辑

* feat: 解决冲突

* feat: 修改匹配 endpoint

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-04-12 17:45:10 +08:00
fit2bot 7c7d7d52b2
perf: asset number 扩容 (#8045) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-04-12 14:01:57 +08:00