Commit Graph

  • beac2a1514 perf: 优化获取账号 su-from-accounts 时,不包含自己和以自己为 su-from 的账号 Bai 2022-12-08 13:37:35 +08:00
  • b97b50ab31 perf: 支持sentinel开启ssl(Sentinel和Redis公用一套证书,无额外增加配置项) jiangweidong 2022-11-24 14:50:12 +08:00
  • d8a8c8153b fix: TraditionalOpenSSL private ssh key Eric 2022-12-03 16:05:26 +08:00
  • a68ad7be68 perf: support ed25519 SSH Key fix: codacy ci fix: password use bytes Eric 2022-11-19 00:24:19 +08:00
  • 0aa3d650d4 chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements dependabot[bot] 2022-12-08 00:55:41 +00:00
  • e5afbd4118 perf: k8s tree api (#9169) fit2bot 2022-12-07 23:55:56 +08:00
  • c14b97419d feat: 增加跳过的主机统计, 增加每台主机执行情况api Aaron3S 2022-12-07 20:13:26 +08:00
  • 66bdc375df Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-07 19:30:26 +08:00
  • 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题; Bai 2022-12-07 19:26:25 +08:00
  • a27b43107c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-07 18:59:28 +08:00
  • 0c7de50708 perf: 修改 display field ibuler 2022-12-07 18:58:57 +08:00
  • d252ee41ed Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-07 18:38:12 +08:00
  • 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; Bai 2022-12-07 18:38:03 +08:00
  • 6a1c5aba12 perf: 修改一些翻译 ibuler 2022-12-07 17:24:30 +08:00
  • 02a03e1a28 perf: merge i18n ibuler 2022-12-07 16:02:18 +08:00
  • da36ce9dfd perf: merge connect token rdp option ibuler 2022-12-07 15:13:32 +08:00
  • dbee3ed30d feat: connect token 添加 Rdp options ibuler 2022-12-07 15:09:01 +08:00
  • e7e3b603a9 perf: 清理无用的依赖包 jiangweidong 2022-12-07 10:13:08 +08:00
  • 1cab84bb62 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-06 19:54:15 +08:00
  • bf5da83008 perf: 修改授权 API Name Bai 2022-12-06 19:53:36 +08:00
  • 07b3774d3d feat: 增加运行的内置变量,优化self资源的代码 Aaron3S 2022-12-06 19:43:32 +08:00
  • d92b198a12 perf: 优化ops代码 Aaron3S 2022-12-06 17:30:54 +08:00
  • 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty Bai 2022-12-06 19:41:26 +08:00
  • 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField Bai 2022-12-06 18:50:21 +08:00
  • c9bf99468c feat: 添加 command-review API Bai 2022-12-06 18:26:07 +08:00
  • 71e76e5075 feat: 添加su-from-accountsAPI Bai 2022-12-06 17:32:48 +08:00
  • b6afe77bc0 perf: 调整登录页样式 “huailei000” 2022-12-06 17:37:36 +08:00
  • b89720017b Merge pull request #9162 from jumpserver/pr@dev@feat_clickhouse 老广 2022-12-06 17:25:24 +08:00
  • 803d68f3fe feat: 增加clickhouse jiangweidong 2022-12-06 17:13:37 +08:00
  • 7842e3e5ab Merge: v3 to dev (#9160) Jiangjie.Bai 2022-12-06 11:03:14 +08:00
  • 9ef5f17d5e Merge pull request #9158 from jumpserver/pr@dev@to_v3 老广 2022-12-05 19:47:05 +08:00
  • 1e669a7edb perf: 修改 requirements ibuler 2022-12-05 19:28:11 +08:00
  • daf279304a perf: 修改完冲突了 ibuler 2022-12-05 18:54:12 +08:00
  • 2168610ffe perf: 修改合并引起的 migrations 依赖问题 ibuler 2022-12-05 16:07:14 +08:00
  • e91cbb9c97 merge: with v3 ibuler 2022-12-05 15:03:21 +08:00
  • 873afd239e chore: relove conflict ibuler 2022-12-05 13:41:28 +08:00
  • 80e550b71a fix: 修复 supertoken 创建 ibuler 2022-12-05 13:37:37 +08:00
  • 1a9f520c1f Merge to local v3 Bai 2022-12-05 13:32:33 +08:00
  • cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段; Bai 2022-12-05 13:27:51 +08:00
  • ca228074e3 perf: 修改 migrations 依赖 ibuler 2022-12-05 12:58:09 +08:00
  • 0047af4584 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-05 12:42:39 +08:00
  • 38b1701b33 perf: 修改 migrations, 修改 Connect token ibuler 2022-12-05 12:42:15 +08:00
  • 03e62b5bc1 perf: asset mini feng 2022-12-05 11:48:41 +08:00
  • 74b783f62f perf: 合并迁移文件 Aaron3S 2022-12-05 11:24:56 +08:00
  • 8a7ecda4f6 perf: asset add automation_enabled_info (#9154) fit2bot 2022-12-05 11:21:01 +08:00
  • d25d580ba4 perf: 合并 connect token ibuler 2022-12-05 11:06:50 +08:00
  • 669ccb502f perf: 修改 connect token ibuler 2022-12-05 10:48:19 +08:00
  • 0cfcfacb6d perf: 修改 CommandFilterACL, CommandGroup __str__ Bai 2022-12-04 22:46:47 +08:00
  • 519e0eac01 perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField Bai 2022-12-04 20:51:22 +08:00
  • 70fb00c4ee perf: 修改命令过滤ACL序列类和部分翻译 Bai 2022-12-04 18:48:48 +08:00
  • 4d9344eb23 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-04 18:11:32 +08:00
  • 229d36abb4 perf: 修改命令过滤 ACL 序列类 Bai 2022-12-04 18:01:35 +08:00
  • 048be1782d fix: replay file data Eric 2022-12-04 17:39:48 +08:00
  • 5568c4c5df perf: 修改 CommandFilterACL Account 只匹配 username 字段 Bai 2022-12-04 14:44:30 +08:00
  • a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用 Bai 2022-12-04 12:08:44 +08:00
  • 2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法; Bai 2022-12-04 00:04:39 +08:00
  • 6480b916d6 perf: parse ssh private key Eric 2022-12-03 15:25:04 +08:00
  • 289ecbcc75 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-02 20:33:56 +08:00
  • 2cf3a21d27 perf: 修改校验权限 ibuler 2022-12-02 20:33:32 +08:00
  • 156a6c9dc5 perf: gateway test connective (#9152) fit2bot 2022-12-02 20:28:49 +08:00
  • 052a4afef6 pref: 暂时修改 key fingerprint ibuler 2022-12-02 20:06:56 +08:00
  • fbea1f3480 perf: 修改一些拼写 ibuler 2022-12-02 19:56:13 +08:00
  • a70f85e346 fix: 修改 ConnectionToken Serializer Bai 2022-12-02 18:09:07 +08:00
  • 52e8082470 fix: 修改 LoginAssetACL 过滤 review Bai 2022-12-02 17:52:51 +08:00
  • c832f762a5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-02 17:48:51 +08:00
  • c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 Bai 2022-12-02 17:48:44 +08:00
  • aa0dabfd10 fix: 删除不用migrations jiangweidong 2022-12-02 17:27:42 +08:00
  • 0e0a9f4654 perf: gateway account (#9150) fit2bot 2022-12-02 17:36:55 +08:00
  • 2f5e133558 perf: 优化celery任务 Aaron3S 2022-12-02 17:18:11 +08:00
  • 6d0545f04f perf: 持续优化作业创建 Aaron3S 2022-12-02 12:21:56 +08:00
  • 21f91358cf Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished 老广 2022-12-02 14:57:38 +08:00
  • 6c8d64de4e perf: 修改冲突 ibuler 2022-12-02 13:16:33 +08:00
  • 2d771eedc1 perf: 优化用户授权 api ibuler 2022-12-02 13:15:03 +08:00
  • faf1dedfe2 fix: 删除掉连接方式控制半成品代码 jiangweidong 2022-12-02 13:00:48 +08:00
  • 563b9f77a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Bai 2022-12-02 12:41:05 +08:00
  • 158d49b230 fix: 修复用户授权的资产 API 支持 id 过滤 Bai 2022-12-02 12:40:29 +08:00
  • 61e6ab20a2 perf: 修改 Connect acl ibuler 2022-12-02 12:27:26 +08:00
  • 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-02 11:53:45 +08:00
  • a6aafaec05 perf: 修改 command filter ibuler 2022-12-02 11:53:07 +08:00
  • 541358978d fix: gateway (#9145) fit2bot 2022-12-02 11:45:05 +08:00
  • 19c3f98e8f pref: 修改 migrations 冲突 ibuler 2022-12-02 11:14:29 +08:00
  • fdbaa0afe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-02 11:12:25 +08:00
  • a18f544cf8 perf: 修改 acl ibuler 2022-12-02 11:12:14 +08:00
  • 1165ea817f Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations 老广 2022-12-02 10:53:29 +08:00
  • 85aad7ba62 feat: 解决冲突 jiangweidong 2022-12-02 10:52:31 +08:00
  • 017a674f63 Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn 老广 2022-12-02 10:47:16 +08:00
  • 709b6e5b0d perf: 去掉 gunicorn threads 吴小白 2022-12-02 10:45:12 +08:00
  • a68e2e29f4 Merge pull request #9110 from jumpserver/dependabot/pip/requirements/pillow-9.3.0 老广 2022-12-02 10:45:11 +08:00
  • 11a786d858 Merge pull request #9076 from jumpserver/v3_async_ws 老广 2022-12-02 10:44:24 +08:00
  • 07f2e66546 Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error 老广 2022-12-02 10:40:55 +08:00
  • a6b1052767 Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn 老广 2022-12-02 10:40:09 +08:00
  • ab4c8402c3 Merge pull request #9119 from jumpserver/pr@v3@feat_support_clear_private_key 老广 2022-12-02 10:35:43 +08:00
  • bcf509ab07 Merge branch 'v3' into pr@v3@feat_support_clear_private_key 老广 2022-12-02 10:35:20 +08:00
  • 10e3100d3c fix: LoginAssetACL confirm action Eric 2022-12-01 22:09:16 +08:00
  • 4041f1aeec fix: 修改 random_string 方法,支持只生成随机数字 Bai 2022-12-01 17:59:01 +08:00
  • 2401c241f2 fix: 修改 random_string 方法,支持只生成随机数字 Bai 2022-12-01 17:59:01 +08:00
  • 1fb0b0849d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-12-01 19:41:42 +08:00
  • cb3877bbda perf: 修改 acl 添加命令过滤 acl ibuler 2022-12-01 19:41:18 +08:00
  • fa0382fc5e perf: gateway manager feng 2022-12-01 18:22:41 +08:00
  • ce3ec85147 fix: 去掉默认值 吴小白 2022-12-01 16:22:26 +08:00