Merge pull request #299 from soraxas/feat/more-generic-cache

Remove checking for parent / grandparent process
quexten · Nov 1, 2024 · 490dfae · 490dfae
2 parents 51940fa + cffa650
commit 490dfae
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/cli/agent/systemauth/systemauth.go b/cli/agent/systemauth/systemauth.go
@@ -55,9 +55,12 @@ func (s *SessionStore) CreateSession(pid int, parentpid int, grandparentpid int,
 
 func (s *SessionStore) verifySession(ctx sockets.CallingContext, sessionType SessionType) bool {
 	for _, session := range s.Store {
-		if session.ParentPid == ctx.ParentProcessPid && session.GrandParentPid == ctx.GrandParentProcessPid && session.sessionType == sessionType {
-			if session.Expires.After(time.Now()) {
-				return true
+		if session.sessionType == sessionType {
+			// only check for ancestor if the session is not a ssh session
+			if sessionType == SSHKey || (session.ParentPid == ctx.ParentProcessPid && session.GrandParentPid == ctx.GrandParentProcessPid) {
+				if session.Expires.After(time.Now()) {
+					return true
+				}
 			}
 		}
 	}