From ca69e6d99ad7ef84a0c66d1c7cdf939d41e0f894 Mon Sep 17 00:00:00 2001 From: shouzhiyuxian <2512941932@qq.com> Date: Thu, 21 May 2026 16:08:21 +0800 Subject: [PATCH 1/2] Fixed the description of the callback URL in the CAS documentation, and corrected errors in several URL descriptions. --- docs/dev/rest_api.md | 8 ++++---- docs/installation/proxy.md | 4 ++-- .../admin/system_settings/authentication_settings/CAS.md | 4 ++-- .../system_settings/authentication_settings/LDAP.en.md | 2 +- .../admin/system_settings/authentication_settings/LDAP.md | 2 +- .../system_settings/authentication_settings/LDAPHA.en.md | 2 +- .../system_settings/authentication_settings/OIDC.en.md | 2 +- .../admin/system_settings/authentication_settings/OIDC.md | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/dev/rest_api.md b/docs/dev/rest_api.md index e297204c0..977687df8 100644 --- a/docs/dev/rest_api.md +++ b/docs/dev/rest_api.md @@ -161,10 +161,10 @@ https(JSONObject.toJSONString(map), "", "/api/v1/authentication/auth/"); } - public static void https(String params, String token, String uri) throws IOException { + public static void https(String params, String token, String url) throws IOException { // 创建 URL 对象 - URL obj = new URL(JMS_URL + uri); + URL obj = new URL(JMS_URL + url); // 打开连接 HttpsURLConnection conn = (HttpsURLConnection) obj.openConnection(); @@ -448,7 +448,7 @@ String keySecret = ""; String endpoint = ""; - String uri = "/api/v1/users/users/"; + String url = "/api/v1/users/users/"; DefaultKeychain provider = new DefaultKeychain(); HmacKey hmacKey = new HmacKey(apiKey, keySecret); @@ -484,7 +484,7 @@ OkHttpClient client = builderClient.build(); Request.Builder builder = new Request.Builder() - .url(endpoint + uri) + .url(endpoint + url) .method("GET", null); for (Map.Entry header : headers.entrySet()) { builder.addHeader(header.getKey(), header.getValue()); diff --git a/docs/installation/proxy.md b/docs/installation/proxy.md index d767abd19..51e360fe4 100644 --- a/docs/installation/proxy.md +++ b/docs/installation/proxy.md @@ -53,7 +53,7 @@ server { listen 80; server_name demo.jumpserver.org; # 自行修改成你自己的域名 - return 301 https://$server_name$request_uri; + return 301 https://$server_name$request_url; } server { @@ -132,7 +132,7 @@ server { listen 80; server_name demo.jumpserver.org; # 自行修改成你的域名 - return 301 https://$server_name$request_uri; + return 301 https://$server_name$request_url; } server { listen 443 ssl http2; diff --git a/docs/manual/admin/system_settings/authentication_settings/CAS.md b/docs/manual/admin/system_settings/authentication_settings/CAS.md index ac4cd6d3a..2aaf76d03 100644 --- a/docs/manual/admin/system_settings/authentication_settings/CAS.md +++ b/docs/manual/admin/system_settings/authentication_settings/CAS.md @@ -12,8 +12,8 @@ | 参数 | 说明 | 示例 | |------|------|------| | CAS | 勾选启用 CAS 身份验证 | 启用/禁用 | -| 服务端地址 | CAS 服务器 URI | `https://example.com/cas` | -| 回调地址 | CAS 代理服务器 URI | `https://foo.bar:8443` | +| 服务端地址 | CAS 服务器 URL | `https://example.com/cas` | +| 回调地址 | Jumpserver 访问 URL | `https://foo.bar:8443` | | 版本 | CAS 协议版本：1、2、3 或 CAS_2_SAML_1_0 | 默认值：3 | | 映射属性 | 用户属性映射。键表示 CAS 用户属性名称，值对应 JumpServer 用户属性名称 | 示例见下文 | | 组织 | 身份验证和创建后，用户将被添加到所选组织中 | | diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md b/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md index a34ca15ee..1ba3baf8a 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md @@ -23,7 +23,7 @@ | Parameter | Description | Example | | --- | --- | --- | | LDAP | Enable LDAP authentication | Enable/Disable | -| Server | LDAP server URI | `ldap://example.com:389` or `ldaps://example.com:636` | +| Server | LDAP server URL | `ldap://example.com:389` or `ldaps://example.com:636` | | Bind DN | User DN with query permissions for querying and filtering users | `cn=admin,dc=example,dc=com` or `user@domain.com` format | | Password | Password for bind DN user | | | User OU | Search starting OU, specifying where to start searching for users; multiple values separated by `\|` | `ou=users,dc=example,dc=com\|ou=tech,dc=example,dc=com` | diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAP.md b/docs/manual/admin/system_settings/authentication_settings/LDAP.md index 48b5a3109..01a6fc9fd 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAP.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAP.md @@ -23,7 +23,7 @@ | 参数 | 说明 | 示例 | |------|------|------| | LDAP | 勾选启用 LDAP 身份验证 | 启用/禁用 | -| 服务器 | LDAP 服务器 URI | `ldap://example.com:389` 或 `ldaps://example.com:636` | +| 服务器 | LDAP 服务器 URL | `ldap://example.com:389` 或 `ldaps://example.com:636` | | 绑定 DN | 具有查询权限的用户 DN，用于查询和筛选用户 | `cn=admin，dc=example，dc=com` 或者 `user@domain.com` 格式 | | 密码 | 绑定 DN 用户的密码 | | | 用户 OU | 搜索起始 OU，指定从何处开始搜索用户，多个值用 `|` 分隔 | `ou=users，dc=example，dc=com |ou=tech，dc=example，dc=com` | diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md index d0047b3ba..d763d11a1 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md @@ -13,7 +13,7 @@ !!! tip "" - Click the settings button in the top-right corner - Navigate to **System Settings > Authentication Settings > LDAP HA** - - In the **Server Address** field, enter the LDAP HA server URI, such as "ldap://example.com:389" and "ldaps://example.com:636". + - In the **Server Address** field, enter the LDAP HA server URL, such as "ldap://example.com:389" and "ldaps://example.com:636". !!! info "" - To configure LDAP TLS certificates, upload `ldap_ca.pem`, `ldap_cert.pem`, and `ldap_cert.key` files to the JumpServer `/data/jumpserver/core/data/certs` directory, then restart JumpServer using the command `jmsctl restart`. diff --git a/docs/manual/admin/system_settings/authentication_settings/OIDC.en.md b/docs/manual/admin/system_settings/authentication_settings/OIDC.en.md index 2cfdeaf55..68443d0fe 100644 --- a/docs/manual/admin/system_settings/authentication_settings/OIDC.en.md +++ b/docs/manual/admin/system_settings/authentication_settings/OIDC.en.md @@ -29,7 +29,7 @@ | Parameter | Description | Example | | --- | --- | --- | -| Server Address | Keycloak server URI | `https://keycloak.example.com` | +| Server Address | Keycloak server URL | `https://keycloak.example.com` | | Domain | Keycloak domain name | `JumpServer` | ### 2.2 Using Native OIDC diff --git a/docs/manual/admin/system_settings/authentication_settings/OIDC.md b/docs/manual/admin/system_settings/authentication_settings/OIDC.md index 7ce5b8d26..66d01b9ce 100644 --- a/docs/manual/admin/system_settings/authentication_settings/OIDC.md +++ b/docs/manual/admin/system_settings/authentication_settings/OIDC.md @@ -25,7 +25,7 @@ | 参数 | 说明 | 示例 | |------|------|------| -| 服务端地址 | Keycloak 服务器 URI | `https://keycloak.example.com` | +| 服务端地址 | Keycloak 服务器 URL | `https://keycloak.example.com` | | 域 | Keycloak 域名称 | `JumpServer` | ### 2.2 使用本机 OIDC From 87646bd2fe3cebba964f92fafdff3b5f22782bf3 Mon Sep 17 00:00:00 2001 From: shouzhiyuxian <2512941932@qq.com> Date: Fri, 29 May 2026 10:20:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9LDAP=20TLS=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system_settings/authentication_settings/LDAP.en.md | 2 +- .../admin/system_settings/authentication_settings/LDAP.md | 2 +- .../admin/system_settings/authentication_settings/LDAPHA.en.md | 2 +- .../admin/system_settings/authentication_settings/LDAPHA.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md b/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md index 1ba3baf8a..c7712a04f 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAP.en.md @@ -15,7 +15,7 @@ - Navigate to **System Settings > Authentication Settings > LDAP** !!! info "" - - To configure LDAP TLS certificates, upload `ldap_ca.pem`, `ldap_cert.pem`, and `ldap_cert.key` files to the JumpServer `/data/jumpserver/core/data/certs` directory, then restart JumpServer using the command `jmsctl restart`. + - To configure LDAP TLS certificates, upload `ldap_ca.pem`, `ldap_cert.pem`, and `ldap_cert.key` files to the JumpServer `/opt/jumpserver/config/certs` directory, then restart JumpServer using the command `jmsctl restart`. !!! tip "" Detailed parameter descriptions: diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAP.md b/docs/manual/admin/system_settings/authentication_settings/LDAP.md index 01a6fc9fd..f174474e5 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAP.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAP.md @@ -15,7 +15,7 @@ - 导航至 **系统设置 > 认证设置 > LDAP** !!! info "" - - 若需配置 LDAP TLS 证书，请将 `ldap_ca.pem、ldap_cert.pem、ldap_cert.key` 文件上传至 JumpServer 服务器 `/data/jumpserver/core/data/certs` 目录，然后通过命令 `jmsctl restart` 重启 JumpServer 服务。 + - 若需配置 LDAP TLS 证书，请将 `ldap_ca.pem、ldap_cert.pem、ldap_cert.key` 文件上传至 JumpServer 服务器 `/opt/jumpserver/config/certs` 目录，然后通过命令 `jmsctl restart` 重启 JumpServer 服务。 !!! tip "" 详细参数说明： diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md index d763d11a1..2e70a67e2 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md @@ -16,7 +16,7 @@ - In the **Server Address** field, enter the LDAP HA server URL, such as "ldap://example.com:389" and "ldaps://example.com:636". !!! info "" - - To configure LDAP TLS certificates, upload `ldap_ca.pem`, `ldap_cert.pem`, and `ldap_cert.key` files to the JumpServer `/data/jumpserver/core/data/certs` directory, then restart JumpServer using the command `jmsctl restart`. + - To configure LDAP TLS certificates, upload `ldap_ca.pem`, `ldap_cert.pem`, and `ldap_cert.key` files to the JumpServer `/opt/jumpserver/config/certs` directory, then restart JumpServer using the command `jmsctl restart`. !!! tip "" - In the **Bind DN** field, enter a user DN with at least query permissions; this permission will be used to query and filter users, for example "cn=admin,dc=example,dc=com". diff --git a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.md b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.md index a46ab3a6c..e2769b1b1 100644 --- a/docs/manual/admin/system_settings/authentication_settings/LDAPHA.md +++ b/docs/manual/admin/system_settings/authentication_settings/LDAPHA.md @@ -16,7 +16,7 @@ - 在 **服务端地址** 字段中，键入 LDAP HA 服务器 URI，例如"ldap://example.com:389”和“ldaps://example.com:636"。 !!! info "" - - 若需配置 LDAP TLS 证书，请将 `ldap_ca.pem、ldap_cert.pem、ldap_cert.key` 文件上传至 JumpServer 服务器 `/data/jumpserver/core/data/certs` 目录，然后通过命令 `jmsctl restart` 重启 JumpServer 服务。 + - 若需配置 LDAP TLS 证书，请将 `ldap_ca.pem、ldap_cert.pem、ldap_cert.key` 文件上传至 JumpServer 服务器 `/opt/jumpserver/config/certs` 目录，然后通过命令 `jmsctl restart` 重启 JumpServer 服务。 !!! tip "" - 在 **绑定 DN** 字段中，输入至少具有查询权限的用户 DN，该权限将用于查询和筛选用户，例如“cn=admin，dc=example，dc=com”。