From 03a8db45c1d703049e95f9aca1525dd357e5825f Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 4 Aug 2022 11:12:27 +0200 Subject: [PATCH] Switch default for user and group substring search We now default LDAP_GROUP_SUBSTRING_FILTER_TYPE and LDAP_USER_SUBSTRING_FILTER_TYPE to "any", which means full substring search. The previous default was just using prefix matching. Closes #4282 --- .drone.star | 2 -- services/groups/pkg/config/defaults/defaultconfig.go | 2 +- services/users/pkg/config/defaults/defaultconfig.go | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 47e78ca72..12d3fd1ef 100644 --- a/.drone.star +++ b/.drone.star @@ -1808,8 +1808,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = environment = { "OCIS_URL": OCIS_URL, "OCIS_CONFIG_DIR": "/root/.ocis/config", - "LDAP_GROUP_SUBSTRING_FILTER_TYPE": "any", - "LDAP_USER_SUBSTRING_FILTER_TYPE": "any", "GATEWAY_GRPC_ADDR": "0.0.0.0:9142", # cs3api-validator needs the cs3api gatway exposed "STORAGE_USERS_DRIVER": "%s" % (storage), "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root", diff --git a/services/groups/pkg/config/defaults/defaultconfig.go b/services/groups/pkg/config/defaults/defaultconfig.go index ec5cedf54..822efa66d 100644 --- a/services/groups/pkg/config/defaults/defaultconfig.go +++ b/services/groups/pkg/config/defaults/defaultconfig.go @@ -43,7 +43,7 @@ func DefaultConfig() *config.Config { GroupBaseDN: "ou=groups,o=libregraph-idm", UserScope: "sub", GroupScope: "sub", - GroupSubstringFilterType: "initial", + GroupSubstringFilterType: "any", UserFilter: "", GroupFilter: "", UserObjectClass: "inetOrgPerson", diff --git a/services/users/pkg/config/defaults/defaultconfig.go b/services/users/pkg/config/defaults/defaultconfig.go index b6f43113d..2f7e87170 100644 --- a/services/users/pkg/config/defaults/defaultconfig.go +++ b/services/users/pkg/config/defaults/defaultconfig.go @@ -43,7 +43,7 @@ func DefaultConfig() *config.Config { GroupBaseDN: "ou=groups,o=libregraph-idm", UserScope: "sub", GroupScope: "sub", - UserSubstringFilterType: "initial", + UserSubstringFilterType: "any", UserFilter: "", GroupFilter: "", UserObjectClass: "inetOrgPerson",