opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12831 from swordqiu/automated-cherry-pick-of-#12829-upstream-release-3.7

Browse Source 
Automated cherry pick of #12829: fix: opslog might log event with empty usercred
This commit is contained in:
Zexi Li
2021-12-07 10:24:47 +08:00
committed by GitHub
parent ad9575a757 1c9a4d208c
commit 4862cd2343
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/opslog.go
+23 -11
View File
@@ -166,17 +166,29 @@ func (manager *SOpsLogManager) LogEvent(model IModel, action string, notes inter
ObjName: objName,
Action: action,
Notes: stringutils.Interface2String(notes),
ProjectId: userCred.GetProjectId(),
Project: userCred.GetProjectName(),
ProjectDomainId: userCred.GetProjectDomainId(),
ProjectDomain: userCred.GetProjectDomain(),
UserId: userCred.GetUserId(),
User: userCred.GetUserName(),
DomainId: userCred.GetDomainId(),
Domain: userCred.GetDomainName(),
Roles: strings.Join(userCred.GetRoles(), ","),
}
if userCred == nil {
log.Warningf("Log event with empty userCred: objType=%s objId=%s objName=%s action=%s", model.Keyword(), objId, objName, action)
const unknown = "unknown"
opslog.ProjectId = unknown
opslog.Project = unknown
opslog.ProjectDomainId = unknown
opslog.ProjectDomain = unknown
opslog.UserId = unknown
opslog.User = unknown
opslog.DomainId = unknown
opslog.Domain = unknown
opslog.Roles = unknown
} else {
opslog.ProjectId = userCred.GetProjectId()
opslog.Project = userCred.GetProjectName()
opslog.ProjectDomainId = userCred.GetProjectDomainId()
opslog.ProjectDomain = userCred.GetProjectDomain()
opslog.UserId = userCred.GetUserId()
opslog.User = userCred.GetUserName()
opslog.DomainId = userCred.GetDomainId()
opslog.Domain = userCred.GetDomainName()
opslog.Roles = strings.Join(userCred.GetRoles(), ",")
}
opslog.SetModelManager(OpsLog, opslog)