Only run X forwarding on Linux

kylecarbs · kylecarbs · commit 52ddc114f2be · 2023-04-20T02:31:04.000Z
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -85,7 +85,7 @@ func NewServer(ctx context.Context, logger slog.Logger, fs afero.Fs, maxTimeout
 	if x11SocketDir == "" {
 		x11SocketDir = filepath.Join(os.TempDir(), ".X11-unix")
 	}
-	err = fs.MkdirAll(x11SocketDir, 0700)
+	err = fs.MkdirAll(x11SocketDir, 0o700)
 	if err != nil {
 		return nil, err
 	}
diff --git a/agent/agentssh/x11.go b/agent/agentssh/x11.go
@@ -103,7 +103,7 @@ func addXauthEntry(fs afero.Fs, host string, display string, authProtocol string
 	xauthPath := filepath.Join(homeDir, ".Xauthority")
 
 	// Open or create the Xauthority file
-	file, err := fs.OpenFile(xauthPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
+	file, err := fs.OpenFile(xauthPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0o600)
 	if err != nil {
 		return xerrors.Errorf("failed to open Xauthority file: %w", err)
 	}
diff --git a/agent/agentssh/x11_test.go b/agent/agentssh/x11_test.go
@@ -4,7 +4,9 @@ import (
 	"context"
 	"encoding/hex"
 	"net"
+	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/gliderlabs/ssh"
@@ -23,6 +25,9 @@ import (
 
 func TestServer_X11(t *testing.T) {
 	t.Parallel()
+	if runtime.GOOS != "linux" {
+		t.Skip("X11 forwarding is only supported on Linux")
+	}
 
 	ctx := context.Background()
 	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
@@ -79,4 +84,10 @@ func TestServer_X11(t *testing.T) {
 	require.NoError(t, err)
 	s.Close()
 	<-done
+
+	// Ensure the Xauthority file was written!
+	home, err := os.UserHomeDir()
+	require.NoError(t, err)
+	_, err = fs.Stat(filepath.Join(home, ".Xauthority"))
+	require.NoError(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func NewServer(ctx context.Context, logger slog.Logger, fs afero.Fs, maxTimeout`
`85`	`85`	`if x11SocketDir == "" {`
`86`	`86`	`x11SocketDir = filepath.Join(os.TempDir(), ".X11-unix")`
`87`	`87`	`}`
`88`		`- err = fs.MkdirAll(x11SocketDir, 0700)`
	`88`	`+ err = fs.MkdirAll(x11SocketDir, 0o700)`
`89`	`89`	`if err != nil {`
`90`	`90`	`return nil, err`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func addXauthEntry(fs afero.Fs, host string, display string, authProtocol string`
`103`	`103`	`xauthPath := filepath.Join(homeDir, ".Xauthority")`
`104`	`104`
`105`	`105`	`// Open or create the Xauthority file`
`106`		`- file, err := fs.OpenFile(xauthPath, os.O_RDWR\|os.O_CREATE\|os.O_APPEND, 0600)`
	`106`	`+ file, err := fs.OpenFile(xauthPath, os.O_RDWR\|os.O_CREATE\|os.O_APPEND, 0o600)`
`107`	`107`	`if err != nil {`
`108`	`108`	`return xerrors.Errorf("failed to open Xauthority file: %w", err)`
`109`	`109`	`}`