Aaron3S
|
b12f83dbea
|
Merge remote-tracking branch 'origin/v3' into v3
|
2 years ago |
Aaron3S
|
c63c000b10
|
perf: 优化异步认识显示名称
|
2 years ago |
ibuler
|
989c338002
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2 years ago |
ibuler
|
8e123304ad
|
pref: 修改 perms accounts
|
2 years ago |
Jiangjie.Bai
|
582a8e0c52
|
fix: 修改 BitChoicesField to_representation swagger 调用报错的问题
|
2 years ago |
jiangweidong
|
6411642ced
|
perf: 优化操作日志一些内容
|
2 years ago |
ibuler
|
9c5b3a03c6
|
pref: 优化 permission actionss
|
2 years ago |
ibuler
|
1cd551e692
|
merge: with remote
|
2 years ago |
ibuler
|
f6e403fd8b
|
pref: 修改 asset permission
|
2 years ago |
feng
|
ba3f2099e6
|
perf: audits
|
2 years ago |
ibuler
|
afe6c8ebbd
|
pref: 修改 applet host api
|
2 years ago |
ibuler
|
2705c38ba1
|
pref: 添加命令启动失败 debug
|
2 years ago |
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>
|
2 years ago |
jiangweidong
|
1e97a23bc5
|
feat: 忘记密码支持手机短信找回,并修改邮箱方式和手机方式统一 (#8960)
* feat: 忘记密码支持通过手机找回,邮箱方式修改为和手机方式一致
* feat: 翻译
* feat: 修改翻译
* fix: 还原
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
2 years ago |
ibuler
|
b0ae9b47ca
|
pref: 修改 applet host
|
2 years ago |
ibuler
|
23e44c49b5
|
pref: 修改 applet deployments
|
2 years ago |
ibuler
|
cf81f08b7a
|
perf: 优化部署 host
|
2 years ago |
ibuler
|
c0540e6787
|
pref: 修改 celery
|
2 years ago |
ibuler
|
8f88b898d0
|
pref: 修改 migrations
|
2 years ago |
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 |
ibuler
|
8688781e15
|
perf: 修改 asset 结构
|
3 years ago |
ibuler
|
3de881fa19
|
perf: 打算重构 asset application
|
3 years ago |
fit2bot
|
e7af037513
|
perf: 修改命令command input 长度问题 (#7996)
* perf: 修改命令command input max_length 1024
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
* perf: 修改命令command input 长度问题
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
3 years ago |
fit2bot
|
52709d2efa
|
feat: 企业微信、钉钉 工作台免密登录(飞书已实现) (#7855)
* feat: 添加oauth接口
* feat: 企业微信支持OAuth认证,工作台免密登录
* feat: 钉钉支持OAuth认证,工作台免密登录
* fix: 修复参数错误
Co-authored-by: halo <wuyihuangw@gmail.com>
|
3 years ago |
fit2bot
|
e0fdfa52b9
|
feat: 支持 magnus (#7965)
* feat: 支持 magnus
* perf: 添加 setting 到 api
* perf: 放出 mongodb
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
老广
|
0ef7a9571c
|
Merge pull request #7800 from jumpserver/pr@dev@feat_core_redis_support_ssl
feat: JumpServer支持部署在使用了ssl的redis上
|
3 years ago |
Jiangjie.Bai
|
aa9ae14e46
|
fix: 修复view action获取
|
3 years ago |
feng626
|
3a26b9d102
|
fix: 修复工单相应bug
|
3 years ago |
feng626
|
4e8defc647
|
fix: 修复上传bug
|
3 years ago |
jiangweidong
|
794139782f
|
feat: JumpServer支持部署在使用了ssl的redis上,可使用证书连接
|
3 years ago |
jiangweidong
|
f04378eaf8
|
feat: JumpServer支持部署在使用了ssl的redis上
|
3 years ago |
ibuler
|
9492518773
|
perf: 修改 redis conn
|
3 years ago |
fit2bot
|
1b007c8c5c
|
perf: 修改权限树 (#7757)
* perf: 修改 rbac tree
* perf: 修改权限树
* perf: 修改用户默认权限
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
fit2bot
|
a20884e2ad
|
perf: 修改 rbac tree (#7743)
* perf: 修改 rbac tree
* perf: 修改verbose name
* fix: 修复系统用户
* fix: 还原 xpack
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
ibuler
|
390b8693df
|
perf: 修改 signal handler
|
3 years ago |
fit2bot
|
dafc416783
|
Fix rbac (#7728)
* perf: 重命名 signal handlers
* fix: 修复 ticket processor 问题
* perf: 修改 ticket 处理人api
* fix: 修复创建系统账号bug
* fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序
* perf: 修改 authentication token
* fix: 修复上传权限bug
* fix: 登录页面增加i18n切换;
* fix: 系统角色删除限制
* perf: 修改一下 permissions tree
* perf: 生成 i18n
* perf: 修改一点点
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
3 years ago |
老广
|
02ca473492
|
Fix rbac (#7690)
* perf: 优化 suggesstion
* perf: 修改 migrations
|
3 years ago |
ibuler
|
e76eec530f
|
perf: 添加migrations
|
3 years ago |
xinwen
|
f460916e84
|
fix: swagger
|
3 years ago |
fit2bot
|
e259d2a9e9
|
fix: fix rbac to dev (#7636)
* feat: 添加 RBAC 应用模块
* feat: 添加 RBAC Model、API
* feat: 添加 RBAC Model、API 2
* feat: 添加 RBAC Model、API 3
* feat: 添加 RBAC Model、API 4
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC 整理权限位
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位
* feat: RBAC 添加默认角色
* feat: RBAC 添加迁移文件;迁移用户角色->用户角色绑定
* feat: RBAC 添加迁移文件;迁移用户角色->用户角色绑定
* feat: RBAC 修改用户模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 修改用户角色属性的使用
* feat: RBAC No.1
* xxx
* perf: 暂存
* perf: ...
* perf(rbac): 添加 perms 到 profile serializer 中
* stash
* perf: 使用init
* perf: 修改migrations
* perf: rbac
* stash
* stash
* pref: 修改rbac
* stash it
* stash: 先去修复其他bug
* perf: 修改 role 添加 users
* pref: 修改 RBAC Model
* feat: 添加权限的 tree api
* stash: 暂存一下
* stash: 暂存一下
* perf: 修改 model verbose name
* feat: 添加model各种 verbose name
* perf: 生成 migrations
* perf: 优化权限位
* perf: 添加迁移脚本
* feat: 添加组织角色迁移
* perf: 添加迁移脚本
* stash
* perf: 添加migrateion
* perf: 暂存一下
* perf: 修改rbac
* perf: stash it
* fix: 迁移冲突
* fix: 迁移冲突
* perf: 暂存一下
* perf: 修改 rbac 逻辑
* stash: 暂存一下
* perf: 修改内置角色
* perf: 解决 root 组织的问题
* perf: stash it
* perf: 优化 rbac
* perf: 优化 rolebinding 处理
* perf: 完成用户离开组织的问题
* perf: 暂存一下
* perf: 修改翻译
* perf: 去掉了 IsSuperUser
* perf: IsAppUser 去掉完成
* perf: 修改 connection token 的权限
* perf: 去掉导入的问题
* perf: perms define 格式,修改 app 用户 的全新啊
* perf: 修改 permission
* perf: 去掉一些 org admin
* perf: 去掉部分 org admin
* perf: 再去掉点 org admin role
* perf: 再去掉部分 org admin
* perf: user 角色搜索
* perf: 去掉很多 js
* perf: 添加权限位
* perf: 修改权限
* perf: 去掉一个 todo
* merge: with dev
* fix: 修复冲突
Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
Michael Bai
|
67a49dc5e9
|
feat: syslog 记录的数据来源于序列类
|
3 years ago |
xinwen
|
f994f5d776
|
fix: redis 订阅 bug
|
3 years ago |
ibuler
|
55fae1667d
|
fix: 修复 redis 连接过多的问题
|
3 years ago |
fit2bot
|
0b16d70c0c
|
fix: 修改翻译 (#7526)
* fix: 修改翻译
* fix: 修改保存数据库翻译
* fix: 修复翻译为none问题
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
3 years ago |
ibuler
|
451e61bb61
|
perf: 优化 celery 任务中的数据库连接问题
perf: add comment
|
3 years ago |
fit2bot
|
4343b6487d
|
fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 (#7495)
* fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示
fix tapd 1145454465001008371
* perf: 优化 send code api,避免暴力常识
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
ibuler
|
145c7952c9
|
perf: 优化 ops 任务,支持 i18n
- 内置任务名称支持了 i18n,数据库存英文,返回是翻译一下
- 任务执行中,添加 language 上下文
|
3 years ago |
feng626
|
b0932e5137
|
feat: 逃生通道
|
3 years ago |
feng626
|
100bfe0304
|
feat: 新增获取k8s pod namespace container接口
|
3 years ago |
feng626
|
11fd9a6567
|
feat: 配置私钥密码
|
3 years ago |
halo
|
c2d271f00b
|
feat: rdp协议新增username表达式,匹配更多特殊字符
|
3 years ago |
halo
|
90de229631
|
feat: rdp协议username支持输入中文和$
|
3 years ago |
ibuler
|
b92530f0b9
|
perf: 优化通知,对支持 markdown 的发 markdown
|
3 years ago |
Michael Bai
|
303102d40b
|
fix: 删除一些启动时大量输出的debug日志
|
3 years ago |
ibuler
|
fa5c433c7c
|
perf: 优化启动脚本,避免启动超时
|
3 years ago |
xinwen
|
b3acc0d451
|
fix: 去掉 get_docker_mem_usage_if_limit 日志
|
3 years ago |
xinwen
|
1bc14c53d4
|
fix: 企业微信发送报错
|
3 years ago |
xinwen
|
ea6c28fa0d
|
fix: 修改 cgroup memory log
|
3 years ago |
fit2bot
|
c7f2afc3c1
|
fix: redis lock bug (#7338)
Co-authored-by: feng626 <1304903146@qq.com>
|
3 years ago |
xinwen
|
16fae00e0e
|
feat: xrdp 远程应用
|
3 years ago |
feng626
|
adb9f01231
|
feat: 密码计划邮件提醒
|
3 years ago |
xinwen
|
24bbe7c31f
|
fix: 计算docker limit 内存使用率时区分 cgroup v1 v2
|
3 years ago |
xinwen
|
36c6299a03
|
fix: redis 锁在redis集群环境报错
|
3 years ago |
ibuler
|
c85249be36
|
perf: 优化订阅处理,形成框架
|
3 years ago |
xinwen
|
a313e011ef
|
perf: 内存使用率兼顾 docker cgroup limit
|
3 years ago |
xinwen
|
d94c515cfc
|
fix: 验证码逻辑错误
|
3 years ago |
fit2bot
|
d2df8acd84
|
fix: 修复数据库连接没有关闭问题 (#7227)
* fix: 修复数据库连接没有关闭的bug
perf: websocket 断开也添加关闭数据库连接
* fix: 修复数据库连接没有关闭问题
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
fit2bot
|
17303c0550
|
pref: 优化MFA (#7153)
* perf: 优化mfa 和登录
* perf: stash
* stash
* pref: 基本完成
* perf: remove init function
* perf: 优化命名
* perf: 优化backends
* perf: 基本完成优化
* perf: 修复首页登录时没有 toastr 的问题
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
3 years ago |
Jiangjie.Bai
|
07c60ca75d
|
feat: 支持二级登录资产 (#7143)
* feat: 支持su切换系统用户
* feat: 支持su切换系统用户
* feat: 支持su切换系统用户
|
3 years ago |
ibuler
|
d484885762
|
perf: 修复ansible stdout 中非utf8的问题
|
3 years ago |
xinwen
|
631f802961
|
fix: 钉钉报错的时取得字段不对
|
3 years ago |
fit2bot
|
f88e5de3c1
|
perf: 优化用户创建邮件 (#7072)
* perf: 优化通知中的连接点击
* perf: 优化用户创建邮件
* perf: 优化时间日期
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
feng626
|
25d1b71448
|
fix: 修复分时登陆bug
|
3 years ago |
fit2bot
|
c244cf5f43
|
pref: 修改使用的消息内容 (#7061)
* perf: 再次优化通知
* pref: 修改使用的消息内容
* perf: 修复url地址
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
feng626
|
dc13134b7b
|
fix: 修复acl 选择时间段为空bug
|
3 years ago |
ibuler
|
25ea3ba01d
|
perf: 修改sdk位置
|
3 years ago |
ibuler
|
072865f3e5
|
perf: 优化修改 sdk 位置
|
3 years ago |
ibuler
|
d5c9ec1c3d
|
perf: 优化位置
|
3 years ago |
ibuler
|
487c945d1d
|
perf: 修改代码位置,用户sugestion增加到6个
|
3 years ago |
fit2bot
|
00d434ceea
|
perf: 优化消息通知 (#7024)
* perf: 优化系统用户列表
* stash
* perf: 优化消息通知
* perf: 修改钉钉
* perf: 修改优化消息通知
* perf: 修改requirements
* perf: 优化datetime
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
fit2bot
|
9acfd461b4
|
feat: user login acl (#6963)
* feat: user login acl
* 添加分时登陆
* acl 部分还原
* 简化acl判断逻辑
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
|
3 years ago |
fit2bot
|
63638ed1ce
|
feat: 首页的 chanlege 和 MFA 统一 (#6989)
* feat: 首页的 chanlege 和 MFA 统一
* 登陆样式调整
* mfa bug
* q
* m
* mfa封装组件 前端可修改配置
* perf: 添加翻译
* login css bug
* perf: 修改一些风格
* perf: 修改命名
* perf: 修改 mfa code 不是必填
* mfa 前端统一组件
* stash
* perf: 统一验证码
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
fit2bot
|
fa68389028
|
perf: 去掉单独的flash msg (#7013)
* perf: 去掉单独的flash msg
perf: 修改使用库
* fix: guangbug
* pref: 修改 context
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: xinwen <coderWen@126.com>
|
3 years ago |
halo
|
63b338085a
|
feat: 修改username校验,telnet协议支持输入中文
|
3 years ago |
ibuler
|
0207fe60c5
|
perf: 修改ip城市获取算法
perf: 优化使用lfs
|
3 years ago |
xinwen.xu
|
d4bdc74bd8
|
feat: 授权过期通知
|
3 years ago |
jiangweidong
|
2f25e2b24c
|
fix: 系统用户认证方式从托管密码更新到手动输入模式后,不填写用户名报错
|
3 years ago |
ibuler
|
8c3ab31e4e
|
fix: 修复由于修改filter引起的问题
|
3 years ago |
Jiangjie.Bai
|
476e6cdc2f
|
Merge pull request #6932 from jumpserver/pr@dev@perf_remove_djangopo
perf: 去掉django.po
|
3 years ago |
ibuler
|
0b593f4555
|
perf: 优化drf filter, 修改terminal filter
perf: 去掉debug
perf: 去掉debug
|
3 years ago |
ibuler
|
b415ee051d
|
perf: 去掉django.po
|
3 years ago |
fit2bot
|
43f30b37da
|
fix: 用户手机号没有校验 (#6875)
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
3 years ago |
xinwen
|
bf68ddf09e
|
fix: 腾讯短信检测是否发送成功
|
3 years ago |
fit2bot
|
7a45f4d129
|
perf: 优化短信 (#6826)
* perf: 优化短信
* refactor: 适配新的短信模板配置
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: xinwen <coderWen@126.com>
|
3 years ago |
feng626
|
f64740c2db
|
fix: 修改翻译及建议接口
|
3 years ago |
feng626
|
ea4dccbab8
|
fix: 修复工单bug
|
3 years ago |
ibuler
|
817c02c667
|
fix: 修复is_app bug
|
3 years ago |
xinwen
|
3e737c8cb8
|
fix: 修复短信问题
|
3 years ago |
xinwen
|
654ec4970e
|
更改设置接口
|
3 years ago |
Michael Bai
|
42c3c85863
|
fix: 修改翻译
|
3 years ago |
xinwen
|
b1fceca8a6
|
feat: 添加短信服务和用户消息通知
|
3 years ago |
fit2cloud-jiangweidong
|
905014d441
|
feat: 改密计划支持数据库改密 (#6709)
* feat: 改密计划支持数据库改密
* fix: 将数据库账户信息不保存在资产信息里,保存到自己的存储中
* perf: 早餐村
* perf: 修改account
* perf: 修改app和系统用户
* perf: 优化系统用户和应用关系
* fix: 修复oracle不可连接问题
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
|
3 years ago |
fit2bot
|
0f87f05b3f
|
feat: 工单多级审批 + 模版创建 (#6640)
* feat: 工单多级审批 + 模版创建
* feat: 工单权限处理
* fix: 工单关闭后 再审批bug
* perf: 修改一点
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
xinwen
|
21a7ec9fec
|
fix: 升级时清空缓存
|
3 years ago |
Bai
|
aa37d86959
|
fix: 将flower放到web服务中;修复账号列表过滤节点的逻辑,获取所有子节点。
|
3 years ago |
ibuler
|
f390556a87
|
perf: 优化spm请求的问题
|
3 years ago |
Bai
|
0c8c926aac
|
fix: 修复校验用户登录规则的API权限
|
3 years ago |
ibuler
|
1605a57df6
|
perf: 修复应用账号选择部分导出问题
|
3 years ago |
fit2bot
|
54751a715c
|
feat: 添加 飞书 (#6602)
* feat: 添加 飞书
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: wenyann <64353056+wenyann@users.noreply.github.com>
|
3 years ago |
Bai
|
33236aaa47
|
fix: 修复启动脚本beat进程偶尔不会结束的问题
|
3 years ago |
Bai
|
7959f84bba
|
fix: 修改启动脚本
|
3 years ago |
fit2bot
|
39ce60c93a
|
feat: 系统监控添加 Core/Celery Terminal; 修改检测终端状态逻辑; (#6570)
* feat: 系统监控添加 Core Terminal; 修改检测终端状态逻辑;
* feat: 添加management包
* feat: 添加management包
* feat: 添加 start 模块
* feat: 修改 start 模块
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动命令目录结构
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
* feat: 修改启动脚本
Co-authored-by: Bai <bugatti_it@163.com>
|
3 years ago |
xinwen
|
4085df913b
|
feat: 记录网关可连接性
|
3 years ago |
fit2bot
|
66b0173e20
|
feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive (#6564)
* feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive
* feat: 服务性能告警指标包含:Core服务和各组件状态;指标包括:cpu/disk/memory/is_alive 2
Co-authored-by: Bai <bugatti_it@163.com>
|
3 years ago |
fit2bot
|
905d0d5131
|
perf: 统一应用树 (#6535)
* perf: 添加应用树api
* perf: perms tree
* perf: 统一应用树
* perf: 修改icon
* perf: stash it
* perf: 优化应用账号
* perf: 基本完成应用账号重构
* perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
Bai
|
689bd093be
|
云管中心同步任务支持设置同步IP网段和协议组(修改特权用户文案)
|
3 years ago |
ibuler
|
f772296dff
|
fix(assets): 修复patch system user的问题
perf: 去掉debug
|
3 years ago |
fit2bot
|
ec8dca90d6
|
refactor: 整合系统用户和管理用户 (#6236)
* perf: 整合系统用户和管理用户
* stash
stash
perf: 优化系统用户和资产的表结构
* perf: 添加信号
* perf: 添加算法
* perf: 去掉 asset user backends
* perf: 整理系统用户api
* perfF: 暂存一下
* stash
* perf: 暂存一下
* perf: 暂存
* xxx
* perf: ...
* stash it
* xxx
* xxx
* xxx
* xxx
* xxx
* stash it
* 修改Protocols
* perf: 修改创建authbook信号
* perf: 添加auth info
* .stash
* perf: 基本完成
* perf: 修复完成
* perf: 修复更改的id
* perf: 修复迁移过去数量不对的问题
* perf: 修改systemuser
* fix: 修复批量编辑近期的问题
* fix: 修复authbook加载的问题
* xxx
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
Bai
|
4fd7f0e949
|
fix: 修复自动生成系统用户密码中包含 {{ 双字符时测试可连接性失败的问题
|
3 years ago |
fghbng@qq.com
|
35941ddf7f
|
feat: 优化缓存,将会话的缓存拿出来
|
3 years ago |
健健
|
94fc1fb53b
|
fix: 导入数据解析 title 时,没有过滤 read only 字段 (#6269)
* feat: Update README (#6182)
* feat: Update README
* feat: Update README
* Update README.md
* feat: update README
* fix: 导入数据解析 title 时,没有过滤 read only 字段
type,type_display 翻译都是一样的,导出时使用的是 type,导入时识别成 type_display
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
4 years ago |
xinwen
|
a9bdbcf7c6
|
fix: metadata api view 报错
|
4 years ago |
xinwen
|
a809eac2b8
|
fix: 修复获取 Metadata 时,获取的总是 action 为 metadata
|
4 years ago |
Michael Bai
|
572d0e3f27
|
fix: 修复parser没有处理int类型数据的问题
|
4 years ago |
xinwen
|
3743761024
|
fix: 修复绑定企业微信&钉钉的一些问题
|
4 years ago |
ibuler
|
726fd94f65
|
fix: 修复 xslx 提交数字类型报错
|
4 years ago |
Bai
|
0ecd9fa32a
|
fix: 修复自动生成公钥优先使用dss格式的问题(默认优先使用rsa)
|
4 years ago |
xinwen
|
c16319ec48
|
feat: 添加企业微信,钉钉扫码登录
|
4 years ago |
ibuler
|
4d6d4cbc22
|
perf: 优化登录,cas, openid 自动登录
|
4 years ago |
ibuler
|
d1a005f750
|
perf: 优化MFA verify requierd
|
4 years ago |
xinwen
|
99cce185dd
|
fix: 添加启动失效缓存
|
4 years ago |
xinwen
|
7e4f20f443
|
refactor: 移动 PermissionsMixin 位置
|
4 years ago |
fit2bot
|
32fe8f674c
|
perf: csv upload (#5894)
perf: 修改翻译
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
ibuler
|
7dfd0ee8fe
|
fix(orgs): 修复访问 current org api 错误
perf(users): 优化用户删除和移除行为
perf: 优化组织权限判断
|
4 years ago |
Jiangjie.Bai
|
64641a18e6
|
feat: ACL (#5696)
* feature: acl (v0.1)
* feature: acl (v0.2)
* feature: acl (v0.3)
* feature: acl (v0.4)
* feature: acl (v0.5)
* feature: acl (v0.6)
* feature: acl (v0.7)
* feature: acl (v0.8)
* feature: acl (v0.9)
* feature: acl (v1.0)
* feature: acl (v1.1)
* feature: acl (v1.2)
* feature: acl (v1.3)
* feature: acl (v1.4)
* feature: acl (v1.5)
* feature: acl (v1.6)
* feature: acl (v1.7)
* feature: acl (v1.8)
* feature: acl (v1.9)
* feature: acl (v2.0)
* feature: acl (v2.1)
* feature: acl (v2.2)
* feature: acl (v2.3)
* feature: acl (v2.4)
* feature: acl (v2.5)
* feature: acl (v2.6)
* feature: acl (v2.7)
* feature: acl (v2.8)
* feature: acl (v2.9)
* feature: acl (v3.0)
* feature: acl (v3.1)
* feature: acl (v3.2)
* feature: acl (v3.3)
* feature: acl (v3.4)
* feature: acl (v3.5)
* feature: acl (v3.6)
* feature: acl (v3.7)
* feature: acl (v3.8)
* feature: acl (v3.9)
* feature: acl (v4.0)
* feature: acl (v4.1)
* feature: acl (v4.2)
* feature: acl (v4.3)
* feature: acl (v4.4)
|
4 years ago |
xinwen
|
184e8b31e6
|
perf: 优化下 `orgid_nodekey_assetsid_mapping`
|
4 years ago |
xinwen
|
c4eacbabc6
|
refactor: 重构缓存框架
|
4 years ago |
xinwen
|
ccb0509d85
|
feat: 批量导入解析为Json的接口添加 `title` 字段
|
4 years ago |
xinwen
|
886393c539
|
feat: 添加批量导入时将其他格式(csv, excel)解析为Json的接口
|
4 years ago |
fit2bot
|
0aa2c2016f
|
perf(project): 优化命名的风格 (#5693)
perf: 修改错误的地
perf: 优化写错的几个
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
xinwen
|
3e7e01418d
|
perf: 优化命令记录慢的问题
|
4 years ago |
xinwen
|
09bdff4a67
|
fix: 缓存框架 expire_fields 可能报错
|
4 years ago |
fit2bot
|
f548b4bd2b
|
feat: serializer 添加默认值,前端可以调用 (#5666)
perf: 优化默认值
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
fit2bot
|
a56ac7b34e
|
perf(orgs): 默认组织改为实体组织,并支持全局组织 (#5617)
* perf(orgs): 默认组织改为实体组织
* perf: 添加获取当前组织信息的api
* perf: 资产列表在 root 组织下的表现
* fix: 修复 root 组织引起的问题
* perf: 优化OrgModelMixin save; org_root获取; org_roles获取; UserCanUseCurrentOrg权限类
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
6f3ead3c42
|
perf: 优化系统用户生成密码的复杂度 (#5648)
* perf: 优化系统用户生成密码的复杂度
* perf: 修改 common.random_string
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
xinwen
|
1036d1c132
|
fix: 修复授权树一些问题
|
4 years ago |
ibuler
|
5de5fa2e96
|
fix: 修复获取不到 org 的问题
|
4 years ago |
fit2bot
|
a7ab7da61c
|
feat: 添加限制用户只能从source登录的功能 (#5592)
* stash it
* feat: 添加限制用户只能从source登录的功能
* fix: 修复小错误
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
xinwen
|
d795867916
|
perf: 优化批量更新会查询全部数据的问题
|
4 years ago |
xinwen
|
799d1e4043
|
feat: 资产授权规则添加是否有效的过滤条件
|
4 years ago |
ibuler
|
b03642847e
|
perf: 去掉 data_tree
|
4 years ago |