|
|
@ -4,6 +4,7 @@ import (
|
|
|
|
"github.com/portainer/portainer/api"
|
|
|
|
"github.com/portainer/portainer/api"
|
|
|
|
"github.com/portainer/portainer/api/bolt/errors"
|
|
|
|
"github.com/portainer/portainer/api/bolt/errors"
|
|
|
|
"github.com/portainer/portainer/api/bolt/internal"
|
|
|
|
"github.com/portainer/portainer/api/bolt/internal"
|
|
|
|
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/boltdb/bolt"
|
|
|
|
"github.com/boltdb/bolt"
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -47,6 +48,8 @@ func (service *Service) User(ID portainer.UserID) (*portainer.User, error) {
|
|
|
|
func (service *Service) UserByUsername(username string) (*portainer.User, error) {
|
|
|
|
func (service *Service) UserByUsername(username string) (*portainer.User, error) {
|
|
|
|
var user *portainer.User
|
|
|
|
var user *portainer.User
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
username = strings.ToLower(username)
|
|
|
|
|
|
|
|
|
|
|
|
err := service.db.View(func(tx *bolt.Tx) error {
|
|
|
|
err := service.db.View(func(tx *bolt.Tx) error {
|
|
|
|
bucket := tx.Bucket([]byte(BucketName))
|
|
|
|
bucket := tx.Bucket([]byte(BucketName))
|
|
|
|
cursor := bucket.Cursor()
|
|
|
|
cursor := bucket.Cursor()
|
|
|
@ -58,7 +61,7 @@ func (service *Service) UserByUsername(username string) (*portainer.User, error)
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if u.Username == username {
|
|
|
|
if strings.ToLower(u.Username) == username {
|
|
|
|
user = &u
|
|
|
|
user = &u
|
|
|
|
break
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -123,6 +126,7 @@ func (service *Service) UsersByRole(role portainer.UserRole) ([]portainer.User,
|
|
|
|
// UpdateUser saves a user.
|
|
|
|
// UpdateUser saves a user.
|
|
|
|
func (service *Service) UpdateUser(ID portainer.UserID, user *portainer.User) error {
|
|
|
|
func (service *Service) UpdateUser(ID portainer.UserID, user *portainer.User) error {
|
|
|
|
identifier := internal.Itob(int(ID))
|
|
|
|
identifier := internal.Itob(int(ID))
|
|
|
|
|
|
|
|
user.Username = strings.ToLower(user.Username)
|
|
|
|
return internal.UpdateObject(service.db, BucketName, identifier, user)
|
|
|
|
return internal.UpdateObject(service.db, BucketName, identifier, user)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -133,6 +137,7 @@ func (service *Service) CreateUser(user *portainer.User) error {
|
|
|
|
|
|
|
|
|
|
|
|
id, _ := bucket.NextSequence()
|
|
|
|
id, _ := bucket.NextSequence()
|
|
|
|
user.ID = portainer.UserID(id)
|
|
|
|
user.ID = portainer.UserID(id)
|
|
|
|
|
|
|
|
user.Username = strings.ToLower(user.Username)
|
|
|
|
|
|
|
|
|
|
|
|
data, err := internal.MarshalObject(user)
|
|
|
|
data, err := internal.MarshalObject(user)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|