gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 15:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1513 from openziti/fix-remove-terminator-panic

Browse Source 
Fix panic removing terminator with invalid session. Fixes #1512
This commit is contained in:
Paul Lorenz
2023-06-06 10:52:37 -04:00
committed by GitHub
parent 9ff94f73e4 f31f849344
commit 8e299eb352
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/handler_edge_ctrl/common.go
+6 -2
View File
@@ -122,8 +122,12 @@ func (self *baseSessionRequestContext) newChangeContext() *change.Context {
if self.session != nil {
result.
SetChangeAuthorType(change.AuthorTypeIdentity).
SetChangeAuthorId(self.session.IdentityId).
SetChangeAuthorName(self.apiSession.Identity.Name)
SetChangeAuthorId(self.session.IdentityId)
if self.apiSession != nil && self.apiSession.Identity != nil {
result.SetChangeAuthorName(self.apiSession.Identity.Name)
} else if authorIdentity, _ := self.handler.getAppEnv().Managers.Identity.Read(self.session.IdentityId); authorIdentity != nil {
result.SetChangeAuthorName(authorIdentity.Name)
}
} else if self.sourceRouter != nil {
result.
SetChangeAuthorType(change.AuthorTypeRouter).