You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
```diff
commit 4da9ef6
Merge: 1c49383043e6bd
Author: Ming Lu <ming.lu@cloud.com>
Date: Wed Apr 15 09:56:22 2026 +0800
Merge branch 'master' into private/mingl/feature/trusted-certs
diff --cc ocaml/idl/datamodel_common.ml
index 93a3fbc,0fe08b11c..25e689f
--- a/ocaml/idl/datamodel_common.ml
+++ b/ocaml/idl/datamodel_common.ml
@@@ -3,21 -3,21 +3,21 @@@
open Datamodel_types
open Lifecycle
open Datamodel_roles
(* IMPORTANT: Please bump schema vsn if you change/add/remove a _field_.
You do not have to bump vsn if you change/add/remove a message
When introducing a new release, bump the schema minor version to the next hundred
to leave a gap for potential hotfixes needing to increment the schema version.*)
let schema_major_vsn = 5
- let schema_minor_vsn = 794
-let schema_minor_vsn = 901
++let schema_minor_vsn = 902
(* Historical schema versions just in case this is useful later *)
let rio_schema_major_vsn = 5
let rio_schema_minor_vsn = 19
let miami_release_schema_major_vsn = 5
let miami_release_schema_minor_vsn = 35
diff --cc ocaml/idl/schematest.ml
index e92f9e9,c963c8f11..a7fc9bd
--- a/ocaml/idl/schematest.ml
+++ b/ocaml/idl/schematest.ml
@@@ -1,16 -1,16 +1,16 @@@
let hash x = Digest.string x |> Digest.to_hex
(* BEWARE: if this changes, check that schema has been bumped accordingly in
ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
- let last_known_schema_hash = "ce90c659723cbcd5265e4dd856802b74"
-let last_known_schema_hash = "32bbba07579ca8844fa6162164530268"
++let last_known_schema_hash = "a64e7e1133a10add1b39d22cd6bbc352"
let current_schema_hash : string =
let open Datamodel_types in
let hash_of_obj x =
List.map rpc_of_content x.contents
|> List.map Jsonrpc.to_string
|> String.concat ""
|> hash
in
Datamodel.all_system |> List.map hash_of_obj |> String.concat ":" |> hash
Copy file name to clipboardExpand all lines: doc/content/design/external-auth-ldaps.md
+5-34Lines changed: 5 additions & 34 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -91,8 +91,9 @@ Given `ldaps` default to `false`, this feature is **NOT** enabled until explicit
91
91
92
92
#### 3.1.2 Error code
93
93
Following new error codes added to indicate ldaps enable related error
94
-
- AUTH_NO_CERT, no certs can be used for ldaps, refer to 4.1.2 for certs finding.
95
-
- AUTH_INVALID_CERT, found certs, but none of the certs can be used to connect to DC
94
+
- POOL_AUTH_ENABLE_FAILED_NO_CERTS, no certs can be used for ldaps, refer to 4.1.2 for certs finding.
95
+
- POOL_AUTH_ENABLE_FAILED_INVALID_CERTS, found certs, but none of the certs can be used to connect to DC
96
+
**Note**: Current error code handing infrustrucure requires the error code prefix with POOL_AUTH_ENABLE_FAILED
96
97
97
98
### 3.2 Set/Get Pool LDAPS Status
98
99
@@ -137,7 +138,7 @@ This API may raise following errors
137
138
- AUTH_NO_CERT, no certs found to enable ldaps, refer to 4.1.2 for certs finding
138
139
- AUTH_INVALID_CERT, found certs, but none of the certs can be used to connect to DC
139
140
- AUTH_IS_DISABLED, AD is not enabled
140
-
-AUTH_LDAPS_PING_FAILED, failed to do ldaps query on all DCs with valid certs
141
+
-AUTH_SET_LDAPS_FAILED, Failed to set ldaps, the error message contains the details like ldap query on domain failed
141
142
142
143
#### 3.2.2 Get Pool LDAPS Status
143
144
@@ -211,24 +212,6 @@ This design is following [trusted-certificates.md](https://github.com/xapi-proje
211
212
-`pool.external_auth_set_ldaps` API
212
213
- (Re)join domain
213
214
214
-
### 4.2 Xapi Configuration
215
-
216
-
#### 4.2.1 winbind-tls-verify-peer
217
-
218
-
For security, xapi asks winbind to verify CA certificate. `ca_and_name_if_available` is the default.
219
-
220
-
However, user may want to disable this verification for debug purpose.
221
-
222
-
`winbind-tls-verify-peer` is introduced for xapi configuration, and the possible values are `no_check`, `ca_only`, `ca_and_name_if_available`, `ca_and_name` and `as_strict_as_possible`.
223
-
The configured value will override `tls verify peer` value in xapi generated samba configuration. Refer to [smb.conf](https://www.samba.org/samba/docs/current/man-html/smb.conf.5.html) for the details.
224
-
225
-
226
-
**Note:** This item is not intended for public documentation. This is only for debug purpose, or system tuning for specific scenarios from engineering/support team.
227
-
228
-
#### 4.2.2 ad-warning-message-interval
229
-
230
-
xapi sends warning message to user with this interval on LDAP query failure. Default to 1 week. Refer to section "Session revalidate" for the details.
231
-
232
215
## 5. Session Revalidate
233
216
234
217
xapi LDAP queries domain user status (if user has been added to manage XenServer) at configurable interval, and destroys the session created by domain user if user no longer in healthy status.
@@ -238,23 +221,11 @@ However, the LDAP query may fail due to various issues as follows:
238
221
- Temporary network issues
239
222
- CA certificate is not properly configured, or expired, etc.
240
223
241
-
Instead of destroying user session for stability, a warning message will be sent to user with the details at configurable interval `ad-warning-message-interval`.
242
-
243
-
- If no LDAP error, do nothing
244
-
- If error happens, send the warning message if:
245
-
- first time see the error through xapi start up (so no need to persist last send time) or
0 commit comments