Merge branch 'terminal-max-session-time' into 'master'

Terminate terminal session after configurable upper time limit

Closes #86

See merge request !107

internal/api/terminal_settings.go

@@ -26,6 +26,10 @@ type TerminalSettings struct {
 	// The CA roots to validate the remote endpoint with, for wss:// URLs. The
 	// system-provided CA pool will be used if this is blank. PEM-encoded data.
 	CAPem string
+
+	// The value is specified in seconds. It is converted to time.Duration
+	// later.
+	MaxSessionTime int
 }
 
 func (t *TerminalSettings) URL() (*url.URL, error) {
@@ -112,5 +116,7 @@ func (t *TerminalSettings) IsEqual(other *TerminalSettings) bool {
 		}
 	}
 
-	return t.Url == other.Url && t.CAPem == other.CAPem
+	return t.Url == other.Url &&
+		t.CAPem == other.CAPem &&
+		t.MaxSessionTime == other.MaxSessionTime
 }

internal/api/terminal_settings_test.go

@@ -7,8 +7,9 @@ import (
 
 func terminal(url string, subprotocols ...string) *TerminalSettings {
 	return &TerminalSettings{
-		Url:          url,
-		Subprotocols: subprotocols,
+		Url:            url,
+		Subprotocols:   subprotocols,
+		MaxSessionTime: 0,
 	}
 }
 
@@ -19,6 +20,13 @@ func ca(term *TerminalSettings) *TerminalSettings {
 	return term
 }
 
+func timeout(term *TerminalSettings) *TerminalSettings {
+	term = term.Clone()
+	term.MaxSessionTime = 600
+
+	return term
+}
+
 func header(term *TerminalSettings, values ...string) *TerminalSettings {
 	if len(values) == 0 {
 		values = []string{"Dummy Value"}
@@ -134,6 +142,7 @@ func TestIsEqual(t *testing.T) {
 		{term, ca(term), false},
 		{ca(header(term)), ca(header(term)), true},
 		{term_ca2, ca(term), false},
+		{term, timeout(term), false},
 	} {
 		if actual := tc.termA.IsEqual(tc.termB); tc.expected != actual {
 			t.Fatalf(

internal/terminal/terminal.go

 package terminal
 
 import (
+	"errors"
+	"fmt"
 	"log"
 	"net/http"
 	"time"
@@ -26,7 +28,7 @@ func Handler(myAPI *api.API) http.Handler {
 			return
 		}
 
-		proxy := NewProxy(1) // one stopper: auth checker
+		proxy := NewProxy(2) // two stoppers: auth checker, max time
 		checker := NewAuthChecker(
 			authCheckFunc(myAPI, r, "authorize"),
 			a.Terminal,
@@ -34,6 +36,7 @@ func Handler(myAPI *api.API) http.Handler {
 		)
 		defer checker.Close()
 		go checker.Loop(ReauthenticationInterval)
+		go closeAfterMaxTime(proxy, a.Terminal.MaxSessionTime)
 
 		ProxyTerminal(w, r, a.Terminal, proxy)
 	}, "authorize")
@@ -109,3 +112,17 @@ func connectToServer(terminal *api.TerminalSettings, r *http.Request) (Connectio
 
 	return Wrap(conn, conn.Subprotocol()), nil
 }
+
+func closeAfterMaxTime(proxy *Proxy, maxSessionTime int) {
+	if maxSessionTime == 0 {
+		return
+	}
+
+	<-time.After(time.Duration(maxSessionTime) * time.Second)
+	proxy.StopCh <- errors.New(
+		fmt.Sprintf(
+			"Connection closed: session time greater than maximum time allowed - %v seconds",
+			maxSessionTime,
+		),
+	)
+}

terminal_test.go

@@ -12,6 +12,7 @@ import (
 	"path"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/gorilla/websocket"
 
@@ -71,6 +72,26 @@ func TestTerminalBadTLS(t *testing.T) {
 	}
 }
 
+func TestTerminalSessionTimeout(t *testing.T) {
+	serverConns, clientURL, close := wireupTerminal(timeout, "channel.k8s.io")
+	defer close()
+
+	client, _, err := dialWebsocket(clientURL, nil, "terminal.gitlab.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sc := <-serverConns
+	defer sc.conn.Close()
+
+	client.SetReadDeadline(time.Now().Add(time.Duration(2) * time.Second))
+	_, _, err = client.ReadMessage()
+
+	if !websocket.IsCloseError(err, websocket.CloseAbnormalClosure) {
+		t.Fatalf("Client connection was not closed, got %v", err)
+	}
+}
+
 func TestTerminalProxyForwardsHeadersFromUpstream(t *testing.T) {
 	hdr := make(http.Header)
 	hdr.Set("Random-Header", "Value")
@@ -151,9 +172,10 @@ func startWebsocketServer(subprotocols ...string) (chan connWithReq, *httptest.S
 func terminalOkBody(remote *httptest.Server, header http.Header, subprotocols ...string) *api.Response {
 	out := &api.Response{
 		Terminal: &api.TerminalSettings{
-			Url:          websocketURL(remote.URL),
-			Header:       header,
-			Subprotocols: subprotocols,
+			Url:            websocketURL(remote.URL),
+			Header:         header,
+			Subprotocols:   subprotocols,
+			MaxSessionTime: 0,
 		},
 	}
 
@@ -170,6 +192,10 @@ func badCA(authResponse *api.Response) {
 	authResponse.Terminal.CAPem = "Bad CA"
 }
 
+func timeout(authResponse *api.Response) {
+	authResponse.Terminal.MaxSessionTime = 1
+}
+
 func setHeader(hdr http.Header) func(*api.Response) {
 	return func(authResponse *api.Response) {
 		authResponse.Terminal.Header = hdr