From bf3559171fcc128b43708c5b1983a577f82a5d02 Mon Sep 17 00:00:00 2001
From: Maisem Ali <maisem@tailscale.com>
Date: Fri, 11 Mar 2022 12:34:36 -0800
Subject: [PATCH] ssh/tailssh: set DBUS_SESSION_BUS_ADDRESS and SSH_TTY
 variables

Updates #3802

Signed-off-by: Maisem Ali <maisem@tailscale.com>
---
 ssh/tailssh/incubator.go       | 5 +++++
 ssh/tailssh/incubator_linux.go | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ssh/tailssh/incubator.go b/ssh/tailssh/incubator.go
index 850de0da7..93864072b 100644
--- a/ssh/tailssh/incubator.go
+++ b/ssh/tailssh/incubator.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"os/exec"
 	"os/user"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
@@ -119,6 +120,8 @@ func beIncubator(args []string) error {
 	euid := uint64(os.Geteuid())
 	// Inform the system that we are about to log someone in.
 	// We can only do this if we are running as root.
+	// This is best effort to still allow running on machines where
+	// we don't support starting session, e.g. darwin.
 	sessionCloser, err := maybeStartLoginSession(logf, uint32(*uid), *localUser, *remoteUser, *remoteIP, *ttyName)
 	if err == nil && sessionCloser != nil {
 		defer sessionCloser()
@@ -334,6 +337,8 @@ func (srv *server) startWithPTY(cmd *exec.Cmd, ptyReq ssh.Pty) (ptyFile *os.File
 	updateStringInSlice(cmd.Args, "--has-tty=false", "--has-tty=true")
 	if ptyName, err := ptyName(ptyFile); err == nil {
 		updateStringInSlice(cmd.Args, "--tty-name=", "--tty-name="+ptyName)
+		fullPath := filepath.Join("/dev", ptyName)
+		cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_TTY=%s", fullPath))
 	}
 
 	if ptyReq.Term != "" {
diff --git a/ssh/tailssh/incubator_linux.go b/ssh/tailssh/incubator_linux.go
index 24a7c989b..5d6f448ed 100644
--- a/ssh/tailssh/incubator_linux.go
+++ b/ssh/tailssh/incubator_linux.go
@@ -165,6 +165,7 @@ func maybeStartLoginSessionLinux(logf logger.Logf, uid uint32, localUser, remote
 		logf("ssh: failed to CreateSession for user %q (%d) %v", localUser, uid, err)
 		return nil, nil
 	}
+	os.Setenv("DBUS_SESSION_BUS_ADDRESS", fmt.Sprintf("unix:path=%v/bus", resp.runtimePath))
 	if !resp.existing {
 		return func() error {
 			return releaseSession(resp.sessionID)