always test TCP implementation

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

Author: eternal-flame-AD

v2/cli_flags.go

@@ -3,6 +3,8 @@ package plugin
 import (
 	"flag"
 	"os"
+	"strconv"
+	"strings"
 )
 
 type PluginCliFlags struct {
@@ -17,16 +19,40 @@ func ParsePluginCLIFlags(args []string) (*PluginCliFlags, error) {
 	var kexReqFileName string
 	var kexRespFileName string
 	var debug bool
-	flagSet.StringVar(&kexReqFileName, "kex-req-file", "", "File name for the key exchange for Transport Auth.")
-	flagSet.StringVar(&kexRespFileName, "kex-resp-file", "", "File name for the key exchange for Transport Auth.")
+	flagSet.StringVar(&kexReqFileName, "kex-req-file", "", "File name for the key exchange for Transport Auth. /proc/self/fd/* can be used to open a file descriptor cross platform.")
+	flagSet.StringVar(&kexRespFileName, "kex-resp-file", "", "File name for the key exchange for Transport Auth. /proc/self/fd/* can be used to open a file descriptor cross platform.")
 	flagSet.BoolVar(&debug, "debug", false, "Enable debug mode.")
 	flagSet.Parse(args)
 
-	kexReqFile, err := os.OpenFile(kexReqFileName, os.O_WRONLY, 0)
-	if err != nil {
-		return nil, err
+	var kexReqFile *os.File
+	var kexRespFile *os.File
+	var err error
+
+	if fdNumber, found := strings.CutPrefix(kexReqFileName, "/proc/self/fd/"); found {
+		fdNumber, err := strconv.ParseUint(fdNumber, 10, 64)
+		kexReqFile = os.NewFile(uintptr(fdNumber), kexReqFileName)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		kexReqFile, err = os.OpenFile(kexReqFileName, os.O_WRONLY, 0)
+		if err != nil {
+			return nil, err
+		}
 	}
-	kexRespFile, err := os.OpenFile(kexRespFileName, os.O_RDONLY, 0)
+	if fdNumber, found := strings.CutPrefix(kexRespFileName, "/proc/self/fd/"); found {
+		fdNumber, err := strconv.ParseUint(fdNumber, 10, 64)
+		kexRespFile = os.NewFile(uintptr(fdNumber), kexRespFileName)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		kexRespFile, err = os.OpenFile(kexRespFileName, os.O_RDONLY, 0)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if err != nil {
 		return nil, err
 	}

v2/examples_v1/minimal/minimal_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"net"
 	"os"
 	"testing"
 
@@ -15,7 +16,7 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func TestEcho(t *testing.T) {
+func testEchoImpl(t *testing.T, listener net.Listener, addr string) {
 	pluginInfo := GetGotifyPluginInfo()
 
 	client, err := plugin.NewEphemeralTLSClient()
@@ -50,10 +51,6 @@ func TestEcho(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	listener, addr, err := plugin.NewListener()
-	if err != nil {
-		t.Fatal(err)
-	}
 	go func() {
 		compatV1.ServeTLS(listener, "", "")
 	}()
@@ -110,3 +107,19 @@ func TestEcho(t *testing.T) {
 		}
 	}
 }
+
+func TestEcho(t *testing.T) {
+	listener, addr, err := plugin.NewListener()
+	if err != nil {
+		t.Fatal(err)
+	}
+	testEchoImpl(t, listener, addr)
+}
+
+func TestEchoTCP(t *testing.T) {
+	listener, addr, err := plugin.NewTCPListener()
+	if err != nil {
+		t.Fatal(err)
+	}
+	testEchoImpl(t, listener, addr)
+}

v2/pipe_not_unix.go

@@ -3,14 +3,9 @@
 package plugin
 
 import (
-	"fmt"
 	"net"
 )
 
 func NewListener() (net.Listener, string, error) {
-	listener, err := net.Listen("tcp", "[::1]:0")
-	if err != nil {
-		return nil, "", err
-	}
-	return listener, fmt.Sprintf("dns://%s", listener.Addr().String()), nil
+	return NewTCPListener()
 }

v2/pipe_tcp.go

@@ -0,0 +1,14 @@
+package plugin
+
+import (
+	"fmt"
+	"net"
+)
+
+func NewTCPListener() (net.Listener, string, error) {
+	listener, err := net.Listen("tcp", "[::1]:0")
+	if err != nil {
+		return nil, "", err
+	}
+	return listener, fmt.Sprintf("dns:///%s", listener.Addr().String()), nil
+}