Merge branch 'L2-Win32Posix-Prototype' into L1-Prod

Author: manojampalam

.gitignore

@@ -276,4 +276,5 @@ Makefile.in
 #temp key files
 d2utmpa*
 configure
-contrib/win32/openssh/Win32-OpenSSH.VC.opendb
+contrib/win32/openssh/Win32-OpenSSH.VC.opendb
+*.opendb

auth.c

@@ -647,7 +647,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
 	int fd;
 	FILE *f;
 
-#ifdef WIN32_FIXME
+#if(0)def WIN32_FIXME
     if ((fd = WSHELPwopen(file, O_RDONLY|O_NONBLOCK)) == -1) {
 #else
 	if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {

channels.c

@@ -41,23 +41,6 @@
 
 #include "includes.h"
 
-#ifdef WIN32_FIXME
-//#define WIN32_PRAGMA_REMCON
-#ifdef ECONNABORTED
-#undef ECONNABORTED
-#endif
-#define ECONNABORTED WSAECONNABORTED
-#ifdef ECONNREFUSED
-#undef ECONNREFUSED
-#endif
-#define ECONNREFUSED WSAECONNREFUSED
-#ifdef EINPROGRESS
-#undef EINPROGRESS
-#endif
-#define EINPROGRESS WSAEINPROGRESS
-#define _CRT_NO_POSIX_ERROR_CODES
-#endif
-
 
 #include <sys/types.h>
 #include <sys/param.h>	/* MIN MAX */
@@ -101,10 +84,10 @@
 #include "authfd.h"
 #include "pathnames.h"
 
-#ifdef WIN32_FIXME
-#define isatty(a) WSHELPisatty(a)
-#define SFD_TYPE_CONSOLE    4
-#endif
+//#ifdef WIN32_FIXME
+//#define isatty(a) WSHELPisatty(a)
+//#define SFD_TYPE_CONSOLE    4
+//#endif
 
 
 /* -- channel core */
@@ -1700,7 +1683,9 @@ channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
 		len = read(c->rfd, buf, sizeof(buf));
 		#ifdef WIN32_FIXME
 		if (len == 0) {
-			if ( get_sfd_type(c->rfd) == SFD_TYPE_CONSOLE)
+
+			//if ( get_sfd_type(c->rfd) == SFD_TYPE_CONSOLE)
+			if(isatty(c->rfd))
 			return 1; // in Win32 console read, there may be no data, but is ok
 		}
 		#endif
@@ -2239,7 +2224,7 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
    * Winsock can't support this sort of fdset reallocation 
    */
 
-#ifndef WIN32_FIXME
+#if(1)//ndef WIN32_FIXME
 
 	nfdset = howmany(n+1, NFDBITS);
 	/* Explicitly test here, because xrealloc isn't always called */
@@ -2257,7 +2242,7 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
 
 	*maxfdp = n;
 
-#ifdef WIN32_FIXME
+#if(0)//def WIN32_FIXME
 
     if (*readsetp == NULL) 
     {
@@ -2477,52 +2462,7 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
 	if (c->datagram)
 		buffer_put_string(&c->output, data, data_len);
 	else {
-		#ifndef WIN32_FIXME
 		buffer_append(&c->output, data, data_len);
-		#else
-		if ( c->client_tty )
-			telProcessNetwork ( data, data_len ); // run it by ANSI engine if it is the ssh client
-		else {
-				#ifdef WIN32_PRAGMA_REMCON
-				buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on
-				#else
-				if  ( ( c->isatty) && (data_len ==1) && (data[0] == '\003') ) {
-						/* send control-c to the shell process */
-						if ( GenerateConsoleCtrlEvent ( CTRL_C_EVENT, 0 ) ) {
-						}
-						else {
-							debug3("GenerateConsoleCtrlEvent failed with %d\n",GetLastError());
-						}
-				}
-				else {
-					// avoid sending the 4 arrow keys out to remote for now "ESC[A" ..
-					if ( (c->isatty) && (data_len ==3) && (data[0] == '\033') && (data[1] == '[')) {
-						if ( ( data[2] == 'A') ||  (data[2] == 'B') ||  (data[2] == 'C') ||  (data[2] == 'D'))
-								packet_check_eom();
-								return 0;
-					}
-					buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on
-					if ( c->isatty ) {  // we echo the data if it is sshd server and pty interactive mode			
-					
-						if ( (data_len ==1) && (data[0] == '\b') ) {
-							if (charinline >0) {
-								buffer_append(&c->input, "\b \b", 3); // for backspace, we need to send space and another backspace for visual erase
-								charinline--;
-							}
-						}
-						else {
-							buffer_append(&c->input, data, data_len);
-							charinline += data_len; // one more char on the line
-						}
-						
-						if ( (data[data_len-1] == '\r') || (data[data_len-1] == '\n') )
-							charinline = 0;  // a line has ended, begin char in line count again
-					}
-				}
-				#endif // WIN32_PRAGMA_REMCON
-		}
-
-		#endif
 	}
 	packet_check_eom();
 	return 0;

clientloop.c

@@ -118,7 +118,7 @@
 #ifdef WIN32_FIXME
 #include <sys/stat.h>
 
-#define isatty(a) WSHELPisatty(a)
+//#define isatty(a) WSHELPisatty(a)
 
 // Windows Console screen size change related
 extern int ScreenX;
@@ -1520,6 +1520,25 @@ client_simple_escape_filter(Channel *c, char *buf, int len)
 	    buf, len);
 }
 
+#ifdef WIN32_FIXME
+u_char * client_ansi_parser_filter(Channel *c, u_char **buf, u_int *len) {
+	/* TODO - account fo error/extended stream*/
+	if (c->client_tty) {
+		telProcessNetwork(buffer_ptr(&c->output), buffer_len(&c->output));
+		buffer_clear(&c->output);
+		buffer_append(&c->output, " \b", 2);
+		*buf = buffer_ptr(&c->output);
+		*len = buffer_len(&c->output);
+		return *buf;
+	}
+	else {
+		*buf = buffer_ptr(&c->output);
+		*len = buffer_len(&c->output);
+		return *buf;
+	}
+}
+#endif
+
 static void
 client_channel_closed(int id, void *arg)
 {
@@ -1606,7 +1625,11 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 		if (session_ident != -1) {
 			if (escape_char_arg != SSH_ESCAPECHAR_NONE) {
 				channel_register_filter(session_ident,
+#ifdef WIN32_FIXME
+				    client_simple_escape_filter, client_ansi_parser_filter,
+#else
 				    client_simple_escape_filter, NULL,
+#endif
 				    client_filter_cleanup,
 				    client_new_escape_filter_ctx(
 				    escape_char_arg));

contrib/win32/RedirectedIO-exp/RedirectedIO/RedirectedIO.sln

@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RedirectedIO", "RedirectedIO\RedirectedIO.vcxproj", "{47CB1D05-8813-415A-BB85-042E09B8A794}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell-host", "shell-host\shell-host.vcxproj", "{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Debug|x64.ActiveCfg = Debug|x64
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Debug|x64.Build.0 = Debug|x64
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Debug|x86.ActiveCfg = Debug|Win32
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Debug|x86.Build.0 = Debug|Win32
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Release|x64.ActiveCfg = Release|x64
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Release|x64.Build.0 = Release|x64
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Release|x86.ActiveCfg = Release|Win32
+		{47CB1D05-8813-415A-BB85-042E09B8A794}.Release|x86.Build.0 = Release|Win32
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Debug|x64.ActiveCfg = Debug|x64
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Debug|x64.Build.0 = Debug|x64
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Debug|x86.ActiveCfg = Debug|Win32
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Debug|x86.Build.0 = Debug|Win32
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Release|x64.ActiveCfg = Release|x64
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Release|x64.Build.0 = Release|x64
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Release|x86.ActiveCfg = Release|Win32
+		{BEFEFB98-000C-4DBB-A9E8-79EFAB305300}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

contrib/win32/RedirectedIO-exp/RedirectedIO/RedirectedIO/RedirectedIO.cpp

@@ -0,0 +1,167 @@
+// RedirectedIO.cpp : Defines the entry point for the console application.
+//
+
+#include <Windows.h>
+#include <stdio.h>
+
+int pipe_counter = 0;
+HANDLE in[2];
+HANDLE out[2];
+HANDLE err[2];
+
+DWORD WINAPI OutThreadProc(
+	_In_ LPVOID lpParameter
+	)
+{
+	char buf[1024];
+	DWORD tmp;
+	BOOL ret = TRUE;
+	while (ret) {
+		ret = ReadFile(out[0], buf, 1024, &tmp, NULL);
+		if (ret) {
+			ret = WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, tmp, &tmp, NULL);
+		}
+	}
+
+	printf("----- OUT STREAM CLOSED -------\n");
+	return ret;
+}
+
+DWORD WINAPI ErrThreadProc(
+	_In_ LPVOID lpParameter
+	)
+{
+	char buf[1024];
+	DWORD tmp;
+	BOOL ret = TRUE;
+	while (ret) {
+		ret = ReadFile(err[0], buf, 1024, &tmp, NULL);
+		if (ret) {
+			ret = WriteFile(GetStdHandle(STD_ERROR_HANDLE), buf, tmp, &tmp, NULL);
+		}
+	}
+
+	printf("-------------ERROR STREAM CLOSED -------------\n");
+	return ret;
+}
+
+int
+fileio_pipe(HANDLE pio[2]) {
+	HANDLE read_handle = INVALID_HANDLE_VALUE, write_handle = INVALID_HANDLE_VALUE;
+	char pipe_name[MAX_PATH];
+	SECURITY_ATTRIBUTES sec_attributes;
+
+	pio[0] = INVALID_HANDLE_VALUE;
+	pio[1] = INVALID_HANDLE_VALUE;
+
+	/* create name for named pipe */
+	if (-1 == sprintf_s(pipe_name, MAX_PATH, "\\\\.\\Pipe\\W32PosixPipe.%08x.%08x",
+		GetCurrentProcessId(), pipe_counter++)) {
+		goto error;
+	}
+
+	sec_attributes.bInheritHandle = TRUE;
+	sec_attributes.lpSecurityDescriptor = NULL;
+	sec_attributes.nLength = 0;
+
+	/* create named pipe */
+	read_handle = CreateNamedPipeA(pipe_name,
+		PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
+		PIPE_TYPE_BYTE | PIPE_WAIT,
+		1,
+		4096,
+		4096,
+		0,
+		&sec_attributes);
+	if (read_handle == INVALID_HANDLE_VALUE) {
+		goto error;
+	}
+
+	/* connect to named pipe */
+	write_handle = CreateFileA(pipe_name,
+		GENERIC_WRITE,
+		0,
+		&sec_attributes,
+		OPEN_EXISTING,
+		FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
+		NULL);
+	if (write_handle == INVALID_HANDLE_VALUE) {
+		goto error;
+	}
+
+	pio[0] = read_handle;
+	pio[1] = write_handle;
+	return 0;
+
+error:
+	if (read_handle != INVALID_HANDLE_VALUE)
+		CloseHandle(read_handle);
+	if (write_handle != INVALID_HANDLE_VALUE)
+		CloseHandle(write_handle);
+	return -1;
+}
+
+
+int main()
+{
+
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	DWORD tmp;
+	BOOL ret;
+	char buf[1024];
+	wchar_t cmd[MAX_PATH];
+
+	fileio_pipe(in);
+	fileio_pipe(out);
+	fileio_pipe(err);
+
+	memset(&si, 0, sizeof(STARTUPINFO));
+	si.cb = sizeof(STARTUPINFO);
+	si.lpReserved = 0;
+	si.lpTitle = NULL; /* NULL means use exe name as title */
+	si.dwFillAttribute = 0;
+	si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW ;
+	si.wShowWindow = 1; // FALSE ;
+	si.cbReserved2 = 0;
+	si.lpReserved2 = 0;
+	si.hStdInput = in[0];
+	si.hStdOutput = out[1];
+	si.hStdError = err[1];
+
+	//swprintf(cmd, L"%ls", L"shell-host.exe ping -t 127.0.0.1");
+	swprintf(cmd, L"%ls", L"shell-host.exe");
+	SetHandleInformation(in[1], HANDLE_FLAG_INHERIT, 0);
+	SetHandleInformation(out[0], HANDLE_FLAG_INHERIT, 0);
+	SetHandleInformation(out[0], HANDLE_FLAG_INHERIT, 0);
+
+
+	ret = CreateProcessW(NULL, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &si, &pi);
+	//ret = CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
+	if (!ret)
+		exit(-1);
+
+	/* close unwanted handles*/
+	CloseHandle(in[0]);
+	CloseHandle(out[1]);
+	CloseHandle(err[1]);
+
+	DWORD mode;
+	GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &mode);
+	SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), mode & ~( ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT));
+	GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &mode);
+
+	HANDLE t[2];
+	t[0] = CreateThread(NULL, 0, OutThreadProc, NULL, 0, NULL);
+	t[1] = CreateThread(NULL, 0, ErrThreadProc, NULL, 0, NULL);
+
+	ret = true;
+	while (ret) {
+		ret = ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, 1024, &tmp, NULL);
+		if (ret) {
+			ret = WriteFile(in[1], buf, tmp, &tmp, NULL);
+		}
+	}
+}
+
+