From patchwork Sat Oct 6 00:02:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 495 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id QF9SNvOIuFteRgAAIUCqbw for ; Sat, 06 Oct 2018 06:05:39 -0400 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id sAP9NfOIuFs5GQAAfY0hYg ; Sat, 06 Oct 2018 06:05:39 -0400 Received: from smtp10.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTP id gCvONfOIuFudFgAATCaURg ; Sat, 06 Oct 2018 06:05:39 -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: smtp10.gate.ord1d.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 606339e6-c94f-11e8-9c17-52540013bccb-1-1 Received: from [216.105.38.7] ([216.105.38.7:26949] helo=lists.sourceforge.net) by smtp10.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B9/06-07027-3F888BB5; Sat, 06 Oct 2018 06:05:39 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g8jSE-0001nx-Np; Sat, 06 Oct 2018 10:04:58 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g8jSE-0001nm-2U for openvpn-devel@lists.sourceforge.net; Sat, 06 Oct 2018 10:04:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YXDfy+yWfXyvBVQJnPlKMCnr57s3NMzhu0XfVx4CI5U=; b=FU/K7K9v8Qi/Bp8aFh58boniVI 2LySL5yGCF4feKh7LbW6HXVU94AkUFvcUVA5AGw/S457r2s0tXs6Mpztphoky37LYJgCt669NliZ/ Zf6UuDT6fjPOPDvKpxKpCfwtaz2vbOkcPDJhOoUnS4gLE7Iub7AMbiDCtl//MD8IHmo4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YXDfy+yWfXyvBVQJnPlKMCnr57s3NMzhu0XfVx4CI5U=; b=MLBqVgpRnY6iCZf1tYjoat6KPO 0SPoTJHTpiuYAsLfYydA791rsuAFpE5mKSlR1z69IcX+X6Uc3unJwJvr8ji/2ClnRozM58pHM03+Q 6GkYydRgt1vZD74gu2Rw4YYHBdY+whGn7vjCrTGoIfxlEvAeN5PFzEZJnwy69rC2VbUM=; Received: from mail-ed1-f68.google.com ([209.85.208.68]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g8jSC-00D92D-Af for openvpn-devel@lists.sourceforge.net; Sat, 06 Oct 2018 10:04:58 +0000 Received: by mail-ed1-f68.google.com with SMTP id c26-v6so5968527edt.3 for ; Sat, 06 Oct 2018 03:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=YXDfy+yWfXyvBVQJnPlKMCnr57s3NMzhu0XfVx4CI5U=; b=kHcyXp0Gj1PUiwvkLFLQwodFp8EdImkGZQC9hf9n0+W1/pX3EzGIXpkeMC+Ksjjz9g 3VWYXqUICO5M2ewib0y3UYvvgi5a36rXuxlF3WNQjnEVS+U5AgGfKjyEiUdute4gSTFQ VShMOXKqUI9W0FnNwur1dlrL2/cpda1uE2eteL7prGji+Gp+/f0TYC/vXIkpN5KBLy6l H5eEhu/x1IiUyMmA40tiUwGBHdYmIV6jS1/pEvqfmim/2AtbScevqHVgd167erpCiQPw DGGqgE+XiWXjkN+NhTv3fQOHXWWy0YPDL/I3lM5ZkYP5y5rN0BNTAdDdyjWC5JlA/mtM PDEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=YXDfy+yWfXyvBVQJnPlKMCnr57s3NMzhu0XfVx4CI5U=; b=NYjAut97c1+FFGu6HP72QjAlMjwUk0zJd7WareWKbIyVwBEYrCl+SjsdNA4BgyGLMB jvonN99hKDuGba5aeG155CuGJ6+ocGKMdlh9Ih4cbzcj1WC60J5+dzuzNIJUsM30xJYn +9rGVMkUKu/jtuJIe39lLAM8U63KvVsiLsXxfnIzTvY72oMGsvigsACIUGKVm7CF7AqY QopU3dapfJ31KfHP+iu1M3vXGBX+SeU6XPubbRnBnYzwnlgHYSMFa/ysSU8SIQ/Vr2Ly Ji781avUCGIyhcxrUGg19EfY0SJOK49nHtyX2SGqMvu6drd8o/Nu/6iBT+S4CWmeqmSx jsXQ== X-Gm-Message-State: ABuFfoh4yNWMnJYqtFjuID++zgkclxkMFBVP8bwggsthC7bo2TRfqumj MUuaLn8YgHJTMF8Vju9lVdjvzOVomeM= X-Google-Smtp-Source: ACcGV62n/WX4IT2Z3rVOJXdMiV8jeMj60O93Em5Tsd7raQN/bK2nq3x43iS9GWsDiQmoesTlFnoY8Q== X-Received: by 2002:a50:83e6:: with SMTP id 93-v6mr5391152edi.88.1538820289165; Sat, 06 Oct 2018 03:04:49 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id w56-v6sm3494290edd.78.2018.10.06.03.04.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Oct 2018 03:04:48 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Sat, 6 Oct 2018 13:02:08 +0300 Message-Id: <1538820128-27086-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.68 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g8jSC-00D92D-Af Subject: [Openvpn-devel] [PATCH v3] Improve "recursive routing" warning message 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov This patch provides additional information, such as source address/port and destination address/port, to the "recursive routing" warning message. It also mentiones possible workaround. Trac #843 Signed-off-by: Lev Stipakov --- v3: - factor out ports extraction code into own function to avoid code duplication - better commit message v2: - print protocol, source/dest addresses and ports - mention "--allow-recursive-routing" - add possible usecase to manpage doc/openvpn.8 | 4 ++- src/openvpn/forward.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index de1a192..4f6017e 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -4090,7 +4090,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..b53f223 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1065,10 +1065,42 @@ read_incoming_tun(struct context *c) perf_pop(); } +/* + * Extracts sport and dport from packet, used + * in recursive routing warning. + */ +static void +extract_sport_dport(const struct buffer *buf, uint8_t protocol, int offset_to_payload, int packet_len, uint16_t *sport, uint16_t *dport) +{ + /* whole packet? */ + if (BLEN(buf) == packet_len) + { + const uint8_t *payload = BPTR(buf) + offset_to_payload; + + 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 + { + *sport = 0; + *dport = 0; + } +} + /** * 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 +1112,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; @@ -1094,7 +1131,7 @@ drop_if_recursive_routing(struct context *c, struct buffer *buf) const struct openvpn_iphdr *pip; /* make sure we got whole IP header */ - if (BLEN(buf) < ((int) sizeof(struct openvpn_iphdr) + ip_hdr_offset)) + if (BLEN(buf) < ((int)sizeof(struct openvpn_iphdr) + ip_hdr_offset)) { return; } @@ -1105,12 +1142,21 @@ 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 */ + + saddr = ntohl(pip->saddr); + daddr = ntohl(pip->daddr); + protocol = pip->protocol; + + extract_sport_dport(buf, protocol, ip_hdr_offset + sizeof(struct openvpn_iphdr), + ip_hdr_offset + (int)(ntohs(pip->tot_len)), &sport, &dport); } } else if (proto_ver == 6) @@ -1118,7 +1164,7 @@ drop_if_recursive_routing(struct context *c, struct buffer *buf) const struct openvpn_ipv6hdr *pip6; /* make sure we got whole IPv6 header */ - if (BLEN(buf) < ((int) sizeof(struct openvpn_ipv6hdr) + ip_hdr_offset)) + if (BLEN(buf) < ((int)sizeof(struct openvpn_ipv6hdr) + ip_hdr_offset)) { return; } @@ -1129,22 +1175,58 @@ 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 */ + + saddr6 = pip6->saddr; + daddr6 = pip6->daddr; + protocol = pip6->nexthdr; + + extract_sport_dport(buf, protocol, ip_hdr_offset + sizeof(struct openvpn_ipv6hdr), + (int)sizeof(struct openvpn_ipv6hdr) + ip_hdr_offset + (int)ntohs(pip6->payload_len), + &sport, &dport); } } 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); } }