aes: get secret from file

2 files changed, 23 insertions, 32 deletions

diff --git a/pkg/test/auth_test.go b/pkg/test/auth_test.go
index 1741d68..ece17d3 100644
--- a/pkg/test/auth_test.go
+++ b/pkg/test/auth_test.go
@@ -1,9 +1,8 @@
 package test
 
 import (
-	"testing"
-	"fmt"
 	"os"
+	"testing"
 )
 
 func TestAuthHook(t *testing.T) {
@@ -12,25 +11,17 @@ func TestAuthHook(t *testing.T) {
 
 	c := e.newInstance()
 
-	var secrets string
-
-	f, err := os.CreateTemp("", "test-auth-")
-	if err != nil {
-		e.Fatalf("create temp: %v", err)
-	}
-
-	secrets = f.Name()
-
-	fmt.Fprintln(f, "T t")
-	fmt.Fprintln(f, "X x")
-	f.Close()
+	authfile := e.NewTempFile("test-auth-", "T t\nX x\n")
+	defer os.Remove(authfile)
 
-	defer os.Remove(secrets)
+	aesfile := e.NewTempFile("test-aes-", "secret")
+	defer os.Remove(aesfile)
 
 	c.Exec("add name T listen,addr=%%0 auth aes dial,addr=@[tunnel.X.listen]")
 	c.Exec("add name X listen,addr=%%0 /aes /auth dial,addr=@[addr]")
 
-	c.Exec("set authfile %s", secrets)
+	c.Exec("set aesfile %s", aesfile)
+	c.Exec("set authfile %s", authfile)
 	c.Exec("set tunnel.T.authuser T")
 	c.Exec("set tunnel.X.authuser X")
 
@@ -56,24 +47,13 @@ func TestAuthPassiveHook(t *testing.T) {
 
 	c := e.newInstance()
 
-	var secrets string
+	authfile := e.NewTempFile("test-auth-", "T t\n")
+	defer os.Remove(authfile)
 
-	f, err := os.CreateTemp("", "test-auth-passive-")
-	if err != nil {
-		e.Fatalf("create temp: %v", err)
-	}
-
-	secrets = f.Name()
-
-	fmt.Fprintln(f, "T t")
-	f.Close()
-
-	defer os.Remove(secrets)
-
-	c.Exec("add name T listen,addr=%%0 auth aes dial,addr=@[tunnel.X.listen]")
-	c.Exec("add name X listen,addr=%%0 /aes /auth,passive dial,addr=@[addr]")
+	c.Exec("add name T listen,addr=%%0 auth dial,addr=@[tunnel.X.listen]")
+	c.Exec("add name X listen,addr=%%0 /auth,passive dial,addr=@[addr]")
 
-	c.Exec("set authfile %s", secrets)
+	c.Exec("set authfile %s", authfile)
 	c.Exec("set tunnel.T.authuser T")
 
 	listen := e.Listen("tcp", "127.0.0.1:0")
diff --git a/pkg/test/test.go b/pkg/test/test.go
index 1237fe7..16860b1 100644
--- a/pkg/test/test.go
+++ b/pkg/test/test.go
@@ -178,3 +178,14 @@ func (e *env) ReadFull(conn net.Conn, buf []byte) {
 	}
 	conn.SetDeadline(time.Time{})
 }
+
+func (e *env) NewTempFile(pattern string, data string) string {
+	f, err := os.CreateTemp("", pattern)
+	if err != nil {
+		e.Fatalf("create temp: %v", err)
+	}
+	defer f.Close()
+
+	io.WriteString(f, data)
+	return f.Name()
+}