From d1d1bd60c94e3e23d3bec3895250e0cd812ff250 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Fri, 22 Dec 2023 23:27:54 +0200 Subject: [PATCH] sshtunnel: ProxyCommand option The ProxyCommand may have spaces so it must be quoted. So we must use the procd_append_param. Currently the option is not supported by Dropbear. But it has -J instead which in OpenSSH means ProxyJump. So we can't use it to avoid conflict. Signed-off-by: Sergey Ponomarev --- net/sshtunnel/files/sshtunnel.init | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sshtunnel/files/sshtunnel.init b/net/sshtunnel/files/sshtunnel.init index 8b8f97f933..195cc78249 100644 --- a/net/sshtunnel/files/sshtunnel.init +++ b/net/sshtunnel/files/sshtunnel.init @@ -52,7 +52,8 @@ validate_server_section() { 'ServerAliveInterval:min(0)' \ 'StrictHostKeyChecking:or("yes", "no", "accept-new"):accept-new' \ 'TCPKeepAlive:or("yes", "no")' \ - 'VerifyHostKeyDNS:or("yes", "no")' + 'VerifyHostKeyDNS:or("yes", "no")' \ + 'ProxyCommand:string(1)' } validate_tunnelR_section() { @@ -198,6 +199,9 @@ load_server() { procd_open_instance "$server" procd_set_param command "$PROG" $ARGS + # ProxyCommand must be quoted + [ -n "$ProxyCommand" ] && procd_append_param command -o "ProxyCommand=$ProxyCommand" + procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param respawn 0 "$retrydelay" 1 -- 2.30.2