From 8cf960df7cee99a3f6ba2bb80030421eabe58dcc Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Wed, 24 Jul 2019 09:10:18 +0800 Subject: [PATCH] fix: keystone user initialization hit empty extra --- pkg/keystone/models/users.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/keystone/models/users.go b/pkg/keystone/models/users.go index da2849d42b..67a4ccbe58 100644 --- a/pkg/keystone/models/users.go +++ b/pkg/keystone/models/users.go @@ -116,10 +116,13 @@ func (manager *SUserManager) InitializeData() error { if len(name) == 0 { name = extUser.IdpName } - desc, _ := users[i].Extra.GetString("description") - email, _ := users[i].Extra.GetString("email") - mobile, _ := users[i].Extra.GetString("mobile") - dispName, _ := users[i].Extra.GetString("displayname") + var desc, email, mobile, dispName string + if users[i].Extra != nil { + desc, _ = users[i].Extra.GetString("description") + email, _ = users[i].Extra.GetString("email") + mobile, _ = users[i].Extra.GetString("mobile") + dispName, _ = users[i].Extra.GetString("displayname") + } _, err = db.Update(&users[i], func() error { users[i].Name = name if len(email) > 0 {