Skip to content

Commit 9750d01

Browse files
committed
BUG/MAJOR: users: fix panic when insecure isn't set
1 parent c46f910 commit 9750d01

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

configuration/user.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,18 @@ func (u *Users) Init() error {
8080
mode := configuration.Mode.Load()
8181
allUsers := configuration.GetUsers() // single + cluster mode
8282
if len(allUsers) > 0 {
83-
for _, user := range allUsers {
84-
if mode != ModeCluster || strings.HasPrefix(user.Name, storagetype.DapiClusterUserPrefix) {
85-
u.users = append(u.users, types.User{
86-
Name: user.Name,
87-
IsInsecure: *user.Insecure,
88-
Password: *user.Password,
89-
})
83+
for _, storageUser := range allUsers {
84+
if mode != ModeCluster || strings.HasPrefix(storageUser.Name, storagetype.DapiClusterUserPrefix) {
85+
user := types.User{
86+
Name: storageUser.Name,
87+
}
88+
if storageUser.Password != nil {
89+
user.Password = *storageUser.Password
90+
}
91+
if storageUser.Insecure != nil {
92+
user.IsInsecure = *storageUser.Insecure
93+
}
94+
u.users = append(u.users, user)
9095
}
9196
}
9297
return nil

0 commit comments

Comments
 (0)