fit2bot
|
c5edb9981e
|
perf: rbac tree (#9237)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-22 20:09:20 +08:00 |
Bai
|
ab6518e60e
|
fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题
|
2022-12-22 18:56:54 +08:00 |
fit2bot
|
1de51a2bfd
|
perf: asset xpack (#9234)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-22 13:50:22 +08:00 |
ibuler
|
e0e57a71aa
|
pref: 类型树支持资产
|
2022-12-22 11:34:18 +08:00 |
ibuler
|
7ca2fdca89
|
perf: 修改 platform 搜索
|
2022-12-21 20:04:49 +08:00 |
ibuler
|
0c2a5bc44a
|
fix: 修复搜索资产平台
|
2022-12-21 19:59:56 +08:00 |
ibuler
|
df1950d063
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-21 18:37:37 +08:00 |
ibuler
|
b01ef1585c
|
perf: account secret rbac permission
|
2022-12-21 18:37:05 +08:00 |
ibuler
|
17627390f8
|
perf: 修改 account 序列号字段
|
2022-12-21 18:36:15 +08:00 |
fit2bot
|
c304a58c05
|
perf: 修改k8s 树 (#9228)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-21 17:17:54 +08:00 |
ibuler
|
63d35ea8a6
|
perf: 修改资产 model
|
2022-12-20 20:39:48 +08:00 |
ibuler
|
58909ee67d
|
perf: 修改基础 model,继承同一个
|
2022-12-20 20:23:42 +08:00 |
Bai
|
362cfb733c
|
perf: 修改 su-from-accounts API
|
2022-12-20 16:13:44 +08:00 |
fit2bot
|
69b16e4754
|
perf: asset type xpack (#9218)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-19 11:35:50 +08:00 |
ibuler
|
26fa1f6f08
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-16 15:54:29 +08:00 |
ibuler
|
d040162d86
|
perf: 修改 session 字段,添加 Comment
|
2022-12-16 15:53:59 +08:00 |
feng
|
11a58dc7ad
|
perf: k8s tree proxy
|
2022-12-16 10:52:08 +08:00 |
feng
|
d7a793b4c4
|
perf: 修改k8s tree
|
2022-12-15 18:47:54 +08:00 |
fit2bot
|
69fe0b07fd
|
perf: k8s tree (#9214)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-15 16:08:19 +08:00 |
ibuler
|
615a1ddc96
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-15 16:03:21 +08:00 |
ibuler
|
cb7b31e8b8
|
perf: perm account 返回 alias
|
2022-12-15 16:02:34 +08:00 |
feng
|
840ca02223
|
perf: del redundant macos
|
2022-12-15 15:21:51 +08:00 |
Eric
|
d60f9a7c69
|
perf: web selector 默认值修改
|
2022-12-14 17:39:22 +08:00 |
feng
|
408c6c568a
|
perf: account backup
|
2022-12-12 12:33:45 +08:00 |
fit2bot
|
c861f390c7
|
perf: k8s account ignore (#9188)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-12 11:43:19 +08:00 |
Bai
|
a767c208b3
|
perf: 优化 get_all_node_keys 方法
|
2022-12-09 13:38:30 +08:00 |
Bai
|
4f5cc56b00
|
perf: 优化 UserPermTreeUtil 逻辑(进行中)
|
2022-12-09 13:38:30 +08:00 |
Bai
|
8beb1b81cf
|
fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类
|
2022-12-09 11:12:56 +08:00 |
Bai
|
beac2a1514
|
perf: 优化获取账号 su-from-accounts 时,不包含自己和以自己为 su-from 的账号
|
2022-12-08 13:37:35 +08:00 |
fit2bot
|
e5afbd4118
|
perf: k8s tree api (#9169)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-07 23:55:56 +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
|
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 |
feng
|
f39a3a34e4
|
perf: change secret ignore secret type
|
2022-11-21 16:23:32 +08:00 |
feng
|
94526e44f1
|
perf: change secret timedelta
|
2022-11-21 15:18:09 +08:00 |
halo
|
1b99a7e06f
|
fix: 账户备份邮件发送找不到文件bug
|
2022-11-17 17:39:53 +08:00 |
ibuler
|
a42641ca9a
|
fix: 修复 redis 连接导致的 pub sub 错误
|
2022-11-17 14:07:43 +08:00 |
Jiangjie.Bai
|
896b59b1bd
|
fix: 修复获取用户收藏的资产API失败的问题
|
2022-11-16 15:07:35 +08:00 |
Aaron3S
|
c63c000b10
|
perf: 优化异步认识显示名称
|
2022-11-15 16:29:40 +08:00 |
Aaron3S
|
0044f11262
|
feat: 执行adhoc和playbook
|
2022-11-11 19:20:17 +08:00 |
fit2bot
|
b100bbf838
|
perf: change secret (#9048)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-11 19:15:43 +08:00 |
fit2bot
|
cb82b53791
|
perf: automation celery task (#9046)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-11 16:13:16 +08:00 |
ibuler
|
1cd551e692
|
merge: with remote
|
2022-11-11 15:11:10 +08:00 |
ibuler
|
f6e403fd8b
|
pref: 修改 asset permission
|
2022-11-11 15:04:31 +08:00 |
fit2bot
|
cd3c3eeaf2
|
perf: code (#9044)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-10 19:11:56 +08:00 |
jiangweidong
|
ac6ffb24ee
|
feat: 云资产同步支持选择IP类型-补充翻译
|
2022-11-10 17:35:16 +08:00 |
feng
|
becb10a453
|
perf: changr secret record api
|
2022-11-09 18:31:35 +08:00 |
jiangweidong
|
be875638ed
|
Merge branch 'v3' of https://github.com/jumpserver/jumpserver into pr@v3@feat_db_automations
|
2022-11-09 18:23:10 +08:00 |
jiangweidong
|
8e2c048f0c
|
feat: 支持Oracle、MongoDB、SQLServer数据库的自动化脚本部分功能
|
2022-11-09 18:23:00 +08:00 |
fit2bot
|
a5cef74356
|
perf: serializer (#9034)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-09 18:15:21 +08:00 |
feng
|
cf4744791a
|
fix: automation execution bug
|
2022-11-09 15:55:48 +08:00 |
feng
|
3b4e388ed0
|
perf: gather account api adjustment
|
2022-11-09 15:42:21 +08:00 |
fit2bot
|
6ef5154d4d
|
fix: swagger (#9031)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-09 13:34:29 +08:00 |
fit2bot
|
0ff8758ea8
|
perf: gather account automation api (#9029)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-08 20:33:55 +08:00 |
ibuler
|
d040b4cfe0
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-08 19:19:28 +08:00 |
ibuler
|
5730265183
|
pref: 修改 account secret_type 类型
|
2022-11-08 19:18:04 +08:00 |
fit2bot
|
ce9ebd94ec
|
perf: change secret automation api (#9028)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-08 17:54:51 +08:00 |
Jiangjie.Bai
|
cd93de4c00
|
perf: 优化 Connection Token API 逻辑处理
|
2022-11-08 14:30:07 +08:00 |
feng
|
a13527c5c8
|
perf: platform charset
|
2022-11-07 19:17:02 +08:00 |
feng
|
b4f511a7ff
|
perf: account backup
|
2022-11-07 17:01:28 +08:00 |
fit2bot
|
1cc983b2eb
|
perf: automation button (#9023)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-07 16:10:26 +08:00 |
ibuler
|
045bc3661a
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-04 20:16:29 +08:00 |
ibuler
|
4405064e78
|
pref: 添加 api debug timer
|
2022-11-04 20:14:19 +08:00 |
fit2bot
|
dca92a1e04
|
perf: push account (#9020)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-04 19:18:15 +08:00 |
Jiangjie.Bai
|
8abf954015
|
fix: 处理一波迁移文件
|
2022-11-04 15:36:45 +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
|
037cd90f09
|
pref: 修改 migrations
|
2022-11-04 13:29:28 +08:00 |
ibuler
|
fbf65f437a
|
merge: with merge remote
|
2022-11-04 11:43:34 +08:00 |
jiangweidong
|
262d070f3c
|
feat: 支持纳管 clickhouse[Web Terminal]
|
2022-11-04 11:41:54 +08:00 |
feng
|
1981bdd3ac
|
perf: account serializer
|
2022-11-04 11:39:34 +08:00 |
feng
|
8b05bc4b82
|
perf: 多节点发送文件失败
|
2022-11-04 11:15:34 +08:00 |
feng
|
e995e3b35a
|
perf: change secret adjustment
|
2022-11-04 11:09:56 +08:00 |
fit2bot
|
ebfc3b7b38
|
perf: change secret (#9014)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-03 22:39:48 +08:00 |
fit2bot
|
54f92e100e
|
perf: account backup (#9013)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-03 16:57:34 +08:00 |
ibuler
|
b0ae9b47ca
|
pref: 修改 applet host
|
2022-11-03 16:55:38 +08:00 |
feng
|
7087d5a74e
|
perf: account specific
|
2022-11-03 12:42:57 +08:00 |
feng
|
0fdc30bed3
|
perf: account
|
2022-11-02 20:36:40 +08:00 |
ibuler
|
9b3b3d09da
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-02 20:36:28 +08:00 |
ibuler
|
0d2bfaa768
|
pref: 添加 applet host actions
|
2022-11-02 20:33:27 +08:00 |
feng
|
651c7ca152
|
perf: playbook specific
|
2022-11-02 19:25:39 +08:00 |
feng
|
0c259730ca
|
perf: del surplus code
|
2022-11-02 17:45:30 +08:00 |
fit2bot
|
697b3fb860
|
perf: 自动化按钮 (#9008)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-02 17:27:47 +08:00 |
feng
|
0e5ebfad1c
|
perf: gather asset info and test asset connectivity
|
2022-11-01 19:37:50 +08:00 |
feng
|
8231f727c2
|
perf: history account
|
2022-11-01 15:04:13 +08:00 |
ibuler
|
c9b8c087c7
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-01 11:53:51 +08:00 |
ibuler
|
cf81f08b7a
|
perf: 优化部署 host
|
2022-11-01 11:52:51 +08:00 |
feng
|
796758cbb2
|
perf: histories account
|
2022-11-01 11:43:29 +08:00 |
feng
|
5bd40fcd22
|
fix: swagger
|
2022-10-31 19:27:45 +08:00 |
feng
|
4f2250b7a8
|
perf: gather account windows
|
2022-10-31 18:32:07 +08:00 |
feng
|
094e144a51
|
perf: history secret
|
2022-10-31 17:37:54 +08:00 |
ibuler
|
db07cadd6e
|
merge: with rmote
|
2022-10-31 11:22:47 +08:00 |
ibuler
|
d123c7f105
|
pref: 修改执行部署
|
2022-10-31 10:57:19 +08:00 |
feng
|
a11770e96d
|
fix: automiation
|
2022-10-31 10:42:12 +08:00 |
feng
|
121ba1df07
|
perf: automations push ping verify
|
2022-10-28 18:34:12 +08:00 |
feng
|
4ab14b4a59
|
perf: migrat
|
2022-10-27 19:08:51 +08:00 |
feng
|
2355d1af83
|
perf: gather accounts
|
2022-10-27 18:53:10 +08:00 |
ibuler
|
097ebc2362
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-27 18:34:34 +08:00 |
ibuler
|
c0540e6787
|
pref: 修改 celery
|
2022-10-27 18:34:25 +08:00 |
ibuler
|
28f4905a81
|
pref: 修改 applet host
|
2022-10-27 16:26:15 +08:00 |
Jiangjie.Bai
|
a260da6cec
|
refactor: 修改 ConnectionToken 关联的逻辑(1)
|
2022-10-27 15:47:05 +08:00 |
ibuler
|
e327c97170
|
pref: 修改迁移文件
|
2022-10-25 20:09:05 +08:00 |
ibuler
|
350c9e4a80
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-25 19:38:40 +08:00 |
ibuler
|
82aca6b843
|
pref: 修改 applet
|
2022-10-25 19:31:13 +08:00 |
Jiangjie.Bai
|
901270e6ad
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-25 18:45:33 +08:00 |
Jiangjie.Bai
|
6ed946541d
|
merge: local
|
2022-10-25 18:45:13 +08:00 |
feng
|
4dd4c29e12
|
perf: gather facts
|
2022-10-25 18:43:34 +08:00 |
feng
|
a445e47f3d
|
perf: account add platform_id
|
2022-10-25 15:07:51 +08:00 |
feng
|
d95ced5109
|
fix: 修复change account perm 问题
|
2022-10-25 14:26:56 +08:00 |
ibuler
|
8fd6cabcab
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-25 13:00:20 +08:00 |
ibuler
|
5606082ca3
|
pref: 添加 applet 创建 api
|
2022-10-25 12:57:34 +08:00 |
feng
|
f743dea1fd
|
perf: mysql postgresql
|
2022-10-24 20:24:56 +08:00 |
ibuler
|
1372d6322d
|
perf: 合并代码
|
2022-10-22 11:37:51 +08:00 |
ibuler
|
943b130035
|
feat: 添加远程应用
|
2022-10-22 11:17:02 +08:00 |
feng
|
64daacce63
|
fix: 修复自动化修改密码bug
|
2022-10-21 18:19:09 +08:00 |
feng
|
091bffa626
|
perf: automation change secret linux
|
2022-10-21 11:24:05 +08:00 |
ibuler
|
3e7004d784
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-20 20:35:34 +08:00 |
feng
|
7255cf68a9
|
perf: automation change secret linux
|
2022-10-20 20:34:15 +08:00 |
ibuler
|
168de45da5
|
pref: 优化 device api
|
2022-10-20 20:06:58 +08:00 |
ibuler
|
a450ceee91
|
pref: 修改 migrations 名称
|
2022-10-20 16:44:15 +08:00 |
ibuler
|
ef04e6ffcc
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-20 16:39:55 +08:00 |
ibuler
|
c55d3c0b6c
|
perf: 添加 histories
|
2022-10-20 16:39:11 +08:00 |
feng
|
26278cc9e0
|
perf: change secret automation
|
2022-10-19 18:58:45 +08:00 |
ibuler
|
1a2193d091
|
perf: 资产 api 返回特有属性
|
2022-10-19 18:56:46 +08:00 |
ibuler
|
eb16e3c7cb
|
perf: 修改翻译
|
2022-10-19 14:56:27 +08:00 |
ibuler
|
076afb2b8b
|
pref: 修改 automations
|
2022-10-19 11:39:11 +08:00 |
ibuler
|
d6e36c873d
|
pref: 修改 filter
|
2022-10-19 10:21:05 +08:00 |
ibuler
|
8c92a9934b
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-18 20:38:03 +08:00 |
ibuler
|
9b44ed55c2
|
pref: 修改 secret encrypt
|
2022-10-18 20:37:17 +08:00 |
fit2bot
|
33860bb955
|
fix: 修复资产详情 查看授权用户500问题 (#8963)
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
|
2022-10-18 10:51:51 +08:00 |
feng
|
4f16c1f92c
|
fix: account init 500
|
2022-10-17 17:56:19 +08:00 |
ibuler
|
6a33129349
|
pref: 完成收集资产信息任务
|
2022-10-17 11:22:21 +08:00 |
ibuler
|
4e8e4e4bb7
|
pref: 修改添加 gather facts
|
2022-10-14 19:40:51 +08:00 |
ibuler
|
75ec9d4173
|
perf: 添加 gather facts automation
|
2022-10-14 18:59:28 +08:00 |
Jiangjie.Bai
|
c79c3f8aec
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-14 17:01:44 +08:00 |
Jiangjie.Bai
|
0e67739173
|
refactor: 授权添加授权账号工具,实现获取授权用户某个资产账号的功能
|
2022-10-14 17:01:36 +08:00 |
ibuler
|
4e2aebde6c
|
perf: 修改改密
|
2022-10-14 16:33:24 +08:00 |
Jiangjie.Bai
|
18e525c943
|
fix: 修改命令过滤器权限
|
2022-10-14 10:58:06 +08:00 |
ibuler
|
0a65b9de8e
|
perf: 重构 playbook base runner
|
2022-10-13 20:28:18 +08:00 |
ibuler
|
52fb55e806
|
pref: 修改改密
|
2022-10-13 17:52:25 +08:00 |
ibuler
|
8c91cd7eb6
|
perf: 修改改密
|
2022-10-13 17:47:29 +08:00 |
ibuler
|
85a6f29a0a
|
perf: 修改 playbook 任务执行
|
2022-10-12 18:08:57 +08:00 |
feng626
|
22e211625e
|
fix: platform 500
|
2022-10-11 10:50:39 +08:00 |
ibuler
|
21816e3a39
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-10-10 20:56:55 +08:00 |
ibuler
|
9198c93fcf
|
perf: 修改 ansible change password
|
2022-10-10 20:56:13 +08:00 |
feng626
|
6e0d211645
|
perf: automation migrate
|
2022-10-10 17:08:06 +08:00 |
ibuler
|
1d757ec19a
|
pref: 修改改密
|
2022-10-10 16:56:32 +08:00 |
ibuler
|
9a0bae5bfd
|
perf: 修改 ansible 执行
|
2022-10-10 16:56:32 +08:00 |
ibuler
|
4e5a7a0a25
|
perf: 修改改密
|
2022-10-10 16:56:32 +08:00 |
ibuler
|
0fb4b52232
|
perf: 修改 ansible 表结构
|
2022-10-10 16:56:32 +08:00 |
ibuler
|
41589c5305
|
perf: 修改 ansible
|
2022-10-10 16:56:32 +08:00 |
Jiangjie.Bai
|
145814f1e8
|
perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰
|
2022-10-10 16:31:45 +08:00 |
Jiangjie.Bai
|
fae5d07df6
|
feat: 优化命令过滤器支持关联节点;
|
2022-10-09 19:53:34 +08:00 |
Jiangjie.Bai
|
df31f47c68
|
feat: 命令过滤器支持关联节点; 添加端点规则迁移文件
|
2022-10-09 19:01:11 +08:00 |
feng626
|
cd98ec4cac
|
perf: account history record only secret
|
2022-10-09 17:52:41 +08:00 |
feng626
|
b2991362f1
|
perf: 查看用户授权
|
2022-09-29 18:01:23 +08:00 |
feng626
|
ec0c334acc
|
perf: account search
|
2022-09-29 14:44:27 +08:00 |
feng626
|
da35e931a2
|
perf: 更新平台username passwd submit selector可为空
|
2022-09-29 14:19:14 +08:00 |
Jiangjie.Bai
|
15c8c035aa
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-28 18:47:44 +08:00 |
Jiangjie.Bai
|
351d3b297d
|
fix: 修复用户授权资产账号API及Model处理逻辑
|
2022-09-28 18:40:33 +08:00 |
ibuler
|
2a9613d90a
|
perf: 修改 asset serializer
|
2022-09-28 12:10:39 +08:00 |
ibuler
|
72b0fb4274
|
perf: 修改 platform 支持设置 ansible
|
2022-09-26 18:03:48 +08:00 |
ibuler
|
00e1dd6996
|
fix: remote gateway filter address
|
2022-09-26 11:01:21 +08:00 |
ibuler
|
6ed3b51928
|
perf: 优化 serailizer 统一到 drf 目录中
|
2022-09-26 10:43:18 +08:00 |
ibuler
|
f223cf43cc
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-23 19:00:09 +08:00 |
ibuler
|
234acd6317
|
perf: 修改 accounts
|
2022-09-23 18:59:19 +08:00 |
Jiangjie.Bai
|
399c6285f8
|
feat: 获取 用户、资产授权的所有账号API, 返回@INPUT、@USER等内部账号
|
2022-09-23 15:59:37 +08:00 |
ibuler
|
286d0e4ac1
|
perf: 修改 migrations
|
2022-09-23 10:53:44 +08:00 |
ibuler
|
3a884388cd
|
perf: 修改名称
|
2022-09-23 10:38:28 +08:00 |
ibuler
|
8f31a25fda
|
perf: 优化迁移文件
|
2022-09-23 10:15:07 +08:00 |
ibuler
|
a35e0c5efa
|
perf: 创建内置 platforms
|
2022-09-22 16:39:41 +08:00 |
ibuler
|
68ed3ac1a8
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-22 15:25:12 +08:00 |
ibuler
|
cc859f302a
|
perf: 优化 asset migrations
|
2022-09-22 15:24:32 +08:00 |
feng626
|
33948d614b
|
perf: ip -> address
|
2022-09-22 15:14:55 +08:00 |
ibuler
|
21a60bf55e
|
perf: change cateogory data strucature
|
2022-09-21 20:13:28 +08:00 |
ibuler
|
ea1cb158b5
|
perf: add charset control
|
2022-09-21 19:03:06 +08:00 |
feng626
|
ffdb3f3b83
|
perf: ticket
|
2022-09-21 18:34:51 +08:00 |
ibuler
|
584ce0afe3
|
perf: 修改迁移文件
|
2022-09-21 13:42:12 +08:00 |
ibuler
|
1b0195cb82
|
perf: 修改 asset 结构
|
2022-09-21 11:17:14 +08:00 |
ibuler
|
cf5c50b343
|
perf: 优化平台协议
|
2022-09-20 21:19:05 +08:00 |
ibuler
|
79ce1215f5
|
merge: with remote branch
|
2022-09-20 17:47:40 +08:00 |
ibuler
|
d0999dd1ef
|
perf: 优化平台创建约束
|
2022-09-20 17:33:15 +08:00 |
feng626
|
615f36c6f6
|
perf: 收集账号
|
2022-09-20 16:18:23 +08:00 |
ibuler
|
8c72bab82d
|
perf: 优化 account 结构
|
2022-09-20 13:54:25 +08:00 |
ibuler
|
9e84989bbe
|
merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-19 20:12:23 +08:00 |
ibuler
|
5d48d1ab15
|
perf: stash it
|
2022-09-19 20:11:55 +08:00 |
feng626
|
108ccf5a8b
|
perf: 账号管理api
|
2022-09-19 17:00:03 +08:00 |
ibuler
|
762d84b5c3
|
merge: with remote
|
2022-09-19 09:59:43 +08:00 |
ibuler
|
fa28bfc659
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-19 09:55:41 +08:00 |
ibuler
|
b50d28ff9c
|
perf: 暂存修改
|
2022-09-19 09:52:09 +08:00 |
ibuler
|
65331e13ac
|
pref: 优化平台
|
2022-09-19 00:07:59 +08:00 |
feng626
|
389094f615
|
perf: 账号备份
|
2022-09-16 17:24:27 +08:00 |
ibuler
|
a86d5c1456
|
perf: 修改 models
|
2022-09-16 11:45:50 +08:00 |
ibuler
|
1d1b252e58
|
perf: 解决冲突
|
2022-09-15 21:23:00 +08:00 |
ibuler
|
9b2acfe4a4
|
perf: 优化平台
|
2022-09-15 21:20:56 +08:00 |
feng626
|
a4d0ef3706
|
perf: verify ansible linux
|
2022-09-15 21:14:14 +08:00 |
feng626
|
139540fafe
|
perf: 修改change password linux ansible yaml
|
2022-09-15 19:53:26 +08:00 |
ibuler
|
e0e14a2fe1
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-15 16:44:29 +08:00 |
ibuler
|
9edd786bb4
|
perf: 修改 platform 表结构
|
2022-09-15 16:22:01 +08:00 |
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 |
fit2bot
|
1ac64db0ba
|
fix: 修复账号备份失败问题 (#8852)
Co-authored-by: feng626 <1304903146@qq.com>
|
2022-09-09 16:01:08 +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 |
feng626
|
ef4cc5f646
|
perf: 优化账号备份
|
2022-09-06 14:40:59 +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 |