Skip to content

fix: Close client tunnel on network error #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2025
Merged

fix: Close client tunnel on network error #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,9 @@ func (ms *MmarServer) processTunnelMessages(ct *ClientTunnel) {
tunnelMsg, err := ct.ReceiveMessage()
if err != nil {
logger.Log(constants.DEFAULT_COLOR, fmt.Sprintf("Receive Message from client tunnel errored: %v", err))
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) || errors.Is(err, net.ErrClosed) {
if utils.NetworkError(err) {
// If error with connection, stop processing messages
ms.closeClientTunnel(ct)
return
}
continue
Expand Down
10 changes: 10 additions & 0 deletions internal/utils/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ import (
"crypto/sha256"
"crypto/subtle"
"encoding/hex"
"errors"
"fmt"
"io"
"net"
"os"
"strings"
"syscall"

"github.com/yusuf-musleh/mmar/constants"
)
Expand Down Expand Up @@ -104,3 +107,10 @@ func ValidCredentials(username string, password string) bool {
validPassword := subtle.ConstantTimeCompare(passwordHash[:], passwordDecodedHash) == 1
return validUsername && validPassword
}

func NetworkError(err error) bool {
return errors.Is(err, io.EOF) ||
errors.Is(err, io.ErrUnexpectedEOF) ||
errors.Is(err, net.ErrClosed) ||
errors.Is(err, syscall.ECONNRESET)
}
Loading