ssh: fix race condition in HandleRequests() method

Author: gustavosbarreto

ssh/server/handler/sftp.go

@@ -108,7 +108,7 @@ func connectSFTP(ctx context.Context, client gliderssh.Session, sess *session.Se
 		return err
 	}
 
-	go session.HandleRequests(ctx, reqs, api)
+	go session.HandleRequests(ctx, reqs, api, ctx.Done())
 
 	if errs := api.SessionAsAuthenticated(sess.UID); len(errs) > 0 {
 		return errs[0]

ssh/server/handler/ssh.go

@@ -187,7 +187,7 @@ func connectSSH(ctx context.Context, client gliderssh.Session, sess *session.Ses
 
 	defer agent.Close()
 
-	go session.HandleRequests(ctx, reqs, api)
+	go session.HandleRequests(ctx, reqs, api, ctx.Done())
 
 	metadata.MaybeStoreEstablished(ctx.(gliderssh.Context), true)
 

ssh/session/session.go

@@ -259,7 +259,7 @@ func loadEnv(env []string) map[string]string {
 	return m
 }
 
-func HandleRequests(ctx context.Context, reqs <-chan *gossh.Request, c internalclient.Client) {
+func HandleRequests(ctx context.Context, reqs <-chan *gossh.Request, c internalclient.Client, done <-chan struct{}) {
 	for {
 		select {
 		case req := <-reqs:
@@ -285,7 +285,7 @@ func HandleRequests(ctx context.Context, reqs <-chan *gossh.Request, c internalc
 					}
 				}
 			}
-		case <-ctx.Done():
+		case <-done:
 			return
 		}
 	}