github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,898 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

293 Commits (5207b99696228252d182cb875b5fb4dade62fa10)

Author SHA1 Message Date
fit2bot 0ae9b76f04
perf: 优化构建 (#9179) 
* perf: 优化构建

* fix: 修正构建错误

* perf: 优化构建依赖包

* fix: 修正构建判断

* perf: 现阶段还需要 debug 工具

Co-authored-by: 吴小白 <296015668@qq.com>
 2022-12-09 10:21:36 +08:00
dependabot[bot] 0aa3d650d4
chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2018.1.18 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2018.01.18...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-08 00:55:41 +00:00
jiangweidong e7e3b603a9 perf: 清理无用的依赖包 2022-12-07 10:53:54 +08:00
ibuler 1e669a7edb perf: 修改 requirements 2022-12-05 19:28:11 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +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
吴小白 392ae18d85 feat: 使用 uvicorn 取代 daphne 2022-11-27 05:56:53 +08:00
dependabot[bot] 5f4c7e8cf0
build(deps): bump pillow from 9.1.1 to 9.3.0 in /requirements 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.1.1 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.1.1...9.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-22 11:21:50 +00:00
Eric 7ac9681f0d perf: asyncio ws task log 2022-11-16 14:34:56 +08:00
dependabot[bot] 4ceaba60ed build(deps): bump django from 3.2.15 to 3.2.16 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-04 11:13:51 +08:00
jiangweidong 40b7331ec0 feat: 支持网域网关应用改密-添加依赖 2022-11-04 11:13:07 +08:00
jiangweidong c295f44d9c perf: 支持部署在开启认证的Redis Sentinel 2022-11-01 14:55:33 +08:00
feng f743dea1fd perf: mysql postgresql 2022-10-24 20:24:56 +08:00
fit2bot c7882a615f
perf: 升级依赖 (#8955) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-10-13 18:24:57 +08:00
ibuler cf69caaade perf: 修改 ansible runner 版本 2022-09-28 14:17:49 +08:00
Jiangjie.Bai 0eccd313ff fix: 锁定依赖包版本 pyOpenSSL==22.0.0 2022-09-27 16:14:18 +08:00
Jiangjie.Bai 218f917f69 fix: 锁定依赖包版本 pyOpenSSL==22.0.0 2022-09-27 15:47:23 +08:00
ibuler 00e1dd6996 fix: remote gateway filter address 2022-09-26 11:01:21 +08:00
老广 863140e185
Merge pull request #8733 from jumpserver/dependabot/pip/requirements/django-3.2.15 
build(deps): bump django from 3.2.14 to 3.2.15 in /requirements
 2022-09-19 10:14:54 +08:00
dependabot[bot] ca965aca9e
build(deps): bump flower from 1.0.0 to 1.2.0 in /requirements 
Bumps [flower](https://github.com/mher/flower) from 1.0.0 to 1.2.0.
- [Release notes](https://github.com/mher/flower/releases)
- [Commits](https://github.com/mher/flower/compare/v1.0.0...v1.2.0)

---
updated-dependencies:
- dependency-name: flower
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-13 23:07:48 +00:00
dependabot[bot] 7bd7be78a4
build(deps): bump django from 3.2.14 to 3.2.15 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.14 to 3.2.15.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.14...3.2.15)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-06 07:50:20 +00:00
jiangweidong 8e5833aef0 修改一下顺序 2022-09-06 15:49:36 +08:00
jiangweidong f20b465ddf feat: 改密计划支持MongoDB改密 2022-09-06 15:49:36 +08:00
广宏伟 4276ddc2cc perf: 修改脚步 2022-09-05 18:50:33 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
ibuler dca1388a67 perf: 修改依赖 2022-08-24 14:23:42 +08:00
吴小白 1432fe1609 fix: 添加 openssh-client 依赖包 2022-08-19 17:13:56 +08:00
ibuler 11d9a0e9cc perf: 支持嵌套创建 2022-08-08 11:39:55 +08:00
fit2bot b27b02eb9d
feat: Cloud 支持局域网 IP 扫描 (#8589) 
* feat: Cloud 支持局域网 IP 扫描

* feat: Cloud 支持局域网 IP 扫描

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-08-05 14:45:25 +08:00
jiangweidong e7229963bf perf: 更换oracle依赖包 2022-07-27 13:42:14 +08:00
Jiangjie.Bai ca49029d8f fix: 锁定依赖 keystoneauth1==3.4.0 2022-07-20 17:22:22 +08:00
ibuler 12036f8c96 perf: 修改 django 版本 2022-07-20 17:01:06 +08:00
fit2bot e09383ecf4
fix: django 3.1.14 (#8613) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-18 13:24:31 +08:00
fit2bot af5295d30e
fix: django 还原 (#8609) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-18 11:53:47 +08:00
huangzhiwen 0eaca0c1cb fix: 解决mac m1 pip install pymssql报错问题 2022-07-15 18:06:34 +08:00
fit2cloud 8824b6b54e fix: 解决pip不能安装psycopg2-binary和pymssql问题 2022-07-15 18:06:34 +08:00
dependabot[bot] af080fe38d build(deps): bump django from 3.2.13 to 3.2.14 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.13...3.2.14)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-13 16:51:22 +08:00
dependabot[bot] 2f71ee71b9 build(deps): bump django from 3.2.12 to 3.2.13 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.12...3.2.13)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-05 20:28:20 +08:00
feng626 af2d927c1f perf: del pandas 2022-06-30 20:20:09 +08:00
fit2bot de41747bb2
perf: 添加 debug tool bar (#8504) 
* perf: 添加 debug tool bar

* perf: 修改 config name

Co-authored-by: ibuler <ibuler@qq.com>
 2022-06-29 14:48:54 +08:00
ibuler b784d8ba87 fix: 升级依赖库版本，解决生成 key 时的内存泄露 2022-06-27 19:11:43 +08:00
ibuler 8c31e8e634 perf: 修改 sdk 版本 2022-06-23 19:18:15 +08:00
feng626 648fabbe03 fix: 修复工单迁移文件 2022-06-23 19:15:57 +08:00
ibuler dbc5b7bdc3 perf: 升级 tencent sdk 2022-06-23 17:29:12 +08:00
ibuler e6abdbdadc perf: 修改 req version 2022-06-22 18:17:57 +08:00
ibuler 8b819f3779 perf: 优化登录 2022-06-20 19:22:48 +08:00
ibuler 379c7198da pref: 去掉 django-redis-cache 依赖 2022-06-20 14:11:59 +08:00
ibuler f7cbcc46f4 perf: 升级 ansible version 2022-05-31 16:01:21 +08:00
Chayim I. Kirshen 1322106c91 bumping redis-py to 4.3.1 (latest) 2022-05-30 13:30:25 +08:00
ibuler 83571718e9 perf: 修改版本 2022-05-16 20:02:10 +08:00
ibuler 521ec0245b fix: ipdb 版本 2022-05-16 20:02:10 +08:00
feng626 d87dc7cbd6 fix: import ipdb 2022-05-16 17:51:37 +08:00
dependabot[bot] 71f8b40e21 build(deps): bump paramiko from 2.7.2 to 2.10.1 in /requirements 
Bumps [paramiko](https://github.com/paramiko/paramiko) from 2.7.2 to 2.10.1.
- [Release notes](https://github.com/paramiko/paramiko/releases)
- [Changelog](https://github.com/paramiko/paramiko/blob/main/NEWS)
- [Commits](https://github.com/paramiko/paramiko/compare/2.7.2...2.10.1)

---
updated-dependencies:
- dependency-name: paramiko
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-30 11:06:49 +08:00
ibuler 8718dc6751 pref: 优雅一发 2022-03-25 14:44:33 +08:00
ibuler 9e284f96e5 perf: 修改依赖写法，避免 github 认错 2022-03-25 14:44:33 +08:00
jiangweidong e993f31b6d
feat: 支持纳管百度云资产 (#7921) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-21 10:39:47 +08:00
Jiangjie.Bai 8a8ed90eef fix: 保留之前的jms_oidc_rp包 2022-03-04 18:12:46 +08:00
老广 3f9f9351f3
Fix rbac (#7737) 
* perf: 修改 rbac role bingding

* fix: suggestion perm

* perf: 修改 requirements

* perf: 修改 rbac

* fix: auditor_perms

Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-04 10:16:21 +08:00
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>
 2022-03-02 20:48:43 +08:00
Jiangjie.Bai 03afa4f974
Fix rbac (#7713) 
* fix: token 系统用户增加 protocol

* fix: 修复清除orphan session时同时清除对应的 session_task

* perf: 修改 connection token api

* fix: 修复无法获取系统角色绑定的问题

* perf: 增加 db terminal 及 magnus 组件

* perf: 修改 migrations

* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑

* fix: 修改判断backend认证逻辑

* fix: 修复资产账号查看密码跳过mfa

* fix: 修复用户组授权权限错误

* feat: 支持COS对象存储

* feat: 升级依赖 jms_storage==0.0.42

* fix: 修复 koko api 问题

* feat: 修改存储翻译信息

* perf: 修改 ticket 权限

* fix: 修复获取资产授权系统用户 get_queryset

* perf: 抽取 ticket

* perf: 修改 cmd filter 的权限

* fix: 修改 ticket perm

* fix: 修复oidc依赖问题

Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-02-28 19:28:58 +08:00
Jiangjie.Bai edfca5eb24
Fix rbac (#7699) 
* perf: 优化 suggesstion

* perf: 修改 migrations

* feat: 添加OIDC认证逻辑

* perf: 修改 backend

* perf: 优化认证backends

* perf: 优化认证backends

* perf: 优化CAS认证, 用户多域名进行访问时回调到各自域名

Co-authored-by: ibuler <ibuler@qq.com>
 2022-02-25 19:23:59 +08:00
fit2bot 534cbf1281 perf: 修改依赖版本 (#7666) 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* perf: 修改依赖版本

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-02-22 18:29:49 +08:00
fit2bot abe5fa9036 perf: 修改依赖库版本 (#7661) 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* perf: 修改依赖库版本

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-02-22 18:29:49 +08:00
Jiangjie.Bai 83ff8dbf26
fix: rbac 合并 (#7658) 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* fix: 修复消息订阅权限

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: feng626 <1304903146@qq.com>
 2022-02-21 16:24:03 +08:00
Michael Bai 8d6498c8f0 fix: 升级依赖 jms-storage==0.0.41 2022-01-18 17:01:02 +08:00
Michael Bai aea2db84e8 fix: 添加deb依赖: libaio-dev freetds-dev 2022-01-17 13:57:08 +08:00
feng626 b0932e5137 feat: 逃生通道 2022-01-12 20:22:36 +08:00
feng626 100bfe0304 feat: 新增获取k8s pod namespace container接口 2021-12-31 15:54:59 +08:00
jiangweidong c05951b6c4 feat: 添加数据库SQLServer改密功能的python依赖库 2021-12-17 11:20:09 +08:00
Michael Bai 2de769ecad chore: 修改依赖版本: jms-storage==0.0.40 2021-12-13 10:47:09 +08:00
ibuler f27df2f523 fix: 修复 openstack 同步依赖 2021-12-09 19:28:22 +08:00
fit2bot 3962af7c4f
feat: 支持saml2协议的单点登录，合并代码 (#7347) 
* fix: 支持saml2协议的单点登录

* feat: 支持saml2协议的单点登录，合并代码

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2021-12-09 15:47:21 +08:00
feng626 d56de16563 fix: 依赖bug 2021-12-07 19:01:14 +08:00
feng626 adb9f01231 feat: 密码计划邮件提醒 2021-12-07 17:00:33 +08:00
xinwen 36c6299a03 fix: redis 锁在redis集群环境报错 2021-12-03 19:23:44 +08:00
jiangweidong 88ea7ae149 feat: 云管同步中心支持OpenStack资产同步，所需python库依赖 2021-11-24 14:28:11 +08:00
Michael Bai 37fef6153a fix: 修改依赖包版本: jumpserver-django-oidc-rp==0.3.7.8 2021-10-26 15:16:24 +08:00
fit2bot 00d434ceea
perf: 优化消息通知 (#7024) 
* perf: 优化系统用户列表

* stash

* perf: 优化消息通知

* perf: 修改钉钉

* perf: 修改优化消息通知

* perf: 修改requirements

* perf: 优化datetime

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-20 19:45:37 +08:00
ibuler baee71e4b8 perf: 添加requirements 2021-10-15 11:31:06 +08:00
ibuler 6459c20516 perf: Django语言文件推送到lfs 
perf: 修改mac依赖，添加安装 git lfs

perf: 修改添加 mac 开发环境依赖
 2021-10-14 16:30:18 +08:00
ibuler 0207fe60c5 perf: 修改ip城市获取算法 
perf: 优化使用lfs
 2021-10-14 10:35:18 +08:00
ibuler f8921004c2 perf: 修改依赖版本 2021-09-29 14:42:11 +08:00
ibuler b415ee051d perf: 去掉django.po 2021-09-23 10:26:39 +08:00
wojiushixiaobai 76fb547551 perf: 优化依赖包 2021-09-17 16:14:15 +08:00
wojiushixiaobai 246f5d8a11 fix: 添加依赖 2021-09-16 23:24:02 +08:00
wojiushixiaobai 6c98bd3b48 fix: 添加 pg 依赖包 2021-09-16 23:24:02 +08:00
Michael Bai 6fb4c1e181 修改依赖包版本 jumpserver-django-oidc-rp==0.3.7.7 2021-09-16 19:49:42 +08:00
xinwen b1fceca8a6 feat: 添加短信服务和用户消息通知 2021-09-09 16:47:24 +08:00
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>
 2021-09-09 16:04:54 +08:00
Bai 7ea8205672 feat: 云管中心添加GCP 2021-09-06 18:21:15 +08:00
Bai 78c61d5afa feat: 升级依赖 jms-storage==0.0.39 2021-08-12 18:38:10 +08:00
Bai ee712d9a9d feat: 升级依赖 s3transfer==0.5.0 2021-08-12 18:38:10 +08:00
ibuler 1bf3ff5e1b perf: 修改依赖包版本 2021-08-02 17:55:22 +08:00
Bai 290d584ac9 perf: 校验系统用户/账号密码不能包含 {{ 字符；升级依赖包ansible==2.9.24 2021-07-23 19:00:43 +08:00
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>
 2021-07-08 14:23:18 +08:00
wojiushixiaobai a02d80a2ae feat: arm64 支持 2021-06-22 14:44:47 +08:00
jiangweidong 40eb7c79bb feat: 添加青云SDK 2021-06-21 15:57:21 +08:00
Bai f91bef4105 feat: 修改依赖包版本号: jms-storage-sdk==0.0.37 2021-06-04 14:37:02 +08:00
ibuler 3e11249e8c perf: upgrade requirements version 2021-03-30 10:25:30 +08:00
Bai 4e55d0f1e4 添加依赖: (azure-identity==1.5.0)(azure-mgmt-subscription==1.0.0) 2021-03-18 20:30:59 +08:00