?

Author: null

transport/internet/finalmask/finalmask.go

@@ -256,8 +256,9 @@ func (l *tcpListener) Accept() (net.Conn, error) {
 
 	newConn, err := l.m.WrapConnServer(conn)
 	if err != nil {
-		errors.LogErrorInner(context.Background(), err, "[mask] failed to wrap connection, falling back to the original connection")
-		return conn, nil
+		errors.LogErrorInner(context.Background(), err, "[mask] failed to wrap connection, closing the original connection")
+		conn.Close()
+		return nil, err
 	}
 
 	return newConn, nil

transport/internet/finalmask/tcp_test.go

@@ -47,14 +47,6 @@ type layerMaskTcp struct {
 	mask finalmask.Tcpmask
 }
 
-type failingWrapMask struct{}
-
-func (failingWrapMask) TCP()                                            {}
-func (f failingWrapMask) WrapConnClient(raw net.Conn) (net.Conn, error) { return raw, nil }
-func (f failingWrapMask) WrapConnServer(raw net.Conn) (net.Conn, error) {
-	return nil, io.ErrClosedPipe
-}
-
 func TestConnReadWrite(t *testing.T) {
 	cases := []layerMaskTcp{
 		{
@@ -255,63 +247,3 @@ func TestTCPcustomClientRejectsMismatchedServerSequence(t *testing.T) {
 		t.Fatalf("expected server timeout after client auth failure, got %v", readErr)
 	}
 }
-
-func TestTCPWrapListenerRejectsImmediateWrapErrors(t *testing.T) {
-	clientManager := finalmask.NewTcpmaskManager([]finalmask.Tcpmask{failingWrapMask{}})
-	serverManager := finalmask.NewTcpmaskManager([]finalmask.Tcpmask{failingWrapMask{}})
-
-	rawLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer rawLn.Close()
-
-	ln, err := serverManager.WrapListener(rawLn)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	accepted := make(chan struct {
-		conn net.Conn
-		err  error
-	}, 1)
-	go func() {
-		conn, err := ln.Accept()
-		accepted <- struct {
-			conn net.Conn
-			err  error
-		}{conn: conn, err: err}
-	}()
-
-	clientRaw, err := net.Dial("tcp", rawLn.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer clientRaw.Close()
-
-	client, err := clientManager.WrapConnClient(clientRaw)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_ = client.SetDeadline(time.Now().Add(time.Second))
-
-	writeErr := make(chan error, 1)
-	go func() {
-		_, err := client.Write([]byte("payload"))
-		writeErr <- err
-	}()
-
-	result := <-accepted
-	if result.err == nil {
-		if result.conn != nil {
-			result.conn.Close()
-		}
-		t.Fatal("expected wrapped listener accept to fail")
-	}
-	if result.conn != nil {
-		result.conn.Close()
-		t.Fatalf("expected no raw conn on wrapped listener failure, got %T", result.conn)
-	}
-	<-writeErr
-}