Skip to content

Fixed the description of the callback URL in the CAS documentation, a… #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shouzhiyuxian wants to merge 1 commit into
base: v4.0
Choose a base branch
from
Open

Fixed the description of the callback URL in the CAS documentation, a… #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/dev/rest_api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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<String, String> header : headers.entrySet()) {
builder.addHeader(header.getKey(), header.getValue());
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/proxy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/admin/system_settings/authentication_settings/CAS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 用户属性名称 | 示例见下文 |
| 组织 | 身份验证和创建后，用户将被添加到所选组织中 | |
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/admin/system_settings/authentication_settings/LDAP.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/admin/system_settings/authentication_settings/LDAP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/admin/system_settings/authentication_settings/LDAPHA.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/admin/system_settings/authentication_settings/OIDC.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/admin/system_settings/authentication_settings/OIDC.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

| 参数 | 说明 | 示例 |
|------|------|------|
| 服务端地址 | Keycloak 服务器 URI | `https://keycloak.example.com` |
| 服务端地址 | Keycloak 服务器 URL | `https://keycloak.example.com` |
| 域 | Keycloak 域名称 | `JumpServer` |

### 2.2 使用本机 OIDC
Expand Down