blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(uac): ignore duplicates, spaces and casing in portainer labels (#4823)

Browse Source 
* fix: ignore duplicates, spaces and casing in portainer labels

* cleanup

* fix: rebase error
This commit is contained in:
Dmitry Salakhov
2021-03-03 09:38:59 +00:00
committed by GitHub
parent 6c8276c65c
commit f03cf2a6e4
4 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/bolt/team/team.go
View File

@@ -1,7 +1,9 @@
package team
import (
"github.com/portainer/portainer/api"
"strings"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/bolt/errors"
"github.com/portainer/portainer/api/bolt/internal"
@@ -58,7 +60,7 @@ func (service *Service) TeamByName(name string) (*portainer.Team, error) {
return err
}
if t.Name == name {
if strings.EqualFold(t.Name, name) {
team = &t
break
}

7
api/bolt/user/user.go
View File

@@ -1,10 +1,11 @@
package user
import (
"github.com/portainer/portainer/api"
"strings"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/bolt/errors"
"github.com/portainer/portainer/api/bolt/internal"
"strings"
"github.com/boltdb/bolt"
)
@@ -61,7 +62,7 @@ func (service *Service) UserByUsername(username string) (*portainer.User, error)
return err
}
if strings.ToLower(u.Username) == username {
if strings.EqualFold(u.Username, username) {
user = &u
break
}