Add more options to /exec (#435)

* Add SSH exec session options * Remove unused exec session helper
2026-10-18 13:21:00 +02:00 · 2026-05-05 08:56:18 -04:00
parent e6a3314f58
commit 2667a01cf8
12 changed files with 744 additions and 42 deletions
@@ -0,0 +1,97 @@
+//nolint:testpackage // we need to test unexported exec helpers
+package controller
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/stretchr/testify/require"
+)
+
+func TestParseExecInteractive(t *testing.T) {
+	for _, test := range []struct {
+		name        string
+		query       string
+		interactive bool
+		errContains string
+	}{
+		{
+			name:        "default false",
+			interactive: false,
+		},
+		{
+			name:        "interactive true",
+			query:       "interactive=true",
+			interactive: true,
+		},
+		{
+			name:        "stdin alias true",
+			query:       "stdin=true",
+			interactive: true,
+		},
+		{
+			name:        "matching values accepted",
+			query:       "interactive=true&stdin=true",
+			interactive: true,
+		},
+		{
+			name:        "conflicting values rejected",
+			query:       "interactive=true&stdin=false",
+			errContains: "cannot conflict",
+		},
+		{
+			name:        "invalid interactive rejected",
+			query:       "interactive=maybe",
+			errContains: "interactive",
+		},
+		{
+			name:        "invalid stdin rejected",
+			query:       "stdin=maybe",
+			errContains: "stdin",
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			interactive, err := parseExecInteractive(execQueryContext(test.query))
+			if test.errContains != "" {
+				require.ErrorContains(t, err, test.errContains)
+
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, test.interactive, interactive)
+		})
+	}
+}
+
+func TestParseExecSessionSpec(t *testing.T) {
+	spec, runCommand, err := parseExecSessionSpec(
+		execQueryContext("interactive=true&tty=true&rows=24&cols=80&env[GREETING]=hello&workdir=/tmp"),
+		"printf '%s' \"$GREETING\"",
+	)
+	require.NoError(t, err)
+	require.Equal(t, execSessionSpec{
+		command:     "printf '%s' \"$GREETING\"",
+		interactive: true,
+		tty:         true,
+		rows:        24,
+		cols:        80,
+		env:         map[string]string{"GREETING": "hello"},
+		workdir:     "/tmp",
+	}, spec)
+	require.Equal(t, "cd '/tmp' || exit $?\nexport GREETING='hello'\nprintf '%s' \"$GREETING\"", runCommand)
+}
+
+func TestParseExecSessionSpecRejectsPartialTTYSize(t *testing.T) {
+	_, _, err := parseExecSessionSpec(execQueryContext("tty=true&rows=24"), "echo hello")
+	require.ErrorContains(t, err, "provided together")
+}
+
+func execQueryContext(query string) *gin.Context {
+	ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
+	ctx.Request = httptest.NewRequest(http.MethodGet, "/?"+query, nil)
+
+	return ctx
+}