mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-08 04:20:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused config vars

Browse Source 
GroupMembersCacheExpiration is referenced nowhere. Currently we don't
have any caching. LoginAttributes is not used by the reva groupprovider.
This commit is contained in:
Ralf Haferkamp
2022-05-12 12:58:55 +02:00
parent 7532bc6c99
commit 7457117dbf
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/groups/pkg/config/config.go
+2 -4
View File
@@ -20,9 +20,8 @@ type Config struct {
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"GROUPS_SKIP_USER_GROUPS_IN_TOKEN"`
GroupMembersCacheExpiration int `yaml:"group_members_cache_expiration"`
Driver string `yaml:"driver"`
Drivers Drivers `yaml:"drivers"`
Driver string `yaml:"driver"`
Drivers Drivers `yaml:"drivers"`
Supervised bool `yaml:"-"`
Context context.Context `yaml:"-"`
@@ -79,7 +78,6 @@ type LDAPDriver struct {
GroupFilter string `yaml:"group_filter" env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
UserObjectClass string `yaml:"user_object_class" env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `yaml:"group_object_class" env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `yaml:"login_attributes" env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `yaml:"idp" env:"OCIS_URL;OCIS_OIDC_ISSUER;GROUPS_IDP_URL"`
UserSchema LDAPUserSchema `yaml:"user_schema"`
GroupSchema LDAPGroupSchema `yaml:"group_schema"`
extensions/groups/pkg/config/defaults/defaultconfig.go
-2
View File
@@ -30,7 +30,6 @@ func DefaultConfig() *config.Config {
Service: config.Service{
Name: "groups",
},
GroupMembersCacheExpiration: 5,
Reva: &config.Reva{
Address: "127.0.0.1:9142",
},
@@ -44,7 +43,6 @@ func DefaultConfig() *config.Config {
GroupBaseDN: "ou=groups,o=libregraph-idm",
UserScope: "sub",
GroupScope: "sub",
LoginAttributes: []string{"uid", "mail"},
UserFilter: "",
GroupFilter: "",
UserObjectClass: "inetOrgPerson",
extensions/groups/pkg/revaconfig/config.go
+9 -11
View File
@@ -31,16 +31,15 @@ func GroupsConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"ldap": ldapConfigFromString(cfg.Drivers.LDAP),
"rest": map[string]interface{}{
"client_id": cfg.Drivers.REST.ClientID,
"client_secret": cfg.Drivers.REST.ClientSecret,
"redis_address": cfg.Drivers.REST.RedisAddr,
"redis_username": cfg.Drivers.REST.RedisUsername,
"redis_password": cfg.Drivers.REST.RedisPassword,
"group_members_cache_expiration": cfg.GroupMembersCacheExpiration,
"id_provider": cfg.Drivers.REST.IDProvider,
"api_base_url": cfg.Drivers.REST.APIBaseURL,
"oidc_token_endpoint": cfg.Drivers.REST.OIDCTokenEndpoint,
"target_api": cfg.Drivers.REST.TargetAPI,
"client_id": cfg.Drivers.REST.ClientID,
"client_secret": cfg.Drivers.REST.ClientSecret,
"redis_address": cfg.Drivers.REST.RedisAddr,
"redis_username": cfg.Drivers.REST.RedisUsername,
"redis_password": cfg.Drivers.REST.RedisPassword,
"id_provider": cfg.Drivers.REST.IDProvider,
"api_base_url": cfg.Drivers.REST.APIBaseURL,
"oidc_token_endpoint": cfg.Drivers.REST.OIDCTokenEndpoint,
"target_api": cfg.Drivers.REST.TargetAPI,
},
},
},
@@ -64,7 +63,6 @@ func ldapConfigFromString(cfg config.LDAPDriver) map[string]interface{} {
"group_filter": cfg.GroupFilter,
"user_objectclass": cfg.UserObjectClass,
"group_objectclass": cfg.GroupObjectClass,
"login_attributes": cfg.LoginAttributes,
"idp": cfg.IDP,
"user_schema": map[string]interface{}{
"id": cfg.UserSchema.ID,