github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-07-04 00:03:34 +00:00
Code Issues Projects Releases Wiki Activity
13,179 Commits 133 Branches 274 Tags
pr@dev_osm@fix_ssh_automation_python_interpreter
Commit Graph

2303 Commits

Author SHA1 Message Date
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
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
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
71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +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
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
fit2bot
8a7ecda4f6 perf: asset add automation_enabled_info (#9154) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-05 11:21:01 +08:00
Eric
6480b916d6 perf: parse ssh private key 2022-12-03 15:25:04 +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
fit2bot
0e0a9f4654 perf: gateway account (#9150) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 17:36:55 +08:00
ibuler
2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
fit2bot
541358978d fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +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
老广
bcf509ab07 Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
feng
fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +08:00
ibuler
8162a1b17e perf: 优化 gateway 2022-12-01 15:21:53 +08:00
fit2bot
d1461b33c5 perf: gather account mysql (#9136) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-01 13:12:31 +08:00
ibuler
307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +08:00
ibuler
d46f321f1a perf: 修改连接方式 2022-11-30 15:24:32 +08:00
ibuler
0f1e19ba41 perf: 修改数据库添加 ssl 字段 2022-11-30 11:28:51 +08:00
feng
cc5b37350c perf: domain del nodes 2022-11-29 19:37:11 +08:00
feng
dd207016b2 perf: del domain node 2022-11-29 19:14:12 +08:00
feng
52541d1dad perf: push dynamic user 2022-11-29 19:05:45 +08:00
fit2bot
d849fd52bd perf: domian add node (#9130) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-29 17:01:03 +08:00
fit2bot
11636dafd8 perf: history account secret perm (#9128) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 18:43:58 +08:00
fit2bot
4f718f9b1f perf: account template secret api (#9127) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 15:54:16 +08:00
ibuler
5e503ec5b8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-25 23:11:28 +08:00
ibuler
0f35b3dd58 pref: 修改 connect token 2022-11-25 23:09:55 +08:00
Eric
608e0c9f26 feat: support ed25519 key 2022-11-25 18:06:22 +08:00
fit2bot
276f644794 perf: gateway (#9121) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-24 21:21:25 +08:00
Bai
99f5c02d84 perf: 获取用户授权的账号返回 has_username 字段 2022-11-24 17:04:27 +08:00
Bai
4574161009 fix: 修复获取授权规则的账号列表为空的问题 2022-11-24 16:44:15 +08:00
jiangweidong
2d86c8c843 Merge branch 'v3' of http://github.com/jumpserver/jumpserver into pr@v3@feat_support_clear_private_key 2022-11-24 15:25:17 +08:00
jiangweidong
9e41ad0764 feat: 支持账号更新界面清空存在的秘钥信息 2022-11-24 15:25:09 +08:00
feng
3d6609ec8c perf: gateway 2022-11-23 18:36:42 +08:00
fit2bot
1a204618f7 [v3] perf: migrate gateway to asset (#8928) 
* perf: migrate gateway to asset

* perf: asset discriminate gateway

Co-authored-by: feng626 <1304903146@qq.com>
 2022-11-22 17:33:09 +08:00