From b2e3771de107f131af0820a30aaaec7fda9e4898 Mon Sep 17 00:00:00 2001 From: skywalker Date: Thu, 17 Oct 2024 10:19:15 +0800 Subject: [PATCH] SSO_LDAP_USE_SAME_UID --- manual/deploy/ldap_in_11.0.md | 8 ++++++++ manual/upgrade/upgrade_notes_for_11.0.x.md | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/manual/deploy/ldap_in_11.0.md b/manual/deploy/ldap_in_11.0.md index ea14fc38..f7e137ad 100644 --- a/manual/deploy/ldap_in_11.0.md +++ b/manual/deploy/ldap_in_11.0.md @@ -113,3 +113,11 @@ If your LDAP service supports TLS connections, you can configure `LDAP_SERVER_UR ```python LDAP_SERVER_URL = 'ldaps://192.168.0.1:636/' ``` + +### SSO and LDAP users use the same uid + +If you use both ldap and SSO (enable LDAP user sync with ADFS/OAuth), and the uids of ldap and sso users are the same, you can configure `SSO_LDAP_USE_SAME_UID = True` to make different authentication methods point to the same Seafile user. + +```python +SSO_LDAP_USE_SAME_UID = True +``` diff --git a/manual/upgrade/upgrade_notes_for_11.0.x.md b/manual/upgrade/upgrade_notes_for_11.0.x.md index 6f262f43..fd206010 100644 --- a/manual/upgrade/upgrade_notes_for_11.0.x.md +++ b/manual/upgrade/upgrade_notes_for_11.0.x.md @@ -179,6 +179,12 @@ DEL_GROUP_IF_NOT_FOUND = False # Set to "true", sync process will dele DEL_DEPARTMENT_IF_NOT_FOUND = False # Set to "true", sync process will deleted the department if not found it in LDAP server. ``` +If you use both ldap and SSO (enable LDAP user sync with ADFS/OAuth), and the uids of ldap and sso users are the same, you can configure `SSO_LDAP_USE_SAME_UID = True` to make different authentication methods point to the same Seafile user. + +```python +SSO_LDAP_USE_SAME_UID = True +``` + #### Migrate LDAP records Run the following script to migrate users in `LDAPImported` to `EmailUsers`