Commit Graph

13313 Commits

Author SHA1 Message Date
fit2bot
60608f149c fiix: Database error information disclosure (#16634)
* fix: Loki LogQL Injection

* fiix: Database error information disclosure

* fix: timing-unsafe `bootstrap_token` comparison

---------

Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
2026-07-08 16:28:53 +08:00
Gerry.tan
1e2dc97156 perf: OAuth2 authentication supports state security parameters. 2026-07-08 16:17:32 +08:00
Jonnn-y
957829fa18 Fix custom ssh change secret (#16731) 2026-07-08 16:15:48 +08:00
Lucille123-chu
99462322c8 perf: account display 2026-07-08 16:09:44 +08:00
halo
0fb77f7bcd perf: support skip server performance check via env var 2026-07-08 15:54:28 +08:00
feng
34eb21ada6 fix: avoid triggering password history save on every user save 2026-07-08 15:40:52 +08:00
feng
8a4b7ea641 fix: preserve template placeholders when editing message templates 2026-07-08 15:36:10 +08:00
ibuler
7c1e2ba988 Merge branches 'dev' and 'dev' of github.com:jumpserver/jumpserver into dev 2026-07-08 15:34:47 +08:00
ibuler
4d48971d19 perf: update rdp sign 2026-07-08 15:34:24 +08:00
feng
c4c6eebe42 fix: SSH automation add local_python_interpreter 2026-07-08 14:47:59 +08:00
Crane.z
57ade8f93f fix: validate flash message redirect URLs 2026-07-08 14:44:48 +08:00
lory
74c9319d5c fix:face_capature_create_token 2026-07-08 14:43:41 +08:00
wangruidong
e6526e77a6 fix: Login log city translate 2026-07-08 14:42:16 +08:00
wangruidong
7e948f2919 fix: Login log reason translate 2026-07-08 14:42:16 +08:00
Crane.z
394b65fce5 fix(accounts): prevent SQL injection in MSSQL account automation 2026-07-08 14:18:43 +08:00
Crane.z
128aeed5f2 fix(reports): secure PDF export URL and authentication 2026-07-08 14:16:34 +08:00
fit2bot
24520f1e8b perf: add ANSIBLE_DOCKER_ENABLED configuration (#16920)
* perf: test ansible executor github ci

* perf: for test ci

* fix: update Dockerfile to include docker-cli and change ansible container network to jms_net

* fix: Removed cryptography.hazmat.decrepit.ciphers.algorithms.TripleDES deprecation warning

* perf: update ansible and ansible-runner versions in execution environment and requirements

* fix: local python interpreter error

* perf: add ANSIBLE_DOCKER_ENABLED configuration

* perf: add latest tag for ansible-executor image in build workflow

---------

Co-authored-by: wangruidong <940853815@qq.com>
2026-07-06 16:48:54 +08:00
feng
7ac82e1ca5 perf: ftp log add id filter 2026-07-06 10:47:52 +08:00
Crane.z
073bb35a50 Merge pull request #16972 from jumpserver/pr@dev@fix_celery_log
fix:remove unused task log APIs
2026-07-02 16:56:27 +08:00
Crane.z
0753afbd04 fix:remove unused task log APIs 2026-07-02 16:43:19 +08:00
Crane.z
eadd92463f Merge pull request #16639 from jumpserver/pr@dev@fix_protocol_error
fix:In the import template, protocols are not required, but leaving them empty causes the asset import to fail.
2026-07-02 14:17:42 +08:00
fit2bot
87f3b2b380 fix: LDAP TLS import errors (#16970)
Co-authored-by: wangruidong <940853815@qq.com>
2026-07-01 18:43:14 +08:00
fit2bot
86cd9df449 fix: LDAP search injection (#16942)
Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: wrd <w940853815@gmail.com>
2026-07-01 18:13:36 +08:00
fit2bot
63e80b736e feat: Support LDAP/LDAPS to upload CA/ client certificates and enable StartTLS. (#16891)
* feat: Support LDAP/LDAPS to upload CA/ client certificates and enable StartTLS.

* chore(i18n): auto-translate updated strings

* Delete test_ldap.py

---------

Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: wrd <w940853815@gmail.com>
2026-07-01 18:11:53 +08:00
ibuler
e3f7fafca2 perf: update merge with remote 2026-07-01 15:45:55 +08:00
Jiangjie Bai
626cf23f86 Merge pull request #16960 from jumpserver/dev_osm
feat: Merge to dev from dev_osm
2026-07-01 15:12:37 +08:00
Jiangjie Bai
ebf1d83a8e Merge pull request #16961 from jumpserver/pr@dev_osm@merge
feat: merge dev custom
2026-07-01 15:12:12 +08:00
Bai
3c34cfec48 feat: merge dev custom 2026-07-01 15:09:50 +08:00
Jiangjie Bai
61822a6b11 feat: Merge to dev_osm from osm (#16959)
* perf: auth cert add settings

* perf: add config for cert

* feat: add auth cert ca cert/key upload supported

* fix: Change lang failed (#16861)

Co-authored-by: wangruidong <940853815@qq.com>

* fix: third part user login many login logs

* fix: i18n cert to ukey

* fix: cert algo default -

* fix: cert logo to ukey

* fix: cert auth to ukey auth

* fix: wecom scan login only exist user login, but two login success

* fix: django5 for model.field through_fields apply to migrations

* fix: from apps. change to appname imported

* fix: LDAP user login exception

* feat: hsm sctu

* fix(static): remove invalid sourcemap references from vendor js

* fix:add ansible patchs to osm (#16886)

* fix:add ansible patchs to osm

* fix: quote ansible gateway proxy command args

---------

Co-authored-by: Crane.z <1481445951@qq.com>

* feat: support ukey

* perf: auth ukey config interval time 5s

* perf: add ukey_sn unique and unbind devSN operation

* perf: profile not display ukey for other user

* perf: i18n ukey

* perf: ukey change pin support validate length

* perf: ukey settings default pin length

* perf: 512 to 256 rounds 1000

* perf: update gmssl builder

* perf: ukey auth security

* perf: ukey challenge ttl check

* feat: hsm

* fix(accounts): support new gateway proxy layout in ssh ping (#16895)

Co-authored-by: Crane.z <1481445951@qq.com>

* fix: ukey api urls open

* fix: jida ukey show certAlg

* perf: update change role name

* perf: gmssl_python add copyright notice

* feat:upgrade ansible version

* fix: update user empty ukey_sn field value

* fix: ukey auth user invalid alert error

* perf: use prebuild gmssl image

* fix: do not view change-secret by settings

* perf: update last login

* fix: do not view change-secret by settings

* perf: support applet host filter

* fix: ukey login user deactive error no tips

* fix: add translate

* perf: Logout countdown

* fix: sys-site-msg support revoke

* perf: remove video player download

* perf: change lang trans

* perf: update config after migrate

* perf: translate

* perf: update migrate

* perf: update site url

* perf: translate

* fix: flash msg page redirect_url safe check

* fix: playbook clone_from check playbook scope

* fix: profile password patch method not allowed

* perf: translate

* perf: to tcpdump

* perf: traceroute

* perf: remove debug

* Revert "perf: to tcpdump"

This reverts commit 1413d57bfd.

* perf: import asset add error check

* perf: translate

* perf: translate

* perf: user login filter filter_long_time

* perf: push account

* perf: account history

* perf: translate

* perf: add client unsupport tips

* perf: update download

* perf: add mongo utils

* fix: storage translate

* perf: es error

* perf: use mongo ping

* perf: indentation

* perf: translate

* fix: Platform error translate (#16947)

* fix: Import prompts a interal error when the label is too long

* fix: Platform error translate

---------

Co-authored-by: wangruidong <940853815@qq.com>

* perf: update i18n

* perf: ansible forks to 20

* perf: BULK_SIZE to 80

* perf: hcp vault jumpserver change pam

* perf: add update user password script

* perf: add change user password pt

* perf: ru translate

---------

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: xiaoc <648844981@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: Crane.z <1481445951@qq.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: zhaojisen <1301338853@qq.com>
2026-07-01 14:58:29 +08:00
Jiangjie Bai
8254e3ede5 Merge branch 'dev_osm' into osm 2026-07-01 14:56:36 +08:00
feng
c0659cd220 perf: ru translate 2026-06-30 18:53:54 +08:00
feng
3209b7d9ce perf: add change user password pt 2026-06-30 12:30:54 +08:00
ibuler
94b775c7ec perf: add update user password script 2026-06-30 01:04:39 +08:00
wangruidong
8b04d75421 perf: gather mac address 2026-06-29 10:05:37 +08:00
feng
8f417d017a perf: hcp vault jumpserver change pam 2026-06-28 12:21:21 +08:00
feng
9f0b51b5e5 perf: BULK_SIZE to 80 2026-06-26 17:47:08 +08:00
feng
5922449b3a perf: ansible forks to 20 2026-06-26 17:17:27 +08:00
LDX
ec9e76e405 feat(assets): add user custom favorite folders (#16949)
* feat(assets): add user custom favorite folders

- Add FavoriteFolder model (per-user, nested via self parent FK)
- Add nullable folder FK on FavoriteAsset, allow one asset in multiple folders
- Add FavoriteFolderViewSet and folder filter on FavoriteAssetViewSet
- Serializer outputs asset_info for building connectable tree nodes
- Register favorite-folders route; exclude favoritefolder from rbac/audit

* feat(assets): register favorite-folders route and add migration

- Register favorite-folders router endpoint
- Add migration 0020 creating FavoriteFolder and folder FK on FavoriteAsset

* feat(rbac): exclude favoritefolder from permission management

Keep favoritefolder consistent with favoriteasset (user-owned, not RBAC managed)

* feat(audits): exclude FavoriteFolder from operate log
2026-06-26 16:29:25 +08:00
ibuler
0a436de927 perf: update i18n 2026-06-26 13:38:37 +08:00
fit2bot
dc98c2c436 fix: Platform error translate (#16947)
* fix: Import prompts a interal error when the label is too long

* fix: Platform error translate

---------

Co-authored-by: wangruidong <940853815@qq.com>
2026-06-25 17:00:03 +08:00
feng
22caa47c99 perf: translate 2026-06-25 16:43:25 +08:00
feng
46ae74d3e7 perf: indentation 2026-06-25 15:17:52 +08:00
feng
ef4cbc3e0c perf: use mongo ping 2026-06-25 15:06:28 +08:00
feng
1011dddd1f perf: es error 2026-06-25 13:55:29 +08:00
zhaojisen
e713c8cc52 fix: storage translate 2026-06-25 11:02:07 +08:00
feng
c78d4699b5 perf: add mongo utils 2026-06-25 10:48:01 +08:00
ibuler
d40cebd528 perf: update download 2026-06-24 17:57:59 +08:00
zhaojisen
3b2a6d316a perf: add client unsupport tips 2026-06-24 17:30:39 +08:00
feng
7470f6d54d perf: translate 2026-06-24 17:11:07 +08:00
ibuler
68a39a92e5 perf: update input secret type 2026-06-24 10:10:11 +08:00