Skip to content

Commit

Permalink
Adjust UserGroupFilter default to match latest reva changes
Browse files Browse the repository at this point in the history
With cs3org/reva#2436 the groupfilter setting
for the user provider was adjusted to no longer use a go-template value
as the input. Adjust our default to match those changes. For details
see:
https://github.com/cs3org/reva/blob/edge/changelog/unreleased/ldap-usergroupfilter-template.md
  • Loading branch information
rhafer committed Jan 24, 2022
1 parent 60b5a1b commit 897144b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion storage/pkg/config/defaultconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func DefaultConfig() *Config {
UserFilter: "(&(objectclass=posixAccount)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
UserAttributeFilter: "(&(objectclass=posixAccount)({{attr}}={{value}}))",
UserFindFilter: "(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
UserGroupFilter: "(&(objectclass=posixGroup)(cn={{.}}*))", // FIXME (&(objectclass=posixGroup)(ownclouduuid={{.OpaqueId}}*)) in reva the template is executed with a string. IIRC rhaferkamp mentioned this
UserGroupFilter: "(&(objectclass=posixGroup)(memberuid={{query}}*))",
GroupFilter: "(&(objectclass=posixGroup)(|(ownclouduuid={{.OpaqueId}})(cn={{.OpaqueId}})))",
GroupAttributeFilter: "(&(objectclass=posixGroup)({{attr}}={{value}}))",
GroupFindFilter: "(&(objectclass=posixGroup)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))",
Expand Down

0 comments on commit 897144b

Please sign in to comment.