Aaron3S
|
c10d7f554e
|
Merge remote-tracking branch 'origin/v3' into v3
|
2 years ago |
ibuler
|
82aca6b843
|
pref: 修改 applet
|
2 years ago |
Aaron3S
|
64e03a4412
|
feat: 增加异步任务api
|
2 years ago |
ibuler
|
943b130035
|
feat: 添加远程应用
|
2 years ago |
ibuler
|
d6e36c873d
|
pref: 修改 filter
|
2 years ago |
ibuler
|
9b44ed55c2
|
pref: 修改 secret encrypt
|
2 years ago |
Jiangjie.Bai
|
62c57d2fdf
|
fix: 修复创建目录时指定权限为 755
|
2 years ago |
Jiangjie.Bai
|
4711813af8
|
fix: 修复创建目录时指定权限为 755
|
2 years ago |
ibuler
|
4e8e4e4bb7
|
pref: 修改添加 gather facts
|
2 years ago |
ibuler
|
75ec9d4173
|
perf: 添加 gather facts automation
|
2 years ago |
Jiangjie.Bai
|
df99067ee3
|
perf: 删除消息订阅时 websocket 重连的 redis 断开日志
|
2 years ago |
ibuler
|
9a0bae5bfd
|
perf: 修改 ansible 执行
|
2 years ago |
Jiangjie.Bai
|
145814f1e8
|
perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰
|
2 years ago |
feng626
|
a487d30001
|
perf: 密码首位不包含特殊字符
|
2 years ago |
Aaron3S
|
bb25bf7621
|
fix: 修改解密异常抛出范围
|
2 years ago |
Aaron3S
|
f6cc7046a2
|
fix: 修复空字符串加密报错的问题
|
2 years ago |
ibuler
|
72b0fb4274
|
perf: 修改 platform 支持设置 ansible
|
2 years ago |
Aaron3S
|
1bc6e50b06
|
perf: 优化去除结尾空字节的写法
|
2 years ago |
吴小白
|
1d3135d2d7
|
perf: flower 开启持久化
|
2 years ago |
Aaron3S
|
a7cd0bc0fe
|
fix: 修复密码后空格的问题
|
2 years ago |
ibuler
|
6ed3b51928
|
perf: 优化 serailizer 统一到 drf 目录中
|
2 years ago |
ibuler
|
234acd6317
|
perf: 修改 accounts
|
2 years ago |
ibuler
|
ee1ec6aeee
|
fix: 修复 celery 丢失心跳不会重连的问题
|
2 years ago |
ibuler
|
1b0195cb82
|
perf: 修改 asset 结构
|
2 years ago |
feng626
|
615f36c6f6
|
perf: 收集账号
|
2 years ago |
feng626
|
7b4c2ce97e
|
perf: xpack problem
|
2 years ago |
fit2bot
|
8c277e8875
|
fix: 修复mfa失效日期 失效问题 (#8862)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
fit2bot
|
5e16b6387a
|
fix: 修复配置mfa失效日期 失效问题 (#8856)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
Jiangjie.Bai
|
a2c006f01b
|
perf: 整理用户授权资产的API
|
2 years ago |
jiangweidong
|
556bd3682e
|
feat: 支持对开启SSL/TLS的MongoDb数据库改密
|
2 years ago |
ibuler
|
3e794ec41a
|
perf: 修改 serializer
|
2 years ago |
jiangweidong
|
fa54a98d6c
|
fix: 修复华为短信配置错误,前端提示不对的问题
|
2 years ago |
ibuler
|
706488d293
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2 years ago |
feng626
|
b910180a12
|
自动化策略 表
|
2 years ago |
jiangweidong
|
409d254a2e
|
feat: 支持MFA可配置华为云平台短信对接
|
2 years ago |
ibuler
|
984b8dfb28
|
perf: 修改 m2m 日志记录
|
2 years ago |
ibuler
|
deba0c9057
|
feat: 支持 py3.9
|
2 years ago |
ibuler
|
7ae395f7e8
|
perf: 修改 metadata
|
2 years ago |
ibuler
|
d7d9fe2718
|
perf: 修改 model
|
2 years ago |
ibuler
|
2ede152663
|
Merge remote-tracking branch 'origin/v3' into v3
# Conflicts:
# apps/assets/api/platform.py
|
2 years ago |
feng626
|
60eb385c1e
|
账号过滤
|
2 years ago |
ibuler
|
728dc43b6c
|
perf: 修改 fields 支持 display choices
|
2 years ago |
ibuler
|
951d4e4e0d
|
perf: 合并冲突
|
2 years ago |
ibuler
|
c950508873
|
Merge remote-tracking branch 'origin/v3' into v3
|
2 years ago |
feng626
|
ca3d2271a8
|
merge v3
|
2 years ago |
ibuler
|
a0b6849ccb
|
perf: 优化 platform
|
2 years ago |
Jiangjie.Bai
|
f0dc519423
|
perf: 优化 windows ad帮助链接地址
|
2 years ago |
ibuler
|
cd8adc6d3d
|
perf: 修改 migrations
|
2 years ago |
Aaron3S
|
51820f23bf
|
perf: 优化代码表达
|
2 years ago |
Aaron3S
|
8772cd8c71
|
feat: 支持 piico 设备国密加密
|
2 years ago |
ibuler
|
60cb1f8136
|
fix: 修复默认 gcm key padding
|
2 years ago |
feng626
|
a7d193464e
|
添加 choices 获取 label方法
|
2 years ago |
ibuler
|
05f913ab18
|
perf: 修改 platform
|
2 years ago |
Jiangjie.Bai
|
9a4b32cb3c
|
perf: 优化 metadata 类型添加 float
|
2 years ago |
Jiangjie.Bai
|
795d6e01dc
|
fix: 修改测试IP地址工具的默认超市时间为 0.5s
|
2 years ago |
jiangweidong
|
abcd12f645
|
perf: 补充cmpp2翻译及部分报错提示 (#8717)
* 修改CMPPv2.0翻译内容
* perf: 捕捉连接网关出错问题
* perf: 测试短信验证失败提示错误信息
* perf: 修改翻译
|
2 years ago |
ibuler
|
1ca0bdf843
|
perf: 修改 category
|
2 years ago |
jiangweidong
|
708a87c903
|
feat: 支持CMPPv2.0协议短信网关 (#8591)
* feat: 支持CMPPv2.0协议短信网关
* 修改翻译
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
2 years ago |
Jiangjie.Bai
|
05e2f8aaf6
|
fix: 修改 EncryptMixin get_prep_value 和 默认关闭 XPACK
|
2 years ago |
ibuler
|
87df92ea92
|
perf: 修改脚本
|
2 years ago |
fit2bot
|
4ecb0b760f
|
perf: 支持配置文件加密 (#8699)
* crypto
* perf: 暂存一下
* perf: 支持配置文件加密
* perf: 修改位置
* perf: 优化拆分出去
* stash
* perf: js 强制 key 最大 16
* pref: 修改语法
* fix: 修复启用 gm 后,又关闭导致的用户无法登录
Co-authored-by: ibuler <ibuler@qq.com>
|
2 years ago |
fit2bot
|
b27b02eb9d
|
feat: Cloud 支持局域网 IP 扫描 (#8589)
* feat: Cloud 支持局域网 IP 扫描
* feat: Cloud 支持局域网 IP 扫描
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
2 years ago |
jiangweidong
|
2099baaaff
|
feat: 认证方式支持OAuth2.0协议 (#8686)
* feat: 认证方式支持OAuth2.0协议
* perf: 优化 OAuth2 认证逻辑和Logo (对接 Github)
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
* perf: 优化 OAuth2 认证逻辑和Logo,支持上传图标
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
2 years ago |
ibuler
|
b22aed0cc3
|
feat: 用户密码 hash 采用 gmsm3
|
2 years ago |
Jiangjie.Bai
|
40f8b99242
|
fix: 修复更新资产账号不成功的问题(末尾:)
|
2 years ago |
ibuler
|
9d17f27fb3
|
fix: 修复密码可能解密失败报错
|
2 years ago |
feng626
|
358460e7f0
|
fix: 如配置SECURITY_VIEW_AUTH_NEED_MFA 跳过校验
|
2 years ago |
fit2bot
|
62d403bf21
|
fix: reverse console (#8615)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
ibuler
|
93a89509d6
|
perf: merge with dev
|
2 years ago |
Jiangjie.Bai
|
41541a91b9
|
fix: 修复 public 和 smart API 权限包含 connection token
|
2 years ago |
fit2bot
|
b5cfc6831b
|
feat: 工单支持审批时修改资产 (#8549)
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
|
2 years ago |
fit2bot
|
bf7c05f753
|
fix: 调整confirm (#8554)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
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>
|
2 years ago |
Jiangjie.Bai
|
62a2a74c27
|
perf: 会话列表显示终端名称;修复启动 warning 问题
|
2 years ago |
Jiangjie.Bai
|
011e9ffec4
|
fix: 修复导入导出文件时对于bool类型字段的判断问题
|
2 years ago |
fit2bot
|
de41747bb2
|
perf: 添加 debug tool bar (#8504)
* perf: 添加 debug tool bar
* perf: 修改 config name
Co-authored-by: ibuler <ibuler@qq.com>
|
2 years ago |
fit2bot
|
c3c99cc5e8
|
perf: 优化 redis (#8484)
* perf: 优化 redis
* perf: 优化 redis 时间
* perf: 优化时间
* perf: 修改 ssl
* perf: 修改 ssl
* perf: 修改 ssl name
* perf: 修改名称
Co-authored-by: ibuler <ibuler@qq.com>
|
2 years ago |
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>
|
2 years ago |
fit2bot
|
041302d5d2
|
fix: 修复获取 city 时可能的报错 (#8294)
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
ibuler
|
0a04f0f351
|
perf: 下载 ip 数据库
|
3 years ago |
ibuler
|
44ffd09924
|
fix: 修复可能的 decode error
|
3 years ago |
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>
|
3 years ago |
ibuler
|
7eec50804c
|
perf: 优化 encrypted field
|
3 years ago |
jiangweidong
|
e80b6936a2
|
perf: 兼容AWS上redis[ssl]无证书无法部署的问题
|
3 years ago |
ibuler
|
2a8f8dd709
|
perf: 优化使用两个 ip 库
|
3 years ago |
ibuler
|
475678e29b
|
fix: 修复密码 write only
|
3 years ago |
fit2bot
|
aff5b0035d
|
perf: 优化加密 (#8206)
* perf: 优化加密
* perf: 优化加密
* perf: 优化加密传输
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
jiangweidong
|
64eda5f28b
|
perf: 命令存储ES可根据日期动态建立索引 (#8180)
* perf: 命令存储ES可根据日期动态建立索引
* perf: 优化合并字段
* feat: 修改逻辑
|
3 years ago |
jiangweidong
|
5e70a8af15
|
feat: 支持平台关联算法,支持AIX改密
|
3 years ago |
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>
|
3 years ago |
jiangweidong
|
e151548701
|
perf: 账号管理中查看密码记录日志 (#8157)
|
3 years ago |
ibuler
|
8de57773aa
|
stash it
|
3 years ago |
ibuler
|
7025d46070
|
perf: 控制平台创建
|
3 years ago |
ibuler
|
69f3c85195
|
perf: 添加 category api
|
3 years ago |
Jiangjie.Bai
|
5f370c1c04
|
perf: 优化内置系统用户角色权限
|
3 years ago |
jiangweidong
|
70a07539af
|
perf: 优化部分云厂商的redis连接的问题
|
3 years ago |
fit2bot
|
b610d71e11
|
feat: 添加 临时 password (#8035)
* perf: 添加 template password
* perf: 修改id
* perf: 修改 翻译
* perf: 修改 tmp token
* perf: 修改 token
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
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>
|
3 years ago |
ibuler
|
d418c28e98
|
perf: 修改 base
|
3 years ago |
ibuler
|
ce13b194a5
|
perf: 修改 asset info
|
3 years ago |