ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-24 21:03:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow dbclient -J to be used with multihop

Browse Source 
Based on a patch from Hans Harder.

This also tidies formatting and un-needed parts
This commit is contained in:
Matt Johnston 2022-04-01 12:17:02 +08:00
parent ac2433cb8d
commit 7894254afa
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
cli-runopts.c
View File

@ -531,11 +531,11 @@ static void loadidentityfile(const char* filename, int warnfail) {
static char* static char*
multihop_passthrough_args() { multihop_passthrough_args() {
char *ret; char *ret;
int total; unsigned int len, total;
unsigned int len = 0;
m_list_elem *iter; m_list_elem *iter;
/* Fill out -i, -y, -W options that make sense for all /* Fill out -i, -y, -W options that make sense for all
* the intermediate processes */ * the intermediate processes */
len = 30; /* space for "-q -y -y -W <size>\0" */
#if DROPBEAR_CLI_PUBKEY_AUTH #if DROPBEAR_CLI_PUBKEY_AUTH
for (iter = cli_opts.privkeys->first; iter; iter = iter->next) for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
{ {
@ -543,51 +543,40 @@ multihop_passthrough_args() {
len += 3 + strlen(key->filename); len += 3 + strlen(key->filename);
} }
#endif /* DROPBEAR_CLI_PUBKEY_AUTH */ #endif /* DROPBEAR_CLI_PUBKEY_AUTH */
if (cli_opts.proxycmd) {
/* "-J 'cmd'" */
len += 6 + strlen(cli_opts.proxycmd);
}
len += 30; /* space for -W <size>, terminator. */
ret = m_malloc(len); ret = m_malloc(len);
total = 0; total = 0;
if (cli_opts.quiet) if (cli_opts.quiet) {
{ total += m_snprintf(ret+total, len-total, "-q ");
int written = snprintf(ret+total, len-total, "-q ");
total += written;
} }
if (cli_opts.no_hostkey_check) if (cli_opts.no_hostkey_check) {
{ total += m_snprintf(ret+total, len-total, "-y -y ");
int written = snprintf(ret+total, len-total, "-y -y "); } else if (cli_opts.always_accept_key) {
total += written; total += m_snprintf(ret+total, len-total, "-y ");
}
else if (cli_opts.always_accept_key)
{
int written = snprintf(ret+total, len-total, "-y ");
total += written;
} }
if (opts.recv_window != DEFAULT_RECV_WINDOW) if (cli_opts.proxycmd) {
{ total += m_snprintf(ret+total, len-total, "-J '%s' ", cli_opts.proxycmd);
int written = snprintf(ret+total, len-total, "-W %u ", opts.recv_window); }
total += written;
if (opts.recv_window != DEFAULT_RECV_WINDOW) {
total += m_snprintf(ret+total, len-total, "-W %u ", opts.recv_window);
} }
#if DROPBEAR_CLI_PUBKEY_AUTH #if DROPBEAR_CLI_PUBKEY_AUTH
for (iter = cli_opts.privkeys->first; iter; iter = iter->next) for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
{ {
sign_key * key = (sign_key*)iter->item; sign_key * key = (sign_key*)iter->item;
const size_t size = len - total; total += m_snprintf(ret+total, len-total, "-i %s ", key->filename);
int written = snprintf(ret+total, size, "-i %s ", key->filename);
dropbear_assert((unsigned int)written < size);
total += written;
} }
#endif /* DROPBEAR_CLI_PUBKEY_AUTH */ #endif /* DROPBEAR_CLI_PUBKEY_AUTH */
/* if args were passed, total will be not zero, and it will have a space at the end, so remove that */
if (total > 0)
{
total--;
}
return ret; return ret;
} }
@ -601,6 +590,9 @@ multihop_passthrough_args() {
* dbclient -J "dbclient -B madako:22 wrt" madako * dbclient -J "dbclient -B madako:22 wrt" madako
* etc for as many hosts as we want. * etc for as many hosts as we want.
* *
* Note that "-J" arguments aren't actually used, instead
* below sets cli_opts.proxycmd directly.
*
* Ports for hosts can be specified as host/port. * Ports for hosts can be specified as host/port.
*/ */
static void parse_multihop_hostname(const char* orighostarg, const char* argv0) { static void parse_multihop_hostname(const char* orighostarg, const char* argv0) {
@ -619,7 +611,7 @@ static void parse_multihop_hostname(const char* orighostarg, const char* argv0)
&& strchr(cli_opts.username, '@')) { && strchr(cli_opts.username, '@')) {
unsigned int len = strlen(orighostarg) + strlen(cli_opts.username) + 2; unsigned int len = strlen(orighostarg) + strlen(cli_opts.username) + 2;
hostbuf = m_malloc(len); hostbuf = m_malloc(len);
snprintf(hostbuf, len, "%s@%s", cli_opts.username, orighostarg); m_snprintf(hostbuf, len, "%s@%s", cli_opts.username, orighostarg);
} else { } else {
hostbuf = m_strdup(orighostarg); hostbuf = m_strdup(orighostarg);
} }
@ -642,19 +634,18 @@ static void parse_multihop_hostname(const char* orighostarg, const char* argv0)
/* Set up the proxycmd */ /* Set up the proxycmd */
unsigned int cmd_len = 0; unsigned int cmd_len = 0;
char *passthrough_args = multihop_passthrough_args(); char *passthrough_args = multihop_passthrough_args();
if (cli_opts.proxycmd) {
dropbear_exit("-J can't be used with multihop mode");
}
if (cli_opts.remoteport == NULL) { if (cli_opts.remoteport == NULL) {
cli_opts.remoteport = "22"; cli_opts.remoteport = "22";
} }
cmd_len = strlen(argv0) + strlen(remainder) cmd_len = strlen(argv0) + strlen(remainder)
+ strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport) + strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
+ strlen(passthrough_args) + strlen(passthrough_args)
+ 30; + 30;
cli_opts.proxycmd = m_malloc(cmd_len); /* replace proxycmd. old -J arguments have been copied
snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s", to passthrough_args */
argv0, cli_opts.remotehost, cli_opts.remoteport, cli_opts.proxycmd = m_realloc(cli_opts.proxycmd, cmd_len);
m_snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s",
argv0, cli_opts.remotehost, cli_opts.remoteport,
passthrough_args, remainder); passthrough_args, remainder);
#ifndef DISABLE_ZLIB #ifndef DISABLE_ZLIB
/* The stream will be incompressible since it's encrypted. */ /* The stream will be incompressible since it's encrypted. */