From 4aa2460d82a6ed3c4b5bbaa6a0d1e94c9d13a1a7 Mon Sep 17 00:00:00 2001
From: Andrey Petrov <andrey.petrov@shazow.net>
Date: Sun, 24 Mar 2019 13:41:33 -0400
Subject: [PATCH 1/2] sshd: Add Terminal.Env()

---
 sshd/terminal.go | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/sshd/terminal.go b/sshd/terminal.go
index 472b5c1..379c15f 100644
--- a/sshd/terminal.go
+++ b/sshd/terminal.go
@@ -55,6 +55,29 @@ func (c sshConn) Name() string {
 	return c.User()
 }
 
+// EnvVar is an environment variable key-value pair
+type EnvVar struct {
+	Key   string
+	Value string
+}
+
+func (v EnvVar) String() string {
+	return v.Key + "=" + v.Value
+}
+
+// Env is a wrapper type around []EnvVar with some helper methods
+type Env []EnvVar
+
+// Get returns the latest value for a given key, or empty string if not found
+func (e Env) Get(key string) string {
+	for i := len(e) - 1; i >= 0; i-- {
+		if e[i].Key == key {
+			return e[i].Value
+		}
+	}
+	return ""
+}
+
 // Terminal extends ssh/terminal to include a close method
 type Terminal struct {
 	terminal.Terminal
@@ -63,6 +86,9 @@ type Terminal struct {
 
 	done      chan struct{}
 	closeOnce sync.Once
+
+	mu  sync.Mutex
+	env []EnvVar
 }
 
 // Make new terminal from a session channel
@@ -161,6 +187,14 @@ func (t *Terminal) listen(requests <-chan *ssh.Request) {
 				err := t.SetSize(width, height)
 				ok = err == nil
 			}
+		case "env":
+			var v EnvVar
+			if err := ssh.Unmarshal(req.Payload, &v); err != nil {
+				t.mu.Lock()
+				t.env = append(t.env, v)
+				t.mu.Unlock()
+				ok = true
+			}
 		}
 
 		if req.WantReply {
@@ -168,3 +202,12 @@ func (t *Terminal) listen(requests <-chan *ssh.Request) {
 		}
 	}
 }
+
+// Env returns a list of environment key-values that have been set. They are
+// returned in the order that they have been set, there is no deduplication or
+// other pre-processing applied.
+func (t *Terminal) Env() Env {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return Env(t.env)
+}

From 6701cbcbf7ca82404db7c5ccbc61a1aa21874d5e Mon Sep 17 00:00:00 2001
From: Andrey Petrov <shazow@gmail.com>
Date: Fri, 10 Jan 2020 09:25:59 -0500
Subject: [PATCH 2/2] sshd: Fix env error check

Co-Authored-By: Chris Miller <millerlogic@users.noreply.github.com>
---
 sshd/terminal.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sshd/terminal.go b/sshd/terminal.go
index 379c15f..a7d2e82 100644
--- a/sshd/terminal.go
+++ b/sshd/terminal.go
@@ -189,7 +189,7 @@ func (t *Terminal) listen(requests <-chan *ssh.Request) {
 			}
 		case "env":
 			var v EnvVar
-			if err := ssh.Unmarshal(req.Payload, &v); err != nil {
+			if err := ssh.Unmarshal(req.Payload, &v); err == nil {
 				t.mu.Lock()
 				t.env = append(t.env, v)
 				t.mu.Unlock()