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

5203 Commits (54f720e99231bf714d95a456f68ee02f8863c171)

Author SHA1 Message Date
fit2bot e5afbd4118
perf: k8s tree api (#9169) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-07 23:55:56 +08:00
Aaron3S c14b97419d feat: 增加跳过的主机统计， 增加每台主机执行情况api 2022-12-07 20:13:26 +08:00
Bai 66bdc375df Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 19:30:48 +08:00
Bai 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题； 
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时，会默认先创建 spm 值，
后端调用 get_object 方法时，使用的queryset，就是spm所对应的queryset，
而 detail=True， 查询的值是当前 account_id，不在 queryset 中，
所以会导致调用父类的 get_object 方法报错，对象找不到
 2022-12-07 19:26:28 +08:00
ibuler a27b43107c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:59:28 +08:00
ibuler 0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
Bai d252ee41ed Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:38:12 +08:00
Bai 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; 2022-12-07 18:38:03 +08:00
ibuler 6a1c5aba12 perf: 修改一些翻译 2022-12-07 17:24:30 +08:00
ibuler 02a03e1a28 perf: merge i18n 2022-12-07 16:02:18 +08:00
ibuler da36ce9dfd perf: merge connect token rdp option 2022-12-07 15:13:32 +08:00
ibuler dbee3ed30d feat: connect token 添加 Rdp options 2022-12-07 15:09:01 +08:00
Bai 1cab84bb62 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-06 19:54:15 +08:00
Bai bf5da83008 perf: 修改授权 API Name 2022-12-06 19:53:36 +08:00
Aaron3S 07b3774d3d feat: 增加运行的内置变量,优化self资源的代码 2022-12-06 19:48:31 +08:00
Aaron3S d92b198a12 perf: 优化ops代码 2022-12-06 19:48:28 +08:00
Bai 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty 2022-12-06 19:41:26 +08:00
Bai 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField 2022-12-06 18:54:13 +08:00
Bai c9bf99468c feat: 添加 command-review API 2022-12-06 18:27:53 +08:00
Bai 71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +08:00
“huailei000” b6afe77bc0 perf: 调整登录页样式 2022-12-06 17:43:08 +08:00
jiangweidong 803d68f3fe feat: 增加clickhouse 2022-12-06 17:13:37 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160) 
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-12-06 11:03:14 +08:00
ibuler daf279304a perf: 修改完冲突了 2022-12-05 18:54:12 +08:00
ibuler 2168610ffe perf: 修改合并引起的 migrations 依赖问题 2022-12-05 16:07:14 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
ibuler 873afd239e chore: relove conflict 2022-12-05 13:41:28 +08:00
ibuler 80e550b71a fix: 修复 supertoken 创建 2022-12-05 13:37:37 +08:00
Bai 1a9f520c1f Merge to local v3 2022-12-05 13:32:33 +08:00
Bai cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段; 2022-12-05 13:27:51 +08:00
ibuler ca228074e3 perf: 修改 migrations 依赖 2022-12-05 12:58:09 +08:00
ibuler 0047af4584 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-05 12:42:39 +08:00
ibuler 38b1701b33 perf: 修改 migrations， 修改 Connect token 2022-12-05 12:42:15 +08:00
feng 03e62b5bc1 perf: asset mini 2022-12-05 11:48:41 +08:00
Aaron3S 74b783f62f perf: 合并迁移文件 2022-12-05 11:26:14 +08:00
fit2bot 8a7ecda4f6
perf: asset add automation_enabled_info (#9154) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-05 11:21:01 +08:00
ibuler d25d580ba4 perf: 合并 connect token 2022-12-05 11:06:50 +08:00
ibuler 669ccb502f perf: 修改 connect token 2022-12-05 10:48:19 +08:00
Bai 0cfcfacb6d perf: 修改 CommandFilterACL, CommandGroup __str__ 2022-12-04 22:46:47 +08:00
Bai 519e0eac01 perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField 2022-12-04 20:51:22 +08:00
Bai 70fb00c4ee perf: 修改命令过滤ACL序列类和部分翻译 2022-12-04 18:48:48 +08:00
Bai 4d9344eb23 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-04 18:11:32 +08:00
Bai 229d36abb4 perf: 修改命令过滤 ACL 序列类 2022-12-04 18:01:35 +08:00
Eric 048be1782d fix: replay file data 2022-12-04 17:39:48 +08:00
Bai 5568c4c5df perf: 修改 CommandFilterACL Account 只匹配 username 字段 2022-12-04 14:44:30 +08:00
Bai a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用 2022-12-04 12:08:44 +08:00
Bai 2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法; 2022-12-04 00:04:39 +08:00
Eric 6480b916d6 perf: parse ssh private key 2022-12-03 15:25:04 +08:00
ibuler 289ecbcc75 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 20:33:56 +08:00
ibuler 2cf3a21d27 perf: 修改校验权限 2022-12-02 20:33:32 +08:00
fit2bot 156a6c9dc5
perf: gateway test connective (#9152) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 20:28:49 +08:00
ibuler 052a4afef6 pref: 暂时修改 key fingerprint 2022-12-02 20:06:56 +08:00
ibuler fbea1f3480 perf: 修改一些拼写 2022-12-02 19:56:13 +08:00
Bai a70f85e346 fix: 修改 ConnectionToken Serializer 2022-12-02 18:09:07 +08:00
Bai 52e8082470 fix: 修改 LoginAssetACL 过滤 review 2022-12-02 17:52:51 +08:00
Bai c832f762a5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 17:48:51 +08:00
Bai c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 2022-12-02 17:48:44 +08:00
jiangweidong aa0dabfd10 fix: 删除不用migrations 2022-12-02 17:40:00 +08:00
fit2bot 0e0a9f4654
perf: gateway account (#9150) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 17:36:55 +08:00
Aaron3S 2f5e133558 perf: 优化celery任务 2022-12-02 17:18:11 +08:00
Aaron3S 6d0545f04f perf: 持续优化作业创建 2022-12-02 17:17:05 +08:00
老广 21f91358cf
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished 
fix: 删除掉连接方式控制半成品代码
 2022-12-02 14:57:38 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
jiangweidong faf1dedfe2 fix: 删除掉连接方式控制半成品代码 2022-12-02 13:00:48 +08:00
Bai 563b9f77a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 12:41:05 +08:00
Bai 158d49b230 fix: 修复用户授权的资产 API 支持 id 过滤 2022-12-02 12:40:29 +08:00
ibuler 61e6ab20a2 perf: 修改 Connect acl 2022-12-02 12:27:26 +08:00
ibuler 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:53:45 +08:00
ibuler a6aafaec05 perf: 修改 command filter 2022-12-02 11:53:07 +08:00
fit2bot 541358978d
fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +08:00
ibuler 19c3f98e8f pref: 修改 migrations 冲突 2022-12-02 11:14:29 +08:00
ibuler fdbaa0afe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:12:25 +08:00
ibuler a18f544cf8 perf: 修改 acl 2022-12-02 11:12:14 +08:00
老广 1165ea817f
Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations 
[v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能
 2022-12-02 10:53:29 +08:00
jiangweidong 85aad7ba62 feat: 解决冲突 2022-12-02 10:52:31 +08:00
老广 017a674f63
Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn 
perf: 去掉 gunicorn threads
 2022-12-02 10:47:16 +08:00
吴小白 709b6e5b0d perf: 去掉 gunicorn threads 2022-12-02 10:45:12 +08:00
老广 11a786d858
Merge pull request #9076 from jumpserver/v3_async_ws 
perf: asyncio ws task log
 2022-12-02 10:44:24 +08:00
老广 07f2e66546
Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error 
fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错
 2022-12-02 10:40:55 +08:00
老广 a6b1052767
Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn 
perf: 控制 gunicorn 启动进程
 2022-12-02 10:40:09 +08:00
老广 bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
Eric 10e3100d3c fix: LoginAssetACL confirm action 2022-12-01 22:09:16 +08:00
Bai 2401c241f2 fix: 修改 random_string 方法，支持只生成随机数字 2022-12-01 20:12:51 +08:00
ibuler 1fb0b0849d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 19:41:42 +08:00
ibuler cb3877bbda perf: 修改 acl 添加命令过滤 acl 2022-12-01 19:41:18 +08:00
feng fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +08:00
吴小白 2bc47c87d1 perf: 修正错误 2022-12-01 16:12:10 +08:00
ibuler 8162a1b17e perf: 优化 gateway 2022-12-01 15:21:53 +08:00
吴小白 7a475fc029 perf: 控制 gunicorn 启动进程 2022-12-01 14:54:57 +08:00
halo 269c087bac fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错 2022-12-01 13:47:25 +08:00
fit2bot d1461b33c5
perf: gather account mysql (#9136) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-01 13:12:31 +08:00
Bai d5d770e4ac Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 12:03:08 +08:00
Bai b55b755e8e fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题 2022-12-01 12:03:01 +08:00
Bai 592d79c0f8 perf: 合并授权规则用户相关的 API URL，统一使用 /<str:user>/ 格式 2022-12-01 12:02:20 +08:00
feng 26efc42e8b perf: type to assets 2022-12-01 10:23:04 +08:00
Eric d198dfcba9 perf: granted asset add specific field 2022-12-01 00:36:02 +08:00
Bai a430b0f1a9 perf: 优化 Login Asset ACL Serializer reviewers 字段 2022-11-30 23:05:20 +08:00
Bai 3b1c8a2327 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 21:13:56 +08:00
Bai 2aa1d664a6 perf: 处理 acl filter 逻辑放到 queryset 中 2022-11-30 21:13:50 +08:00
feng a0df39ad28 fix: 修改connection token 对接client的username 2022-11-30 20:38:22 +08:00