From patchwork Sat Mar 18 14:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 3138 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp417039dye; Sat, 18 Mar 2023 07:14:17 -0700 (PDT) X-Google-Smtp-Source: AK7set96xZ1Xk6Y5xbkfMIc2HbbR3oOdt1aYB8IPo3WZkbGMVbX8YvJ76f3yOQlNi5B0tCkVSUDf X-Received: by 2002:a17:903:182:b0:1a1:bede:5e54 with SMTP id z2-20020a170903018200b001a1bede5e54mr889867plg.59.1679148857160; Sat, 18 Mar 2023 07:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679148857; cv=none; d=google.com; s=arc-20160816; b=XTYqvZ9Pxwc5XXILI1U5aCan/CzBA+byLKoTn1DvdixmCXJMdkHRh/qsDrTywYSOL+ eBYcdKiRnutF54tE1aA0i5mb6Nc2L4P3fkihob2f21rtebz7Rnz4q528xHhGvvs9EogY 7Q524zHQF7BpbXRiahF+HvlQ8lY0l+bnVM4RxcboULFQQbaIA/wQBbraLe1Lela1EzXN diCK9tlQLFHZP1dA9y2hCzve4bXXQlSsCNE3l2AZRRTenOdi6sTOLIvMT9h2pBJtsost Fc8sGC5haSUdYU2/GWlMxTwvTuMwD/WPn+uHAZ6zwGtcSuSakEvMYdneP0no4kAgqLeA YE6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=2JgKlK9QRvVGEUR1/ZJcx03OR2lrKBB/y4ikBGssMkc=; b=A6EsK5d6Zwxljja/fFWfSjdUdxaTJwFVtzq4a6TbU0UB5eGSNz8WolY2kVKBqJZRFV o36UTT1E24sTQuqveWfkAh56uFYlJECPGFu4ogA2JFFCTUPRp4hhzUhJ6TDhEPz/MWpR QHWmH7k+sFnBM4bjkfm0OreX7hda2NEuf9LQytMDARMNnevYUCZIZEejT+pEVgTx4n56 qpC3TS0kRG+J4zQK8AcLtWUFXVK6TWWdANHXyOjjvzbB1HV+bGmJ60etZIHBLv9JuZs+ FmCKqIEg3EFJ29WXsWF3x6w/2KLuxzJcLphg8ykP3x2nkvhK/D5CSpqqNZSUsbYf0Hpi lGVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=CwUPQbnD; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Zg7PYy5O; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZXifaTZp; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id k10-20020a170902c40a00b001a1b629b939si2193788plk.538.2023.03.18.07.14.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2023 07:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=CwUPQbnD; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Zg7PYy5O; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZXifaTZp; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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.95) (envelope-from ) id 1pdXJc-0007AZ-9S; Sat, 18 Mar 2023 14:13:48 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pdXJa-0007AH-86 for openvpn-devel@lists.sourceforge.net; Sat, 18 Mar 2023 14:13:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=Np88RiKVNbr3Z0syNwhveOaKqV4wwAlRMxh1VWlb624=; b=CwUPQbnD46zI1wxUdmhfK7chXM cDodE7kghUTzfKDJ6ks10rnB7eHcgbkC5/bzQoSMTIODRIsQg97vhGadFWYHaFtyKvZWQ96sEHl7S 1w2jAMGc1UiMrskxC0Pfvl7CPDPNHD0LHGq49nOBTVcKDpNiTBWkiKkvYk/rolJDHRBo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type: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=Np88RiKVNbr3Z0syNwhveOaKqV4wwAlRMxh1VWlb624=; b=Z g7PYy5OLQo0BYVBD9HXyPbKUxOBfdRF4xU4Z/yh+G8U/fCVnLhNKNuS8Qg1wyIk7bchcFOdADbjh5 /g/tY82d6apsW9voyJDYTQL/Ob42EwH4GELB6b/L9nJyhXnBLIRzVXkAjFx+RvLWaqwv98r13q1Kv 0h8WbA8x8azLSJYs=; Received: from mail-il1-f171.google.com ([209.85.166.171]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pdXJW-00Cpsd-Hu for openvpn-devel@lists.sourceforge.net; Sat, 18 Mar 2023 14:13:46 +0000 Received: by mail-il1-f171.google.com with SMTP id s7so4247471ilv.12 for ; Sat, 18 Mar 2023 07:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679148816; x=1681740816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Np88RiKVNbr3Z0syNwhveOaKqV4wwAlRMxh1VWlb624=; b=ZXifaTZpitlwDmMW0vDr3q1u8SJeymRAADJqxNDBuH7pTfqORTDI4n+WERAOZPIMIF Fbowo7BTcthLTj20PLfPhO/rcgIoHjCX1eULklq+gYPjyqjhbrl/J0SyigziWnsJyQNW 9iSFq7ZzTlMztm2kEHfW79AQESUWIjGNLO+iH8bBb1oGTxt5czLEd/qIOjxRXbTgdoFm Vk8DEekSuoDBOvrNbtd3q87i4kzSOU5CGcKqd/dtMUIWHnj/ygN9hRMNMg1Erb1zWlNA A52p0Rh/h5a48usCFDofW7x8irTC2mhaV87fBt1eRfBhdT/Gb3Uds4B5X3uXLhcYFicq F0Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679148816; x=1681740816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Np88RiKVNbr3Z0syNwhveOaKqV4wwAlRMxh1VWlb624=; b=zPNxk/HGyaZeUsAKSkKRtHSoTqlRpl7GGjjkfh55GftpQO5NTjRPFmXpX71DNsznO3 ttEerSKNGQp1dcoAV8QSR9aH4Xp/94arO+nduu8qkCGSVJssVeTVrhXRF9wKUi9jJF9G 8mb1ttoAIemR+dBD/yHTmJtFf1nOUCc370D11bebEqueYyh2jXfqwcjJIz/3LhJuLnbh tmaD6VruqEi0jdBaXDhafA8+ASfSxdISFImnpOR2IbfguR6lVXYCDOxsqmQy5JCSFtti mFEVGZzP3XPHD9Gl4j6ITRZqX8PP8Ef8IO0c0nz8gstjLZoWnwUnBXAiAW0BwGRmh/wQ O10w== X-Gm-Message-State: AO0yUKWBhd+DU19sj9doaAEixXYAvnyG7uW7asoio/S0k/FBNMW8czFE OGUUhGxTD8VBzRncke9KTIe8fw+uqI0= X-Received: by 2002:a92:c266:0:b0:317:36d8:cfc6 with SMTP id h6-20020a92c266000000b0031736d8cfc6mr6557007ild.3.1679148816681; Sat, 18 Mar 2023 07:13:36 -0700 (PDT) Received: from uranus.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-66.dsl.bell.ca. [70.51.222.66]) by smtp.gmail.com with ESMTPSA id j4-20020a02cb04000000b00406418d73b8sm1338811jap.125.2023.03.18.07.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 07:13:36 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sat, 18 Mar 2023 10:13:30 -0400 Message-Id: <20230318141330.1315235-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Selva Nair Change-Id: Id00006bf8ea705d02eff2cbfba7d841e1cdb6ae1 Signed-off-by: Selva Nair --- src/openvpn/socks.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 6a672c25..2cf0cc9f 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -357,11 +357,16 @@ recv_socks_reply(socket_descriptor_t sd [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [selva.nair[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from 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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.171 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.171 listed in list.dnswl.org] X-Headers-End: 1pdXJW-00Cpsd-Hu Subject: [Openvpn-devel] [PATCH] Improve error message on short read from socks proxy 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1760715192233680154?= X-GMAIL-MSGID: =?utf-8?q?1760715192233680154?= From: Selva Nair Change-Id: Id00006bf8ea705d02eff2cbfba7d841e1cdb6ae1 Signed-off-by: Selva Nair Acked-by: Gert Doering --- src/openvpn/socks.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 6a672c25..2cf0cc9f 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -357,11 +357,16 @@ recv_socks_reply(socket_descriptor_t sd, size = recv(sd, &c, 1, MSG_NOSIGNAL); /* error? */ - if (size != 1) + if (size < 0) { msg(D_LINK_ERRORS | M_ERRNO, "recv_socks_reply: TCP port read failed on recv()"); return false; } + else if (size == 0) + { + msg(D_LINK_ERRORS, "ERROR: recv_socks_reply: empty response from socks server"); + return false; + } if (len == 3) {