tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support for ProxyCommand using stdio redirection (#268)

Browse Source 
Changes to support ProxyCommand using stdio redirection
PowerShell/Win32-OpenSSH#355
This commit is contained in:
Manoj Ampalam 2018-02-12 11:50:17 -08:00 committed by GitHub
parent fcead5ed76
commit 024a6dedc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sshconnect.c
View File

@ -199,10 +199,6 @@ static int
ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port, ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
const char *proxy_command) const char *proxy_command)
{ {
#ifdef WINDOWS
fatal("Proxy connect is not supported in Windows yet");
return 0;
#else /* !WINDOWS */
char *command_string; char *command_string;
int pin[2], pout[2]; int pin[2], pout[2];
pid_t pid; pid_t pid;
@ -220,6 +216,28 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
host, port); host, port);
debug("Executing proxy command: %.500s", command_string); debug("Executing proxy command: %.500s", command_string);
#ifdef FORK_NOT_SUPPORTED
{
posix_spawn_file_actions_t actions;
char* spawn_argv[2];
/*
* expand_proxy_command prefixes cmdline with "exec "
*/
spawn_argv[0] = command_string + 5;
spawn_argv[1] = NULL;
pid = -1;
if (posix_spawn_file_actions_init(&actions) != 0 ||
posix_spawn_file_actions_adddup2(&actions, pin[0], STDIN_FILENO) != 0 ||
posix_spawn_file_actions_adddup2(&actions, pout[1], STDOUT_FILENO) != 0)
fatal("posix_spawn initialization failed");
else if (posix_spawn(&pid, spawn_argv[0], &actions, NULL, spawn_argv, NULL) != 0)
fatal("posix_spawn: %s", strerror(errno));
posix_spawn_file_actions_destroy(&actions);
}
#else
/* Fork and execute the proxy command. */ /* Fork and execute the proxy command. */
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
char *argv[10]; char *argv[10];
@ -254,6 +272,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
perror(argv[0]); perror(argv[0]);
exit(1); exit(1);
} }
#endif
/* Parent. */ /* Parent. */
if (pid < 0) if (pid < 0)
fatal("fork failed: %.100s", strerror(errno)); fatal("fork failed: %.100s", strerror(errno));
@ -272,7 +291,6 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
return -1; /* ssh_packet_set_connection logs error */ return -1; /* ssh_packet_set_connection logs error */
return 0; return 0;
#endif /* !WINDOWS */
} }
void void