Commit Graph

9303 Commits

Author SHA1 Message Date
halo
92c8f73ade fix: improve vendor string parsing in CryptoVendor class 2026-07-10 16:25:36 +08:00
Aaron3S
721ccc0745 feat: merge gm module 2026-07-10 16:25:36 +08:00
ibuler
c1bd391a49 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2026-07-10 15:18:09 +08:00
ibuler
a5e9733728 perf: update others 2026-07-10 15:17:53 +08:00
Eric
ff18ee5cf7 perf: update deploy applet host playbook 2026-07-10 15:12:49 +08:00
wangruidong
3ac7d00685 fix: add ansible_python_interpreter variable to local tasks in automation playbooks 2026-07-10 14:15:01 +08:00
fit2bot
6bfe770b02 fix: sanitize runtime directory names to avoid unsafe characters (#17002)
Co-authored-by: wangruidong <940853815@qq.com>
2026-07-08 18:03:06 +08:00
feng626
669cffa991 Merge branch 'dev' into pr@dev@refresh_item 2026-07-08 17:56:28 +08:00
feng
bb4e2f5c28 perf: optimize password change log filtering by organization 2026-07-08 17:51:34 +08:00
wangruidong
b12cc919f8 fix: Add length check for text input in parse_int function and clean up imports in other.py 2026-07-08 16:45:22 +08:00
wangruidong
a99c89f5c8 perf: add SECURITY_DISABLE_VIEW_SECRET conf 2026-07-08 16:36:21 +08:00
feng
8ad8f78218 perf: PasswordChangeLog add db index 2026-07-08 16:34:15 +08:00
Jonnn-y
2dc9907cbc Fix ad domain virtual account (#16729)
* fix(authentication): apply ad_domain logic to virtual accounts

---------

Co-authored-by: Bryan <jiangjie.bai@fit2cloud.com>
2026-07-08 16:33:56 +08:00
Bruce Wayne
7f7bf810e3 fix: CAS login infinite loop when user is disabled 2026-07-08 16:30:08 +08:00
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
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
Bai
3c34cfec48 feat: merge dev custom 2026-07-01 15:09:50 +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
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
1011dddd1f perf: es error 2026-06-25 13:55:29 +08:00