From patchwork Sun Jul 19 23:17:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1310 X-Patchwork-Delegate: a@unstable.cc 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 gLgBNElhFV+IMwAAIUCqbw for ; Mon, 20 Jul 2020 05:18:01 -0400 Received: from proxy9.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id WCDWM0lhFV/ZaAAAfY0hYg ; Mon, 20 Jul 2020 05:18:01 -0400 Received: from smtp35.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.ord1d.rsapps.net with LMTP id GEwOM0lhFV9eIgAA7h+8OQ ; Mon, 20 Jul 2020 05:18:01 -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: smtp35.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: e86e7d60-ca69-11ea-a8cb-525400a7b7b4-1-1 Received: from [216.105.38.7] ([216.105.38.7:47342] helo=lists.sourceforge.net) by smtp35.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 56/A9-18022-941651F5; Mon, 20 Jul 2020 05:18:01 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jxRvC-0002oX-BK; Mon, 20 Jul 2020 09:17:18 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRvB-0002oP-0i for openvpn-devel@lists.sourceforge.net; Mon, 20 Jul 2020 09:17:17 +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=4szHL5kjTTxHcCXa+f8OIL+fY2FsLsGkNywEhR6Voqg=; b=Mca05yz4g/hpWj+hxFvjKvvBHj Xei7cdNTdj3tNrcBiMQVqy/F5XF5MRhZrMPED86D9nXGKVfcSwL1UWxKRmYVxTWfUZshaxBSAepGx EfLfFXXALLo5wOf/mk+DbC/ZS72/Gg2PP/i02j+gPTHCowOkIn1Pq8/Hquxtv9Gyz6c4=; 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=4szHL5kjTTxHcCXa+f8OIL+fY2FsLsGkNywEhR6Voqg=; b=JmgfGLh+DZqzDbmT+0bet4520E ifRvejD4sq6GvqPbkqnT6W4QSGGakyLKSzTfxWSC4/Z7HY0BxC/Nf2KwSg51RE83+wfoMW9ulifIN lR15e4Lgt/kbMBWfKT1/LZ2wE1XzVtf2Xhs/IVuwoguLyx+WzoLCWP1FfylwvWibPnog=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jxRv8-00DSUc-RM for openvpn-devel@lists.sourceforge.net; Mon, 20 Jul 2020 09:17:16 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1jxRuv-000Gub-3J for openvpn-devel@lists.sourceforge.net; Mon, 20 Jul 2020 11:17:01 +0200 Received: (nullmailer pid 30318 invoked by uid 10006); Mon, 20 Jul 2020 09:17:01 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 20 Jul 2020 11:17:00 +0200 Message-Id: <20200720091700.30271-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jxRv8-00DSUc-RM Subject: [Openvpn-devel] [PATCH v2 1/9] Indicate that a client is in pull mode in IV_PROTO 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 This allows us to skip waiting for the first PUSH_REQUEST message from the client to send the response. This changes the interpretation of IV_PROTO from a scalar to a bitfield Since we only have IV_PROTO=2 defined so far and will support DATA_V2 this should not make any problem. This avoid adding another IV_xxx variable that takes valuable space in the protocol frame. Signed-off-by: Arne Schwabe Patch V2: Use bitmask for IV_PROTO_DATA_V2 and add more documentation. Signed-off-by: Arne Schwabe --- doc/man-sections/server-options.rst | 6 +++++- src/openvpn/multi.c | 12 ++++++++++-- src/openvpn/ssl.c | 15 +++++++++++++-- src/openvpn/ssl.h | 16 ++++++++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/doc/man-sections/server-options.rst b/doc/man-sections/server-options.rst index c8e9fc61..e24cb135 100644 --- a/doc/man-sections/server-options.rst +++ b/doc/man-sections/server-options.rst @@ -464,9 +464,13 @@ fast hardware. SSL/TLS authentication must be used in this mode. :code:`IV_LZ4=1` If the client supports LZ4 compressions. - :code:`IV_PROTO=2` + :code:`IV_PROTO=2` (bit 2) If the client supports peer-id floating mechanism + :code:`IV_PROTO=4` (bit 3) + When the client expects a push-reply and the server may + send this reply without waiting for a push-request first. + :code:`IV_NCP=2` Negotiable ciphers, client supports ``--cipher`` pushed by the server, a value of 2 or greater indicates client supports diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index d9456f34..cb950db5 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1792,10 +1792,18 @@ multi_client_set_protocol_options(struct context *c) { int proto = 0; int r = sscanf(optstr, "IV_PROTO=%d", &proto); - if ((r == 1) && (proto >= 2)) + if (r == 1) { - tls_multi->use_peer_id = true; + if (proto & IV_PROTO_DATA_V2) + { + tls_multi->use_peer_id = true; + } + if (proto & IV_PROTO_REQUEST_PUSH) + { + c->c2.push_request_received = true; + } } + } /* Select cipher if client supports Negotiable Crypto Parameters */ diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 54a23011..04d78a81 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2299,8 +2299,19 @@ push_peer_info(struct buffer *buf, struct tls_session *session) buf_printf(&out, "IV_PLAT=win\n"); #endif - /* support for P_DATA_V2 */ - buf_printf(&out, "IV_PROTO=2\n"); + /* support for P_DATA_V2*/ + int iv_proto = IV_PROTO_DATA_V2; + + /* support for receiving push_reply before sending + * push request, also signal that the client wants + * to get push-reply messages without without requiring a round + * trip for a push request message*/ + if(session->opt->pull) + { + iv_proto |= IV_PROTO_REQUEST_PUSH; + } + + buf_printf(&out, "IV_PROTO=%d\n", iv_proto); /* support for Negotiable Crypto Parameters */ if (session->opt->ncp_enabled diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index 58a9b0d4..81f8810e 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -99,6 +99,22 @@ /* Maximum length of OCC options string passed as part of auth handshake */ #define TLS_OPTIONS_LEN 512 +/* Definitions of the bits in the IV_PROTO bitfield + * + * In older OpenVPN versions this used as comparision + * IV_PROTO >= 2 to determine if DATA_V2 is supported. + * Therefore any client announcing any of the flags must + * also announce IV_PROTO_DATA_V2. We also treat bit 0 + * as reserved for this reason */ + +/** Support P_DATA_V2 */ +#define IV_PROTO_DATA_V2 (1<<1) + +/** Assume client will send a push request and server does not need + * to wait for a push-request to send a push-reply */ +#define IV_PROTO_REQUEST_PUSH (1<<2) + + /* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN"