From 6b0a40b7f8dd77338d0818c095e3eafb8bd869c9 Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 13 Jun 2023 15:25:46 +0200 Subject: [PATCH 1/2] Harmonize defaults for OCIS_LDAP_DISABLE_USER_MECHANISM envvar --- services/auth-basic/pkg/config/defaults/defaultconfig.go | 2 +- services/users/pkg/config/defaults/defaultconfig.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/auth-basic/pkg/config/defaults/defaultconfig.go b/services/auth-basic/pkg/config/defaults/defaultconfig.go index 3cdd5fd86d6..b21153fc337 100644 --- a/services/auth-basic/pkg/config/defaults/defaultconfig.go +++ b/services/auth-basic/pkg/config/defaults/defaultconfig.go @@ -51,7 +51,7 @@ func DefaultConfig() *config.Config { UserObjectClass: "inetOrgPerson", GroupObjectClass: "groupOfNames", BindDN: "uid=reva,ou=sysusers,o=libregraph-idm", - DisableUserMechanism: "none", + DisableUserMechanism: "attribute", LdapDisabledUsersGroupDN: "cn=DisabledUsersGroup,ou=groups,o=libregraph-idm", IDP: "https://localhost:9200", UserSchema: config.LDAPUserSchema{ diff --git a/services/users/pkg/config/defaults/defaultconfig.go b/services/users/pkg/config/defaults/defaultconfig.go index 0523158e655..533d63621ff 100644 --- a/services/users/pkg/config/defaults/defaultconfig.go +++ b/services/users/pkg/config/defaults/defaultconfig.go @@ -51,7 +51,7 @@ func DefaultConfig() *config.Config { UserObjectClass: "inetOrgPerson", GroupObjectClass: "groupOfNames", BindDN: "uid=reva,ou=sysusers,o=libregraph-idm", - DisableUserMechanism: "none", + DisableUserMechanism: "attribute", LdapDisabledUsersGroupDN: "cn=DisabledUsersGroup,ou=groups,o=libregraph-idm", UserTypeAttribute: "ownCloudUserType", IDP: "https://localhost:9200", From 2a422aa4d6e6ac3027dee20f1a79abed0806ba95 Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 13 Jun 2023 15:35:40 +0200 Subject: [PATCH 2/2] create changelog --- .../fix-defaults-OCIS_LDAP_DISABLE_USER_MECHANISM.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/unreleased/fix-defaults-OCIS_LDAP_DISABLE_USER_MECHANISM.md diff --git a/changelog/unreleased/fix-defaults-OCIS_LDAP_DISABLE_USER_MECHANISM.md b/changelog/unreleased/fix-defaults-OCIS_LDAP_DISABLE_USER_MECHANISM.md new file mode 100644 index 00000000000..cc02630d628 --- /dev/null +++ b/changelog/unreleased/fix-defaults-OCIS_LDAP_DISABLE_USER_MECHANISM.md @@ -0,0 +1,6 @@ +Enhancement: Fix envvar defaults + +Defaults for the envvar OCIS_LDAP_DISABLE_USER_MECHANISM were not used consistently, correct is `attribute`. + +https://github.com/owncloud/ocis/pull/6516 +https://github.com/owncloud/ocis/issues/6513