Order shutdowns and keep sessions open if relevant. Revert shell changes

Author: terrorbyte

c2/httpserveshell/httpserveshell.go

@@ -164,6 +164,7 @@ func (serveShell *Server) Run(timeout int) {
 			go func() {
 				for {
 					if sslshell.GetInstance().Channel().Shutdown.Load() {
+						serveShell.Channel().Shutdown.Store(true)
 						wg.Done()
 
 						break
@@ -176,6 +177,7 @@ func (serveShell *Server) Run(timeout int) {
 			go func() {
 				for {
 					if simpleshell.GetServerInstance().Channel().Shutdown.Load() {
+						serveShell.Channel().Shutdown.Store(true)
 						wg.Done()
 
 						break
@@ -189,6 +191,13 @@ func (serveShell *Server) Run(timeout int) {
 	wg.Add(1)
 	go func() {
 		httpservefile.GetInstance().Run(timeout)
+		for {
+			if serveShell.Channel().Shutdown.Load() {
+				serveShell.Shutdown()
+
+				break
+			}
+		}
 	}()
 
 	// wait until the go routines are clean up

c2/simpleshell/simpleshellserver.go

@@ -95,10 +95,8 @@ func (shellServer *Server) Run(timeout int) {
 	go func() {
 		time.Sleep(time.Duration(timeout) * time.Second)
 		if !shellServer.Channel().HasSessions() {
-			if shellServer.Channel().Shutdown.Load() {
-				output.PrintFrameworkError("Timeout met. Shutting down shell listener.")
-				shellServer.Channel().Shutdown.Store(true)
-			}
+			output.PrintFrameworkError("Timeout met. Shutting down shell listener.")
+			shellServer.Channel().Shutdown.Store(true)
 		}
 	}()
 	// Track if the shutdown is signaled for any reason.