From patchwork Thu Apr 15 03:39:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 12204213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91843C433B4 for ; Thu, 15 Apr 2021 03:46:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE7D1611F1 for ; Thu, 15 Apr 2021 03:46:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE7D1611F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWsxP-0004bu-VL for qemu-devel@archiver.kernel.org; Wed, 14 Apr 2021 23:46:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3lLV3YAMKCucMSNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--dje.bounces.google.com>) id 1lWsrQ-0000Tb-3L for qemu-devel@nongnu.org; Wed, 14 Apr 2021 23:40:08 -0400 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]:38444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3lLV3YAMKCucMSNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--dje.bounces.google.com>) id 1lWsrN-0004nu-KP for qemu-devel@nongnu.org; Wed, 14 Apr 2021 23:40:07 -0400 Received: by mail-qv1-xf4a.google.com with SMTP id c18-20020a0cd6120000b029017e89b07723so927908qvj.5 for ; Wed, 14 Apr 2021 20:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0eAktSp+0q4k860RAJZmoAP5ixLezya1TBl9Xu85hJA=; b=PLUAnPE+0cxO8ShGm/nLgxIP1pK+qp/nPtJyAWd65fXsVzAcoVGausYD/IJNHnQlfa uwEK5XT9Ag+1qQgQzDfKGeOrefwns95mwemzFYhuSfkvoUbmN0S2WIcsriuWpGOsJ5WC NXDiq0l90ITfAlghty/ZbAILUX8BkzSczV8OpyL/e3fxyNEud93IH06JrZtzUU7mlkCr 3gCbW5p+xFCRpGQp59gy8Ox8Xsn5zHRfOaWczmKJF624d2vfhL8xhV2ZHFjj86PnF8Dy w3RTujaxRyIIllc0SyHcEhWPJlCjxRLLzRXlYSxgSu1ZnY67Y4pDxRFHGz8aHFIbMSlk 1VaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0eAktSp+0q4k860RAJZmoAP5ixLezya1TBl9Xu85hJA=; b=d2ir1OwaSxbllfXO7DC5Xfz7Os+Vb3ko6dnmJnjNmztOM3OQOSd4ZfosFAEIcYI/BX 6EBmoKcL3m1akZK/d1BrKTnyQPE7DB0IkCfccKPYe6xCrhHdatXYEugC3FeJ44ilfYF5 GxdJvDl26yPHXO8uI18OIL0Xj6KdFmi+1SD96DPXrN8rNFKP0gU1HZN58FJPjQJjh5TE 8eGKTMJkxfaVU6gDqZ89KiNj5acEqZqT0IB1PJcA7rmQvpPAKfMS083sA84e6efCj2o7 83PMmuarvTahGtamltODW8/4YH50eKNMqFL4CuT6q/RsPbmttgeEzzZbFEUNAhk0SZGm kHsg== X-Gm-Message-State: AOAM5306fUCguOK1utG+5vDuFb495E/TrYRh+6WCO58dtLUJAFzd8Wvx hOXPi2OGLrG9AEXBrL7SZzamI0fPKgWu9mAn7DNW1THJSz3K2b1Fqc/xtEb2Z/uZmHC8HDoMW5W ypHB0jKu+euo/K1abEB9So9wwcAoVjFNtEUzT1SR7g39ZLk+BJTm3 X-Google-Smtp-Source: ABdhPJzdfMzd48tsPCPAgUEwWlYbTyRd8YLuBfr5nX97SgmQ8prNj7qpCAp4TknH1av5pObzKAoKhfM= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:83d5:e012:e680:1449]) (user=dje job=sendgmr) by 2002:a05:620a:cc1:: with SMTP id b1mr1580087qkj.356.1618458004028; Wed, 14 Apr 2021 20:40:04 -0700 (PDT) Date: Wed, 14 Apr 2021 20:39:25 -0700 In-Reply-To: <20210415033925.1290401-1-dje@google.com> Message-Id: <20210415033925.1290401-5-dje@google.com> Mime-Version: 1.0 References: <20210415033925.1290401-1-dje@google.com> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog Subject: [PATCH v6 4/4] net: Extend host forwarding to support IPv6 From: Doug Evans To: qemu-devel@nongnu.org Cc: Samuel Thibault , " =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= " , Doug Evans Received-SPF: pass client-ip=2607:f8b0:4864:20::f4a; envelope-from=3lLV3YAMKCucMSNPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--dje.bounces.google.com; helo=mail-qv1-xf4a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Net option "-hostfwd" now supports IPv6 addresses. Commands hostfwd_add, hostfwd_remove now support IPv6 addresses. Tested: avocado run tests/acceptance/hostfwd.py Signed-off-by: Doug Evans --- Changes from v5: Recognize ipv4=,ipv6= options. hmp-commands.hx | 18 ++++++- net/slirp.c | 54 +++++++++++++++++---- tests/acceptance/hostfwd.py | 94 +++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 11 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 435c591a1c..05f88e893b 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1322,7 +1322,8 @@ ERST { .name = "hostfwd_add", .args_type = "arg1:s,arg2:s?", - .params = "[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport", + .params = "[netdev_id] [tcp|udp]:[hostaddr]:hostport\n" + "[,ipv4=on|off][,ipv6=on|off]-[guestaddr]:guestport", .help = "redirect TCP or UDP connections from host to guest (requires -net user)", .cmd = hmp_hostfwd_add, }, @@ -1330,13 +1331,20 @@ ERST SRST ``hostfwd_add`` Redirect TCP or UDP connections from host to guest (requires -net user). + IPV6 addresses are wrapped in square brackets, IPV4 addresses are not. + + Examples: + hostfwd_add net0 tcp:127.0.0.1:10022-:22 + hostfwd_add net0 tcp:[::1]:10022-[fe80::1:2:3:4]:22 + hostfwd_add net0 ::10022,ipv6-:22 ERST #ifdef CONFIG_SLIRP { .name = "hostfwd_remove", .args_type = "arg1:s,arg2:s?", - .params = "[netdev_id] [tcp|udp]:[hostaddr]:hostport", + .params = "[netdev_id] [tcp|udp]:[hostaddr]:hostport\n" + "[,ipv4=on|off][,ipv6=on|off]", .help = "remove host-to-guest TCP or UDP redirection", .cmd = hmp_hostfwd_remove, }, @@ -1345,6 +1353,12 @@ ERST SRST ``hostfwd_remove`` Remove host-to-guest TCP or UDP redirection. + IPV6 addresses are wrapped in square brackets, IPV4 addresses are not. + + Examples: + hostfwd_remove net0 tcp:127.0.0.1:10022 + hostfwd_remove net0 tcp:[::1]:10022 + hostfwd_remove net0 ::10022,ipv6 ERST { diff --git a/net/slirp.c b/net/slirp.c index 4be065c30b..82d4b71bef 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -664,25 +664,55 @@ static const char *parse_protocol(const char *str, bool *is_udp, return p; } -static int parse_hostfwd_sockaddr(const char *str, int socktype, +static int parse_hostfwd_sockaddr(const char *str, int family, int socktype, struct sockaddr_storage *saddr, - Error **errp) + bool *v6_only, Error **errp) { struct addrinfo hints, *res = NULL, *e; InetSocketAddress *addr = g_new(InetSocketAddress, 1); int gai_rc; int rc = -1; + Error *err = NULL; const char *optstr = inet_parse_host_port(addr, str, errp); if (optstr == NULL) { goto fail_return; } + if (inet_parse_ipv46(addr, optstr, errp) < 0) { + goto fail_return; + } + + if (v6_only) { + bool v4 = addr->has_ipv4 && addr->ipv4; + bool v6 = addr->has_ipv6 && addr->ipv6; + *v6_only = v6 && !v4; + } + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; /* ignored if host is not ""(->NULL) */ hints.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV; hints.ai_socktype = socktype; - hints.ai_family = PF_INET; + hints.ai_family = inet_ai_family_from_address(addr, &err); + if (err) { + error_propagate(errp, err); + goto fail_return; + } + if (family != PF_UNSPEC) { + /* Guest must use same family as host (for now). */ + if (hints.ai_family != PF_UNSPEC && hints.ai_family != family) { + error_setg(errp, + "unexpected address family for %s: expecting %s", + str, family == PF_INET ? "ipv4" : "ipv6"); + goto fail_return; + } + hints.ai_family = family; + } + + /* For backward compatibility, treat an empty host spec as IPv4. */ + if (*addr->host == '\0' && hints.ai_family == PF_UNSPEC) { + hints.ai_family = PF_INET; + } /* * Calling getaddrinfo for guest addresses is dubious, but addresses are @@ -768,8 +798,8 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) flags |= SLIRP_HOSTFWD_UDP; } - if (parse_hostfwd_sockaddr(p, is_udp ? SOCK_DGRAM : SOCK_STREAM, - &host_addr, &error) < 0) { + if (parse_hostfwd_sockaddr(p, PF_UNSPEC, is_udp ? SOCK_DGRAM : SOCK_STREAM, + &host_addr, /*v6_only=*/NULL, &error) < 0) { goto fail_syntax; } @@ -794,6 +824,7 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp) Error *error = NULL; int flags = 0; int port; + bool v6_only; g_assert(redir_str != NULL); p = redir_str; @@ -811,14 +842,19 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp) goto fail_syntax; } - if (parse_hostfwd_sockaddr(buf, is_udp ? SOCK_DGRAM : SOCK_STREAM, - &host_addr, &error) < 0) { + if (parse_hostfwd_sockaddr(buf, PF_UNSPEC, + is_udp ? SOCK_DGRAM : SOCK_STREAM, + &host_addr, &v6_only, &error) < 0) { error_prepend(&error, "For host address: "); goto fail_syntax; } + if (v6_only) { + flags |= SLIRP_HOSTFWD_V6ONLY; + } - if (parse_hostfwd_sockaddr(p, is_udp ? SOCK_DGRAM : SOCK_STREAM, - &guest_addr, &error) < 0) { + if (parse_hostfwd_sockaddr(p, host_addr.ss_family, + is_udp ? SOCK_DGRAM : SOCK_STREAM, + &guest_addr, /*v6_only=*/NULL, &error) < 0) { error_prepend(&error, "For guest address: "); goto fail_syntax; } diff --git a/tests/acceptance/hostfwd.py b/tests/acceptance/hostfwd.py index 9b9db142c3..f8493c5bdc 100644 --- a/tests/acceptance/hostfwd.py +++ b/tests/acceptance/hostfwd.py @@ -37,6 +37,17 @@ def test_qmp_hostfwd_ipv4(self): self.assertEquals(self.hmc('hostfwd_add udp::65042-:42'), '') self.assertEquals(self.hmc('hostfwd_remove udp::65042'), 'host forwarding rule for udp::65042 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv4-:22'), '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022,ipv4'), + 'host forwarding rule for tcp::65022,ipv4 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv4=on-:22'), + '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022,ipv4=on'), + 'host forwarding rule for tcp::65022,ipv4=on removed\r\n') + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv6=off-:22'), + '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022,ipv6=off'), + 'host forwarding rule for tcp::65022,ipv6=off removed\r\n') def test_qmp_hostfwd_ipv4_functional_errors(self): """Verify handling of various kinds of errors given valid addresses.""" @@ -89,3 +100,86 @@ def test_qmp_hostfwd_ipv4_parsing_errors(self): self.assertEquals(self.hmc('hostfwd_add ::66-:0'), "Invalid host forwarding rule '::66-:0'" + \ " (For guest address: invalid port '0')\r\n") + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv4=abc-:22'), + "Invalid host forwarding rule" + \ + " 'tcp::65022,ipv4=abc-:22' (For host address:" + \ + " error parsing 'ipv4' flag '=abc')\r\n") + + def test_qmp_hostfwd_ipv6(self): + self.vm.add_args('-nodefaults', + '-netdev', 'user,id=vnet', + '-device', 'virtio-net,netdev=vnet') + self.vm.launch() + self.assertEquals(self.hmc('hostfwd_add vnet tcp:[::1]:65022-[fe80::1]:22'), + '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp:[::1]:65022'), + 'host forwarding rule for tcp:[::1]:65022 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'), + '') + self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'), + 'host forwarding rule for udp:[::1]:65042 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv6=on-:22'), '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022,ipv6=on'), + 'host forwarding rule for tcp::65022,ipv6=on removed\r\n') + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv4=off-:22'), '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022,ipv4=off'), + 'host forwarding rule for tcp::65022,ipv4=off removed\r\n') + + def test_qmp_hostfwd_ipv6_functional_errors(self): + """Verify handling of various kinds of errors given valid addresses.""" + self.vm.add_args('-nodefaults', + '-netdev', 'user,id=vnet', + '-device', 'virtio-net,netdev=vnet') + self.vm.launch() + self.assertEquals(self.hmc('hostfwd_remove :[::1]:65022'), + 'host forwarding rule for :[::1]:65022 not found\r\n') + self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'), + '') + self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'), + "Could not set up host forwarding rule" + \ + " 'udp:[::1]:65042-[fe80::1]:42': Address already in use\r\n") + self.assertEquals(self.hmc('hostfwd_remove :[::1]:65042'), + 'host forwarding rule for :[::1]:65042 not found\r\n') + self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'), + 'host forwarding rule for udp:[::1]:65042 removed\r\n') + self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'), + 'host forwarding rule for udp:[::1]:65042 not found\r\n') + + def test_qmp_hostfwd_ipv6_errors(self): + """Verify handling of various kinds of errors.""" + self.vm.add_args('-nodefaults', + '-netdev', 'user,id=vnet', + '-device', 'virtio-net,netdev=vnet') + self.vm.launch() + self.assertEquals(self.hmc('hostfwd_add :[::1-'), + "Invalid host forwarding rule ':[::1-'" + \ + " (For host address: error parsing IPv6 address '[::1')\r\n") + self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1'), + "Invalid host forwarding rule ':[::1]:66-[fe80::1'" + \ + " (For guest address: error parsing IPv6 address" + \ + " '[fe80::1')\r\n") + self.assertEquals(self.hmc('hostfwd_add :[:::]:66-foo'), + "Invalid host forwarding rule ':[:::]:66-foo'" + \ + " (For host address: address resolution failed for" + \ + " '[:::]:66': Name or service not known)\r\n") + self.assertEquals(self.hmc('hostfwd_add :[::1]-foo'), + "Invalid host forwarding rule ':[::1]-foo'" + \ + " (For host address: error parsing IPv6 address '[::1]')\r\n") + self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[foo]'), + "Invalid host forwarding rule ':[::1]:66-[foo]'" + \ + " (For guest address: error parsing IPv6 address '[foo]')\r\n") + self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1]:0'), + "Invalid host forwarding rule ':[::1]:66-[fe80::1]:0'" + \ + " (For guest address: invalid port '0')\r\n") + self.assertEquals(self.hmc('hostfwd_add :[::1]:66-1.2.3.4:66'), + "Invalid host forwarding rule ':[::1]:66-1.2.3.4:66'" + \ + " (For guest address: address resolution failed for" + \ + " '1.2.3.4:66': Address family for hostname not supported)\r\n") + self.assertEquals(self.hmc('hostfwd_add :1.2.3.4:66-[fe80::1]:66'), + "Invalid host forwarding rule ':1.2.3.4:66-[fe80::1]:66'" + \ + " (For guest address: address resolution failed for" + \ + " '[fe80::1]:66': Address family for hostname not" + \ + " supported)\r\n") + self.assertEquals(self.hmc('hostfwd_add vnet tcp::65022,ipv6=abc-:22'), + "Invalid host forwarding rule 'tcp::65022,ipv6=abc-:22'" + \ + " (For host address: error parsing 'ipv6' flag '=abc')\r\n")