Add support for AF_UNIX

authfd.c

@@ -97,7 +97,7 @@ ssh_get_authentication_socket_path(const char *authsocket, int *fdp)
 	sunaddr.sun_family = AF_UNIX;
 	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
 
-	if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+	if ((sock = w32_afunix_socket(&sunaddr)) == -1)
 		return SSH_ERR_SYSTEM_ERROR;
 
 	/* close on exec */

contrib/win32/openssh/bash_tests_iterator.ps1

@@ -186,7 +186,7 @@ try
 
 	# These are the known failed testcases.
 	# transfer.sh, rekey.sh tests fail on CygWin v3.4.0, but succeeds with v3.3.6
-	$known_failed_testcases = @("agent.sh", "key-options.sh", "forward-control.sh", "integrity.sh", "krl.sh", "cert-hostkey.sh", "cert-userkey.sh", "percent.sh", "transfer.sh", "rekey.sh")
+	$known_failed_testcases = @("key-options.sh", "forward-control.sh", "integrity.sh", "krl.sh", "cert-hostkey.sh", "cert-userkey.sh", "percent.sh", "transfer.sh", "rekey.sh")
 	$known_failed_testcases_skipped = @()
 
 	$start_time = (Get-Date)

contrib/win32/openssh/config.h.vs

@@ -1526,6 +1526,12 @@
 /* Use PIPES instead of a socketpair() */
 #define USE_PIPES 1
 
+/* Define name for the ssh-agent Windows named pipe */
+#define AGENT_PIPE_ID L"\\\\.\\pipe\\openssh-ssh-agent"
+
+/* define 1 if afunix.h is available */
+#define HAVE_AFUNIX_H 1
+
 /* Define if you want to sanitize fds */
 /* #undef USE_SANITISE_STDFD */
 

contrib/win32/win32compat/socketio.c

@@ -38,6 +38,10 @@
 #include "inc\utf.h"
 #include "misc_internal.h"
 #include "debug.h"
+#include "../../../config.h"
+#ifdef HAVE_AFUNIX_H
+#include <afunix.h>
+#endif
 
 #define INTERNAL_SEND_BUFFER_SIZE 70*1024 //70KB
 #define INTERNAL_RECV_BUFFER_SIZE 70*1024 //70KB
@@ -118,7 +122,12 @@ socketio_acceptEx(struct w32_io* pio)
 	}
 
 	/* create accepting socket */
+	#ifdef HAVE_AFUNIX_H
+	context->accept_socket = socket(addr.ss_family, SOCK_STREAM, IPPROTO_IP);
+	#else
 	context->accept_socket = socket(addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+	#endif
+
 	if (context->accept_socket == INVALID_SOCKET) {
 		errno = errno_from_WSALastError();
 		debug3("acceptEx - socket() ERROR:%d, io:%p", WSAGetLastError(), pio);
@@ -756,6 +765,9 @@ socketio_accept(struct w32_io* pio, struct sockaddr* addr, int* addrlen)
 int
 socketio_connectex(struct w32_io* pio, const struct sockaddr* name, int namelen)
 {
+	#ifdef HAVE_AFUNIX_H
+	struct sockaddr_un tmp_unix;
+	#endif
 
 	struct sockaddr_in tmp_addr4;
 	struct sockaddr_in6 tmp_addr6;
@@ -778,6 +790,13 @@ socketio_connectex(struct w32_io* pio, const struct sockaddr* name, int namelen)
 		tmp_addr4.sin_port = 0;
 		tmp_addr = (SOCKADDR*)&tmp_addr4;
 		tmp_addr_len = sizeof(tmp_addr4);
+	#ifdef HAVE_AFUNIX_H
+	} else if (name->sa_family == AF_UNIX) {
+		ZeroMemory(&tmp_unix, sizeof(tmp_unix));
+		tmp_unix.sun_family = AF_UNIX;
+		tmp_addr = (SOCKADDR*)&tmp_unix;
+		tmp_addr_len = sizeof(tmp_unix);
+	#endif
 	} else {
 		errno = ENOTSUP;
 		debug3("connectex - ERROR: unsuppored address family:%d, io:%p", name->sa_family, pio);

contrib/win32/win32compat/ssh-agent/agent.c

@@ -43,8 +43,6 @@ HANDLE sshagent_client_primary_token;
 static HANDLE ioc_port = NULL;
 static BOOL debug_mode = FALSE;
 
-#define AGENT_PIPE_ID L"\\\\.\\pipe\\openssh-ssh-agent"
-
 static HANDLE event_stop_agent;
 static OVERLAPPED ol;
 static 	HANDLE pipe;

contrib/win32/win32compat/w32fd.c

@@ -52,6 +52,7 @@
 #include <sys\utime.h>
 #include "misc_internal.h"
 #include "debug.h"
+#include "../../../config.h"
 
 /* internal table that stores the fd to w32_io mapping*/
 struct w32fd_table {
@@ -298,9 +299,9 @@ w32_socket(int domain, int type, int protocol)
 	errno = 0;
 	if (min_index == -1)
 		return -1;
-	
+
 	if (domain == AF_UNIX && type == SOCK_STREAM) {
-		pio = fileio_afunix_socket();		
+		pio = fileio_afunix_socket();
 		if (pio == NULL)
 			return -1;
 		pio->type = NONSOCK_FD;
@@ -309,7 +310,70 @@ w32_socket(int domain, int type, int protocol)
 		if (pio == NULL)
 			return -1;
 		pio->type = SOCK_FD;
-	}	
+	}
+
+	fd_table_set(pio, min_index);
+	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);
+	return min_index;
+}
+
+int
+w32_afunix_socket(struct sockaddr_un* addr)
+{
+	#ifdef HAVE_AFUNIX_H
+	/*
+		If HAVE_AFUNIX_H is defined, we can be dealing with the ssh-agent named pipe or
+		a AF_UNIX socket if ssh forwarding is enabled. If the addr->sun_path is the
+		the well known named pipe, we open the socket with w32_fileio.
+	*/
+	int len = wcslen(AGENT_PIPE_ID);
+	char* pipeid = (char*)malloc(len + 1);
+	memset(pipeid, 0, len + 1);
+
+	if(wcstombs(pipeid, AGENT_PIPE_ID, len + 1) != (size_t) -1 && strcmp(addr->sun_path, pipeid) == 0)
+		return w32_fileio_socket(SOCK_STREAM, 0);
+	else
+		return w32_unix_socket(SOCK_STREAM, 0);
+	#else
+		return w32_socket(AF_UNIX, SOCK_STREAM, 0);
+	#endif
+}
+
+int
+w32_unix_socket(int type, int protocol)
+{
+	int domain = AF_UNIX;
+	int min_index = fd_table_get_min_index();
+	struct w32_io* pio = NULL;
+
+	errno = 0;
+	if (min_index == -1)
+		return -1;
+
+	pio = socketio_socket(domain, type, protocol);
+	if (pio == NULL)
+		return -1;
+	pio->type = SOCK_FD;
+
+	fd_table_set(pio, min_index);
+	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);
+	return min_index;
+}
+
+int
+w32_fileio_socket(int type, int protocol)
+{
+	int min_index = fd_table_get_min_index();
+	struct w32_io* pio = NULL;
+
+	errno = 0;
+	if (min_index == -1)
+		return -1;
+
+	pio = fileio_afunix_socket();
+	if (pio == NULL)
+		return -1;
+	pio->type = NONSOCK_FD;
 
 	fd_table_set(pio, min_index);
 	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);

contrib/win32/win32compat/w32fd.h

@@ -125,6 +125,7 @@ struct w32_io {
 #define FILETYPE(pio) (GetFileType(WINHANDLE(pio)))
 extern HANDLE main_thread;
 
+int w32_afunix_socket(struct sockaddr_un* addr);
 BOOL w32_io_is_blocking(struct w32_io*);
 BOOL w32_io_is_io_available(struct w32_io* pio, BOOL rd);
 int wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds);

misc.c

@@ -1928,8 +1928,7 @@ unix_listener(const char *path, int backlog, int unlink_first)
 		return -1;
 	}
 
-	sock = socket(PF_UNIX, SOCK_STREAM, 0);
-	if (sock == -1) {
+	if ((sock = w32_afunix_socket(&sunaddr)) == -1) {
 		saved_errno = errno;
 		error_f("socket: %.100s", strerror(errno));
 		errno = saved_errno;

mux.c

@@ -2268,7 +2268,7 @@ muxclient(const char *path)
 		fatal("ControlPath too long ('%s' >= %u bytes)", path,
 		    (unsigned int)sizeof(addr.sun_path));
 
-	if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
+	if ((sock = w32_afunix_socket(&addr)) == -1)
 		fatal_f("socket(): %s", strerror(errno));
 
 	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) {