From patchwork Mon May 28 23:32:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 334 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.57]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id a0F6BNwiDVtRMwAAIUCqbw for ; Tue, 29 May 2018 05:52:28 -0400 Received: from proxy7.mail.iad3a.rsapps.net ([172.27.255.57]) by director8.mail.ord1d.rsapps.net (Dovecot) with LMTP id WcEIAdwiDVucWwAAfY0hYg ; Tue, 29 May 2018 05:52:28 -0400 Received: from smtp5.gate.iad3a ([172.27.255.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.iad3a.rsapps.net with LMTP id KH6AONsiDVslKQAAnPvY+A ; Tue, 29 May 2018 05:52:27 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp5.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=openvpn.net; dmarc=none (p=nil; dis=none) header.from=openvpn.net X-Suspicious-Flag: YES X-Classification-ID: fe7cf92c-6325-11e8-851f-525400de824c-1-1 Received: from [216.105.38.7] ([216.105.38.7:59427] helo=lists.sourceforge.net) by smtp5.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 2A/D3-27119-BD22D0B5; Tue, 29 May 2018 05:52:27 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1fNbHz-0000a5-Av; Tue, 29 May 2018 09:51:35 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fNbHy-0000Zh-E2 for openvpn-devel@lists.sourceforge.net; Tue, 29 May 2018 09:51:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fZklJQIeVMwLPevPC1b6IPmKGjT1xDSspLa0Zaq+qR8=; b=DfcwgYNYAEgTdjBbxkL4NtSFLG VoeD24gatvMR6YdKqO81bwozkEx/zYJI+5h7lI5ED0HB/slId/AvtfDKu9JB6nBjh4BU/vIRY7R+K aaeE6nrsF5S1D6uhNzPaSfagGkvJFNxs/bbCuUtAhHsulqMKlx8v8Mc3oic8B4k+1jPw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fZklJQIeVMwLPevPC1b6IPmKGjT1xDSspLa0Zaq+qR8=; b=YVjZkU4kHzEt9wKxwl+sja/iau erWVhNBRksduHJuE0iJekwguEcHg7inZSBOrNsGQoVoE4TFGlxQrB2M2SgXjGEIEMnnDzZY/R3Gwp SaTWgu0O9u5URqSSri1GkHDbFgqbA3LlDxL8O1ujHPcdK2zU5dj09TWHc7rmdDf4TqrI=; Received: from smtp121.ord1c.emailsrvr.com ([108.166.43.121]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1fNbHw-008AVZ-Sn for openvpn-devel@lists.sourceforge.net; Tue, 29 May 2018 09:51:34 +0000 Received: from smtp24.relay.ord1c.emailsrvr.com (localhost [127.0.0.1]) by smtp24.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id 69BC56011C; Tue, 29 May 2018 05:32:43 -0400 (EDT) X-Auth-ID: lev@openvpn.net Received: by smtp24.relay.ord1c.emailsrvr.com (Authenticated sender: lev-AT-openvpn.net) with ESMTPSA id 5FD44601FC; Tue, 29 May 2018 05:32:42 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openvpn.net; s=20170822-45nk5nwl; t=1527586363; bh=5F0sbCduYMKr0Cm6NAgJVOi/u8X6SyVMSqrrq0MGcsU=; h=From:To:Subject:Date:From; b=MSL5Zi1hV2bgZmoa7y/CUeRRC8Bhq7U0b3dPsdK0eps+dIAjm4JnvZBAfr+Ol5ejm 9OoZIm4KjMKCBtLBqnVoeZfurBeJSpVRcjfwaoYDPhTqPKV9GuwALRZV2XLLBxj3sc wTr6BDijPEcJUdsuaM0V0P/VjY5GYKSQ1KayIoVc= X-Sender-Id: lev@openvpn.net Received: from localhost.localdomain ([UNAVAILABLE]. [93.174.198.226]) (using TLSv1.2 with cipher AES128-SHA256) by 0.0.0.0:465 (trex/5.7.12); Tue, 29 May 2018 05:32:43 -0400 From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 29 May 2018 12:32:38 +0300 Message-Id: <1527586358-16970-1-git-send-email-lev@openvpn.net> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [108.166.43.121 listed in list.dnswl.org] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1fNbHw-008AVZ-Sn Subject: [Openvpn-devel] [PATCH] Improve "recursive routing" warning X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox - print protocol, source/dest addresses and ports - mention "--allow-recursive-routing" - add possible usecase to manpage Trac #843 Signed-off-by: Lev Stipakov --- doc/openvpn.8 | 4 ++- src/openvpn/forward.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 86 insertions(+), 7 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 4114f40..262d4ea 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -4072,7 +4072,9 @@ notifications unless this option is enabled. .TP .B \-\-allow\-recursive\-routing When this option is set, OpenVPN will not drop incoming tun packets -with same destination as host. +with same destination as host. Could be useful when packets sent by openvpn +itself are not subject to the routing tables that would move packets +into the tunnel. .\"********************************************************* .SS Data Channel Encryption Options: These options are meaningful for both Static & TLS\-negotiated key modes diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 7d9a338..77a9084 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1068,7 +1068,7 @@ read_incoming_tun(struct context *c) /** * Drops UDP packets which OS decided to route via tun. * - * On Windows and OS X when netwotk adapter is disabled or + * On Windows and OS X when network adapter is disabled or * disconnected, platform starts to use tun as external interface. * When packet is sent to tun, it comes to openvpn, encapsulated * and sent to routing table, which sends it again to tun. @@ -1080,6 +1080,11 @@ drop_if_recursive_routing(struct context *c, struct buffer *buf) struct openvpn_sockaddr tun_sa; int ip_hdr_offset = 0; + uint32_t saddr, daddr; + struct in6_addr saddr6, daddr6; + uint16_t sport, dport; + uint8_t protocol; + if (c->c2.to_link_addr == NULL) /* no remote addr known */ { return; @@ -1105,12 +1110,38 @@ drop_if_recursive_routing(struct context *c, struct buffer *buf) return; } - pip = (struct openvpn_iphdr *) (BPTR(buf) + ip_hdr_offset); + pip = (const struct openvpn_iphdr *) (BPTR(buf) + ip_hdr_offset); - /* drop packets with same dest addr as gateway */ + /* drop packets with the same dest addr as gateway */ if (tun_sa.addr.in4.sin_addr.s_addr == pip->daddr) { drop = true; + + /* collect information for warning message */ + sport = 0; + dport = 0; + + saddr = ntohl(pip->saddr); + daddr = ntohl(pip->daddr); + protocol = pip->protocol; + + /* whole packet? */ + if (BLEN(buf) == (ip_hdr_offset + (int) (ntohs(pip->tot_len)))) + { + const uint8_t *payload = BPTR(buf) + ip_hdr_offset + sizeof(struct openvpn_iphdr); + + if (protocol == OPENVPN_IPPROTO_UDP) + { + const struct openvpn_udphdr *udp = (const struct openvpn_udphdr *) payload; + sport = ntohs(udp->source); + dport = ntohs(udp->dest); + } else if (protocol == OPENVPN_IPPROTO_TCP) + { + const struct openvpn_tcphdr *tcp = (const struct openvpn_tcphdr *) payload; + sport = ntohs(tcp->source); + dport = ntohs(tcp->dest); + } + } } } else if (proto_ver == 6) @@ -1129,22 +1160,68 @@ drop_if_recursive_routing(struct context *c, struct buffer *buf) return; } - /* drop packets with same dest addr as gateway */ + /* drop packets with the same dest addr as gateway */ pip6 = (struct openvpn_ipv6hdr *) (BPTR(buf) + ip_hdr_offset); if (IN6_ARE_ADDR_EQUAL(&tun_sa.addr.in6.sin6_addr, &pip6->daddr)) { drop = true; + + /* collect information for warning message */ + sport = 0; + dport = 0; + + saddr6 = pip6->saddr; + daddr6 = pip6->daddr; + protocol = pip6->nexthdr; + + /* whole packet? */ + if (BLEN(buf) == ((int) sizeof(struct openvpn_ipv6hdr) + ip_hdr_offset + (int) ntohs(pip6->payload_len))) + { + const uint8_t *payload = BPTR(buf) + ip_hdr_offset + sizeof(struct openvpn_ipv6hdr); + + if (protocol == OPENVPN_IPPROTO_UDP) + { + const struct openvpn_udphdr *udp = (const struct openvpn_udphdr *) payload; + sport = ntohs(udp->source); + dport = ntohs(udp->dest); + } else if (protocol == OPENVPN_IPPROTO_TCP) + { + const struct openvpn_tcphdr *tcp = (const struct openvpn_tcphdr *) payload; + sport = ntohs(tcp->source); + dport = ntohs(tcp->dest); + } + } } } if (drop) { struct gc_arena gc = gc_new(); + struct buffer addrs_buf = alloc_buf_gc(128, &gc); + /* drop packet */ c->c2.buf.len = 0; - msg(D_LOW, "Recursive routing detected, drop tun packet to %s", - print_link_socket_actual(c->c2.to_link_addr, &gc)); + if (protocol == OPENVPN_IPPROTO_UDP) + buf_printf(&addrs_buf, "%s", "UDP"); + else if (protocol == OPENVPN_IPPROTO_TCP) + buf_printf(&addrs_buf, "%s", "TCP"); + else + buf_printf(&addrs_buf, "%d", protocol); + + if (proto_ver == 4) + { + buf_printf(&addrs_buf, " %s:%d -> %s:%d", + print_in_addr_t(saddr, 0, &gc), sport, + print_in_addr_t(daddr, 0, &gc), dport); + } else if (proto_ver == 6) + { + buf_printf(&addrs_buf, " %s:%d -> %s:%d", + print_in6_addr(saddr6, 0, &gc), sport, + print_in6_addr(daddr6, 0, &gc), dport); + } + + msg(D_LOW, "Recursive routing detected, drop packet %s. Fix your routing or consider using --allow-recursive-routing option.", BSTR(&addrs_buf)); gc_free(&gc); } }