From f59de03a5090cae8b5422e58f68f4775f22a74aa Mon Sep 17 00:00:00 2001
From: bagas <bagas@fossy.my.id>
Date: Tue, 2 Dec 2025 21:52:23 +0700
Subject: [PATCH] fix: panic due to nil pointer when disconnecting a session

---
 server/http.go     | 17 +++++++++++++----
 session/handler.go | 15 ++-------------
 session/session.go |  8 ++++----
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/server/http.go b/server/http.go
index d714851..f12b10d 100644
--- a/server/http.go
+++ b/server/http.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-var BAD_GATEWAY_RESPONSE = []byte("HTTP/1.1 502 Bad Gateway\r\n" +
+var BadGatewayResponse = []byte("HTTP/1.1 502 Bad Gateway\r\n" +
 	"Content-Length: 11\r\n" +
 	"Content-Type: text/plain\r\n\r\n" +
 	"Bad Gateway")
@@ -32,9 +32,18 @@ type CustomWriter struct {
 }
 
 func (cw *CustomWriter) Read(p []byte) (int, error) {
+	if cw == nil {
+		return 0, errors.New("can not read from nil CustomWriter")
+	}
 	read, err := cw.reader.Read(p)
 	reader := bytes.NewReader(p)
-	reqhf, _ := NewRequestHeaderFactory(reader)
+	reqhf, err := NewRequestHeaderFactory(reader)
+	if err != nil {
+		if errors.Is(err, io.EOF) {
+			return read, io.EOF
+		}
+		return 0, err
+	}
 	cw.interaction.SendMessage(fmt.Sprintf("\033[32m%s %s -> %s %s \033[0m\r\n", time.Now().UTC().Format(time.RFC3339), cw.RemoteAddr.String(), reqhf.Method, reqhf.Path))
 	return read, err
 }
@@ -75,7 +84,7 @@ func isHTTPHeader(buf []byte) bool {
 }
 
 func (cw *CustomWriter) Write(p []byte) (int, error) {
-	if len(p) == len(BAD_GATEWAY_RESPONSE) && bytes.Equal(p, BAD_GATEWAY_RESPONSE) {
+	if len(p) == len(BadGatewayResponse) && bytes.Equal(p, BadGatewayResponse) {
 		return cw.writer.Write(p)
 	}
 
@@ -279,7 +288,7 @@ func forwardRequest(cw *CustomWriter, initialRequest *RequestHeaderFactory, sshS
 }
 
 func sendBadGatewayResponse(writer io.Writer) {
-	_, err := writer.Write(BAD_GATEWAY_RESPONSE)
+	_, err := writer.Write(BadGatewayResponse)
 	if err != nil {
 		log.Printf("failed to write Bad Gateway response: %v", err)
 		return
diff --git a/session/handler.go b/session/handler.go
index 53c753e..5c63338 100644
--- a/session/handler.go
+++ b/session/handler.go
@@ -18,7 +18,7 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-type SessionStatus string
+type Status string
 
 var forbiddenSlug = []string{
 	"ping",
@@ -191,7 +191,7 @@ func (s *SSHSession) handleTCPIPForward(req *ssh.Request) {
 			unassign, success := portUtil.Manager.GetUnassignedPort()
 			portToBind = unassign
 			if !success {
-				s.Interaction.SendMessage(fmt.Sprintf("No available port\r\n", portToBind))
+				s.Interaction.SendMessage("No available port\r\n")
 				err := req.Reply(false, nil)
 				if err != nil {
 					log.Println("Failed to reply to request:", err)
@@ -338,19 +338,8 @@ func (s *SSHSession) acceptTCPConnections() {
 			log.Printf("Failed to open forwarded-tcpip channel: %v", err)
 			return
 		}
-		defer func(channel ssh.Channel) {
-			err := channel.Close()
-			if err != nil {
-				log.Println("Failed to close connection:", err)
-			}
-		}(channel)
 
 		go func() {
-			defer func() {
-				if r := recover(); r != nil {
-					log.Printf("Panic in request handler: %v", r)
-				}
-			}()
 			for req := range reqs {
 				err := req.Reply(false, nil)
 				if err != nil {
diff --git a/session/session.go b/session/session.go
index fc8c126..c44d656 100644
--- a/session/session.go
+++ b/session/session.go
@@ -10,9 +10,9 @@ import (
 )
 
 const (
-	INITIALIZING SessionStatus = "INITIALIZING"
-	RUNNING      SessionStatus = "RUNNING"
-	SETUP        SessionStatus = "SETUP"
+	INITIALIZING Status = "INITIALIZING"
+	RUNNING      Status = "RUNNING"
+	SETUP        Status = "SETUP"
 )
 
 type TunnelType string
@@ -58,7 +58,7 @@ type Session interface {
 }
 
 type Lifecycle struct {
-	Status SessionStatus
+	Status Status
 }
 
 type Forwarder struct {