trim values for string lists which can be set as env vars

See #857

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-05-31 18:22:18 +02:00
parent 7329cd804b
commit cc2f23bd89
20 changed files with 74 additions and 49 deletions

View File

@@ -1728,12 +1728,12 @@ func (u *User) mergeFilePatterns(group Group, groupType int) {
}
func (u *User) removeDuplicatesAfterGroupMerge() {
u.Filters.AllowedIP = util.RemoveDuplicates(u.Filters.AllowedIP)
u.Filters.DeniedIP = util.RemoveDuplicates(u.Filters.DeniedIP)
u.Filters.DeniedLoginMethods = util.RemoveDuplicates(u.Filters.DeniedLoginMethods)
u.Filters.DeniedProtocols = util.RemoveDuplicates(u.Filters.DeniedProtocols)
u.Filters.WebClient = util.RemoveDuplicates(u.Filters.WebClient)
u.Filters.TwoFactorAuthProtocols = util.RemoveDuplicates(u.Filters.TwoFactorAuthProtocols)
u.Filters.AllowedIP = util.RemoveDuplicates(u.Filters.AllowedIP, false)
u.Filters.DeniedIP = util.RemoveDuplicates(u.Filters.DeniedIP, false)
u.Filters.DeniedLoginMethods = util.RemoveDuplicates(u.Filters.DeniedLoginMethods, false)
u.Filters.DeniedProtocols = util.RemoveDuplicates(u.Filters.DeniedProtocols, false)
u.Filters.WebClient = util.RemoveDuplicates(u.Filters.WebClient, false)
u.Filters.TwoFactorAuthProtocols = util.RemoveDuplicates(u.Filters.TwoFactorAuthProtocols, false)
u.SetEmptySecretsIfNil()
u.groupSettingsApplied = true
}