check rpc err on terminate cmd

BishopFox · Feb 13, 2022 · 34738d2 · 34738d2
1 parent de31135
commit 34738d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/client/command/processes/terminate.go b/client/command/processes/terminate.go
@@ -41,6 +41,10 @@ func TerminateCmd(ctx *grumble.Context, con *console.SliverConsoleClient) {
 		Pid:     int32(pid),
 		Force:   ctx.Flags.Bool("force"),
 	})
+	if err != nil {
+		con.PrintErrorf("Terminate failed: %s", err)
+		return
+	}
 
 	if terminated.Response != nil && terminated.Response.Async {
 		con.AddBeaconCallback(terminated.Response.TaskID, func(task *clientpb.BeaconTask) {

diff --git a/server/core/sessions.go b/server/core/sessions.go
@@ -209,7 +209,7 @@ func (s *sessions) Remove(sessionID string) {
 	for _, child := range children {
 		childSession, ok := s.sessions.LoadAndDelete(child.SessionID)
 		if ok {
-			// PivotSessions.Delete(childSession.(*Session).Connection.ID)
+			PivotSessions.Delete(childSession.(*Session).Connection.ID)
 			EventBroker.Publish(Event{
 				EventType: consts.SessionClosedEvent,
 				Session:   childSession.(*Session),