Add windows2016 support using WinPTY

cmd/sshd/channel_handlers.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows2012R2
 
 package main
 

cmd/sshd/channel_handlers_windows.go → cmd/sshd/channel_handlers_windows2012R2.go

@@ -1,8 +1,10 @@
-// +build windows
+// +build windows2012R2
 
 package main
 
-import "code.cloudfoundry.org/diego-ssh/handlers"
+import (
+	"code.cloudfoundry.org/diego-ssh/handlers"
+)
 
 func newChannelHandlers() map[string]handlers.NewChannelHandler {
 	return map[string]handlers.NewChannelHandler{

cmd/sshd/helpers_internal_port_test.go → cmd/sshd/helpers_test.go

@@ -1,4 +1,4 @@
-// +build !external
+// +build !windows2012R2
 
 package main_test
 

cmd/sshd/helpers_external_port_test.go → cmd/sshd/helpers_windows2012R2_test.go

@@ -1,4 +1,4 @@
-// +build external
+// +build windows2012R2
 
 package main_test
 
@@ -13,7 +13,7 @@ import (
 )
 
 func buildSshd() string {
-	sshd, err := gexec.Build("code.cloudfoundry.org/diego-ssh/cmd/sshd", "-race", "-tags", "external")
+	sshd, err := gexec.Build("code.cloudfoundry.org/diego-ssh/cmd/sshd", "-race", "-tags", "windows2012R2")
 	Expect(err).NotTo(HaveOccurred())
 	return sshd
 }

cmd/sshd/main_internal_port.go → cmd/sshd/main_port.go

@@ -1,4 +1,4 @@
-// +build !external
+// +build !windows2012R2
 
 package main
 

cmd/sshd/main_external_port.go → cmd/sshd/main_port_windows2012R2.go

@@ -1,4 +1,4 @@
-// +build external
+// +build windows2012R2
 
 package main
 

cmd/sshd/main_suite_test.go

@@ -2,6 +2,8 @@ package main_test
 
 import (
 	"encoding/json"
+	"os"
+	"runtime"
 
 	"code.cloudfoundry.org/diego-ssh/keys"
 	. "github.com/onsi/ginkgo"
@@ -26,6 +28,11 @@ func TestSSHDaemon(t *testing.T) {
 }
 
 var _ = SynchronizedBeforeSuite(func() []byte {
+	if runtime.GOOS == "windows" {
+		if os.Getenv("WINPTY_DLL_PATH") == "" {
+			Fail("Missing WINPTY_DLL_PATH environment variable")
+		}
+	}
 	sshd := buildSshd()
 
 	hostKey, err := keys.RSAKeyPairFactory.NewKeyPair(1024)

cmd/sshd/main_test.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows2012R2
 
 package main_test
 
@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -241,6 +242,10 @@ var _ = Describe("SSH daemon", func() {
 
 		var ItDoesNotExposeSensitiveInformation = func() {
 			It("does not expose the key on the command line", func() {
+				if runtime.GOOS == "windows" {
+					Skip("no fork/exec on windows")
+				}
+
 				pid := runner.(*ginkgomon.Runner).Command.Process.Pid
 				command := exec.Command("ps", "-fp", strconv.Itoa(pid))
 				session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
@@ -489,10 +494,17 @@ var _ = Describe("SSH daemon", func() {
 				session, err := client.NewSession()
 				Expect(err).NotTo(HaveOccurred())
 
-				result, err := session.Output("/bin/echo -n 'Hello there!'")
+				var cmd string
+				if runtime.GOOS == "windows" {
+					cmd = "echo Hello There!"
+				} else {
+					cmd = "/bin/echo -n 'Hello There!'"
+				}
+
+				result, err := session.Output(cmd)
 				Expect(err).NotTo(HaveOccurred())
 
-				Expect(string(result)).To(Equal("Hello there!"))
+				Expect(strings.TrimSpace(string(result))).To(Equal(strings.TrimSpace("Hello There!")))
 			})
 		})
 
@@ -510,7 +522,7 @@ var _ = Describe("SSH daemon", func() {
 
 					stdout := &bytes.Buffer{}
 
-					session.Stdin = strings.NewReader("/bin/echo -n $ENV_VAR")
+					session.Stdin = strings.NewReader(envVarCmd("ENV_VAR"))
 					session.Stdout = stdout
 
 					session.Setenv("ENV_VAR", "env_var_value")
@@ -529,7 +541,7 @@ var _ = Describe("SSH daemon", func() {
 
 					stdout := &bytes.Buffer{}
 
-					session.Stdin = strings.NewReader("/bin/echo -n $TEST")
+					session.Stdin = strings.NewReader(envVarCmd("TEST"))
 					session.Stdout = stdout
 
 					err = session.Shell()
@@ -547,7 +559,7 @@ var _ = Describe("SSH daemon", func() {
 
 					stdout := &bytes.Buffer{}
 
-					session.Stdin = strings.NewReader("/bin/echo -n $PATH")
+					session.Stdin = strings.NewReader(envVarCmd("PATH"))
 					session.Stdout = stdout
 
 					err = session.Shell()
@@ -571,7 +583,7 @@ var _ = Describe("SSH daemon", func() {
 
 					stdout := &bytes.Buffer{}
 
-					session.Stdin = strings.NewReader("/bin/echo -n $ENV_VAR")
+					session.Stdin = strings.NewReader(envVarCmd("ENV_VAR"))
 					session.Stdout = stdout
 
 					session.Setenv("ENV_VAR", "env_var_value")
@@ -590,7 +602,7 @@ var _ = Describe("SSH daemon", func() {
 
 					stdout := &bytes.Buffer{}
 
-					session.Stdin = strings.NewReader("/bin/echo -n $TEST")
+					session.Stdin = strings.NewReader(envVarCmd("TEST"))
 					session.Stdout = stdout
 
 					err = session.Shell()
@@ -639,3 +651,11 @@ var _ = Describe("SSH daemon", func() {
 		})
 	})
 })
+
+func envVarCmd(envVar string) string {
+	if runtime.GOOS == "windows" {
+		return "echo %" + envVar + "%\r\n"
+	}
+
+	return fmt.Sprintf("/bin/echo -n $%s", envVar)
+}

cmd/sshd/main_windows_test.go → cmd/sshd/main_windows2012R2_test.go

@@ -1,4 +1,4 @@
-// +build windows
+// +build windows2012R2
 
 package main_test
 

handlers/handlers_suite_test.go

@@ -1,6 +1,9 @@
 package handlers_test
 
 import (
+	"os"
+	"runtime"
+
 	"code.cloudfoundry.org/diego-ssh/keys"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -21,4 +24,10 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	TestHostKey = hostKey.PrivateKey()
+
+	if runtime.GOOS == "windows" {
+		if os.Getenv("WINPTY_DLL_PATH") == "" {
+			Fail("Missing WINPTY_DLL_PATH environment variable")
+		}
+	}
 })

handlers/session_channel_handler.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows,!windows2012R2
 
 package handlers
 

handlers/session_channel_handler_test.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows,!windows2012R2
 
 package handlers_test
 

handlers/session_channel_handler_windows.go → handlers/session_channel_handler_windows2012R2.go

@@ -1,4 +1,4 @@
-// +build windows
+// +build windows2012R2
 
 package handlers
 
@@ -15,7 +15,7 @@ func NewSessionChannelHandler() *SessionChannelHandler {
 }
 
 func (handler *SessionChannelHandler) HandleNewChannel(logger lager.Logger, newChannel ssh.NewChannel) {
-	err := newChannel.Reject(ssh.Prohibited, "SSH is not supported on windows cells")
+	err := newChannel.Reject(ssh.Prohibited, "SSH is not supported on windows2012R2 cells")
 	if err != nil {
 		logger.Error("handle-new-session-channel-failed", err)
 	}

handlers/session_channel_handler_windows_test.go → handlers/session_channel_handler_windows2012R2_test.go

@@ -1,4 +1,4 @@
-// +build windows
+// +build windows2012R2
 
 package handlers_test
 
@@ -68,7 +68,6 @@ var _ = Describe("SessionChannelHandler", func() {
 	})
 
 	Context("when a session is opened", func() {
-
 		It("doesn't accept sessions", func() {
 			_, sessionErr := client.NewSession()