From patchwork Sun Sep 25 12:17:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2793 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id OLoKF7DTMGPfLwAAIUCqbw (envelope-from ) for ; Sun, 25 Sep 2022 18:18:24 -0400 Received: from proxy15.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id kOuzFrDTMGMSGAAAvGGmqA (envelope-from ) for ; Sun, 25 Sep 2022 18:18:24 -0400 Received: from smtp37.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.ord1d.rsapps.net with LMTPS id 6IZ1FrDTMGOBeQAAAY1PeQ (envelope-from ) for ; Sun, 25 Sep 2022 18:18:24 -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: smtp37.gate.ord1c.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=unstable.cc; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: f7ef982a-3d1f-11ed-9941-525400e8d833-1-1 Received: from [216.105.38.7] ([216.105.38.7:54790] helo=lists.sourceforge.net) by smtp37.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 41/39-20505-FA3D0336; Sun, 25 Sep 2022 18:18:23 -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.95) (envelope-from ) id 1ocZwP-0002iR-5N; Sun, 25 Sep 2022 22:17:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ocZwM-0002iG-OZ for openvpn-devel@lists.sourceforge.net; Sun, 25 Sep 2022 22:17:35 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eZppG0FuXqpRONpUpk1QKIw0HOUniX0QZ1CJQDMRITo=; b=gpYGVelgc88hWYa5od1u3+pxXl 3AwPKv4AdSeaZyPvKd9qPua/gUe7gRfXpfDb1LAyVHgbD4SGaLJ6epdtW/XQa1xK+eA4gZxI/CNg6 LeNV4aYDn4/XWHV5+DRNTgU4YL49R2gRcIWvnjBTr3+j7unEGluetInpXCq6LQoiJvmk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=eZppG0FuXqpRONpUpk1QKIw0HOUniX0QZ1CJQDMRITo=; b=QVVR6z55Ht1IfJ9j7prNS2IcRA nSsdhLi58daqusYwUhywArlKfAGhPXAXNydoPFj85p5T1g/2R6H+4WgNa2Qg19ZBh2w+UnSFDwRoR SFAJPBgH6oZfmHt8hExMP5bLVeOAOEVaIHRE/qnEyYmeydIscurRRqCv31eCty2uypTA=; Received: from wilbur.contactoffice.com ([212.3.242.68]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1ocZwL-0005U3-3P for openvpn-devel@lists.sourceforge.net; Sun, 25 Sep 2022 22:17:34 +0000 Received: from smtpauth1.co-bxl (smtpauth1.co-bxl [10.2.0.15]) by wilbur.contactoffice.com (Postfix) with ESMTP id EAB2F7E0; Mon, 26 Sep 2022 00:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1664144246; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:Cc:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; l=10292; bh=eZppG0FuXqpRONpUpk1QKIw0HOUniX0QZ1CJQDMRITo=; b=Uw33p7Yc1x+TUzjOkg0+RAHIbFPr1mSb32N9r73uiWYSfY6DZqLJn7Rnj1BLmgBz Rs4Y1uUloM8c/L1193NUZY4lW9V0sjJc/ve6qCb8Kxxt2kcD649/Z1J6h0aFAHqxBm6 qY5eJJYnhgPnbUATFSrPUZ7Bi4/DGRd55UlSyf0v/47KE6X1evdFX2RH45T95aJT2/U fFfW/5HQoHzoJEi3/0pjOKuizWnoewFi/o99tvw9Utxjm7GN8b272ZB7iJ0uLhMue3a PQXCiCoadT4XUaFpLB7TKRBMZTjoJT+wRFVRbJTselAEbXHlML3PDhE3Odqx9a5ZQUQ r/bVmVSh2g== Received: by smtp.mailfence.com with ESMTPSA ; Mon, 26 Sep 2022 00:17:23 +0200 (CEST) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Mon, 26 Sep 2022 00:17:13 +0200 Message-Id: <20220925221713.2450-1-a@unstable.cc> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220918220618.31112-1-a@unstable.cc> References: MIME-Version: 1.0 X-Spam-Status: No, hits=-1.0 required=4.7 symbols=ALL_TRUSTED device=10.2.0.21 X-ContactOffice-Account: com:375058688 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: This patch is supposed to implement no function change. The only change in behaviour that can be observed is the IV_/UV_ variables being printed in different order compared to before applying this pat [...] Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.68 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 X-Headers-End: 1ocZwL-0005U3-3P Subject: [Openvpn-devel] [PATCH v5] push-peer-info: rearrange function generating peer info 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: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This patch is supposed to implement no function change. The only change in behaviour that can be observed is the IV_/UV_ variables being printed in different order compared to before applying this patch. However, order does not matter, so we don't need to retain it. What this change really does is rearranging the push_peer_info() function so that it becomes much more clear which variable is printed depending on the peer-info detail level. The original code was mixed up, and figuring the above out required reading this function multiple times. This rearrangement puts everything in a switch/case block with sorted peer-info details levels appearing one after the other. While at it, the for loop extracting the wanted env variables has been restructured a bit to avoid uber long conditions and extreme indentation. Signed-off-by: Antonio Quartulli --- NOTE: I tried to move this function to ssh_util.c to make it possible to unit-test it. However, it requires a bunch of headers which make the whole dependency chain explode..so I gave up. Changes from v4: * rebased on top of master (conflicted with "Implement AUTH_FAIL, TEMP message support") * remove curly brackets from "case 2" as not needed there. Chanegs from v3: * rebased on top of master (conflicted with "Implement exit notification via control channel") Changes from v2: * create helper function to push variable from env-set Changes from v1: * add spaces before case/default labels in switch block --- src/openvpn/ssl.c | 227 ++++++++++++++++++++++++++-------------------- 1 file changed, 129 insertions(+), 98 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 672cd9c8..5fc46605 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1910,6 +1910,44 @@ read_string_alloc(struct buffer *buf) return str; } +/** + * Searches the environment variables set for variables starting with the + * specified pattern. If found, the variable string (i.e. VAR=VALUE) is + * copied to the out buffer provided as argument + * + * @param out the output buffer where variables should be written to + * @param es the environment variables set to search + * @param pattern the pattern used to match variable names + */ +static void +push_peer_info_env_var(struct buffer *out, const struct env_set *es, const char *pattern) +{ + for (const struct env_item *e = es->list; e; e = e->next) + { + /* ensure we have a string */ + if (!e->string) + { + continue; + } + + /* ensure string will fit output buffer */ + if (!buf_safe(out, strlen(e->string) + 1)) + { + continue; + } + + /* don't accept any var except for those starting with the specified + * pattern + */ + if (strncmp(e->string, pattern, strlen(pattern)) != 0) + { + continue; + } + + buf_printf(out, "%s\n", e->string); + } +} + /** * Prepares the IV_ and UV_ variables that are part of the * exchange to signal the peer's capabilities. The amount @@ -1932,142 +1970,135 @@ push_peer_info(struct buffer *buf, struct tls_session *session) bool ret = false; struct buffer out = alloc_buf_gc(512 * 3, &gc); - if (session->opt->push_peer_info_detail > 1) + switch (session->opt->push_peer_info_detail) { - /* push version */ - buf_printf(&out, "IV_VER=%s\n", PACKAGE_VERSION); + case 3: + { + /* push mac addr */ + struct route_gateway_info rgi; + get_default_gateway(&rgi, session->opt->net_ctx); + if (rgi.flags & RGI_HWADDR_DEFINED) + { + buf_printf(&out, "IV_HWADDR=%s\n", format_hex_ex(rgi.hwaddr, 6, 0, 1, ":", &gc)); + } + buf_printf(&out, "IV_SSL=%s\n", get_ssl_library_version() ); +#if defined(_WIN32) + buf_printf(&out, "IV_PLAT_VER=%s\n", win32_version_string(&gc, false)); +#endif + + /* push env vars that begin with UV_, IV_PLAT_VER= */ + push_peer_info_env_var(&out, session->opt->es, "UV_"); + push_peer_info_env_var(&out, session->opt->es, "IV_PLAT_VER="); + } + + /* fall through */ + case 2: + /* push version */ + buf_printf(&out, "IV_VER=%s\n", PACKAGE_VERSION); - /* push platform */ + /* push platform */ #if defined(TARGET_LINUX) - buf_printf(&out, "IV_PLAT=linux\n"); + buf_printf(&out, "IV_PLAT=linux\n"); #elif defined(TARGET_SOLARIS) - buf_printf(&out, "IV_PLAT=solaris\n"); + buf_printf(&out, "IV_PLAT=solaris\n"); #elif defined(TARGET_OPENBSD) - buf_printf(&out, "IV_PLAT=openbsd\n"); + buf_printf(&out, "IV_PLAT=openbsd\n"); #elif defined(TARGET_DARWIN) - buf_printf(&out, "IV_PLAT=mac\n"); + buf_printf(&out, "IV_PLAT=mac\n"); #elif defined(TARGET_NETBSD) - buf_printf(&out, "IV_PLAT=netbsd\n"); + buf_printf(&out, "IV_PLAT=netbsd\n"); #elif defined(TARGET_FREEBSD) - buf_printf(&out, "IV_PLAT=freebsd\n"); + buf_printf(&out, "IV_PLAT=freebsd\n"); #elif defined(TARGET_ANDROID) - buf_printf(&out, "IV_PLAT=android\n"); + buf_printf(&out, "IV_PLAT=android\n"); #elif defined(_WIN32) - buf_printf(&out, "IV_PLAT=win\n"); + buf_printf(&out, "IV_PLAT=win\n"); #endif - /* Announce that we do not require strict sequence numbers with - * TCP. (TCP non-linear) */ - buf_printf(&out, "IV_TCPNL=1\n"); - } - /* These are the IV variable that are sent to peers in p2p mode */ - if (session->opt->push_peer_info_detail > 0) - { - /* support for P_DATA_V2 */ - int iv_proto = IV_PROTO_DATA_V2; + /* Announce that we do not require strict sequence numbers with + * TCP. (TCP non-linear) */ + buf_printf(&out, "IV_TCPNL=1\n"); - /* support for the --dns option */ - iv_proto |= IV_PROTO_DNS_OPTION; + /* push compression status */ +#ifdef USE_COMP + comp_generate_peer_info_string(&session->opt->comp_options, &out); +#endif - /* support for exit notify via control channel */ - iv_proto |= IV_PROTO_CC_EXIT_NOTIFY; + /* push env vars that begin with IV_GUI_VER= and IV_SSO= */ + push_peer_info_env_var(&out, session->opt->es, "IV_GUI_VER="); + push_peer_info_env_var(&out, session->opt->es, "IV_SSO="); - if (session->opt->pull) + /* fall through */ + case 1: { - /* support for receiving push_reply before sending - * push request, also signal that the client wants - * to get push-reply messages without requiring a round - * trip for a push request message*/ - iv_proto |= IV_PROTO_REQUEST_PUSH; + /* support for P_DATA_V2 */ + int iv_proto = IV_PROTO_DATA_V2; - /* Support keywords in the AUTH_PENDING control message */ - iv_proto |= IV_PROTO_AUTH_PENDING_KW; + /* support for the --dns option */ + iv_proto |= IV_PROTO_DNS_OPTION; - /* support for AUTH_FAIL,TEMP control message */ - iv_proto |= IV_PROTO_AUTH_FAIL_TEMP; - } + /* support for exit notify via control channel */ + iv_proto |= IV_PROTO_CC_EXIT_NOTIFY; - /* support for Negotiable Crypto Parameters */ - if (session->opt->mode == MODE_SERVER || session->opt->pull) - { - if (tls_item_in_cipher_list("AES-128-GCM", session->opt->config_ncp_ciphers) - && tls_item_in_cipher_list("AES-256-GCM", session->opt->config_ncp_ciphers)) + if (session->opt->pull) { + /* support for receiving push_reply before sending + * push request, also signal that the client wants + * to get push-reply messages without requiring a round + * trip for a push request message*/ + iv_proto |= IV_PROTO_REQUEST_PUSH; + + /* Support keywords in the AUTH_PENDING control message */ + iv_proto |= IV_PROTO_AUTH_PENDING_KW; - buf_printf(&out, "IV_NCP=2\n"); + /* support for AUTH_FAIL,TEMP control message */ + iv_proto |= IV_PROTO_AUTH_FAIL_TEMP; } - } - else - { - /* We are not using pull or p2mp server, instead do P2P NCP */ - iv_proto |= IV_PROTO_NCP_P2P; - } - buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); + /* support for Negotiable Crypto Parameters */ + if (session->opt->mode == MODE_SERVER || session->opt->pull) + { + if (tls_item_in_cipher_list("AES-128-GCM", session->opt->config_ncp_ciphers) + && tls_item_in_cipher_list("AES-256-GCM", session->opt->config_ncp_ciphers)) + { + + buf_printf(&out, "IV_NCP=2\n"); + } + } + else + { + /* We are not using pull or p2mp server, instead do P2P NCP */ + iv_proto |= IV_PROTO_NCP_P2P; + } #ifdef HAVE_EXPORT_KEYING_MATERIAL - iv_proto |= IV_PROTO_TLS_KEY_EXPORT; + iv_proto |= IV_PROTO_TLS_KEY_EXPORT; #endif - buf_printf(&out, "IV_PROTO=%d\n", iv_proto); + buf_printf(&out, "IV_PROTO=%d\n", iv_proto); - if (session->opt->push_peer_info_detail > 1) - { - /* push compression status */ -#ifdef USE_COMP - comp_generate_peer_info_string(&session->opt->comp_options, &out); -#endif - } + buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); - if (session->opt->push_peer_info_detail > 2) - { - /* push mac addr */ - struct route_gateway_info rgi; - get_default_gateway(&rgi, session->opt->net_ctx); - if (rgi.flags & RGI_HWADDR_DEFINED) + if (!write_string(buf, BSTR(&out), -1)) { - buf_printf(&out, "IV_HWADDR=%s\n", format_hex_ex(rgi.hwaddr, 6, 0, 1, ":", &gc)); + goto error; } - buf_printf(&out, "IV_SSL=%s\n", get_ssl_library_version() ); -#if defined(_WIN32) - buf_printf(&out, "IV_PLAT_VER=%s\n", win32_version_string(&gc, false)); -#endif + break; } - if (session->opt->push_peer_info_detail > 1) - { - struct env_set *es = session->opt->es; - /* push env vars that begin with UV_, IV_PLAT_VER and IV_GUI_VER */ - for (struct env_item *e = es->list; e != NULL; e = e->next) + case 0: + if (!write_empty_string(buf)) { - if (e->string) - { - if ((((strncmp(e->string, "UV_", 3) == 0 - || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=") - 1) == 0) - && session->opt->push_peer_info_detail > 2) - || (strncmp(e->string, "IV_GUI_VER=", sizeof("IV_GUI_VER=") - 1) == 0) - || (strncmp(e->string, "IV_SSO=", sizeof("IV_SSO=") - 1) == 0) - ) - && buf_safe(&out, strlen(e->string) + 1)) - { - buf_printf(&out, "%s\n", e->string); - } - } + goto error; } - } + break; - if (!write_string(buf, BSTR(&out), -1)) - { - goto error; - } - } - else - { - if (!write_empty_string(buf)) /* no peer info */ - { + /* invalid value configured */ + default: + msg(M_WARN, "Invalid peer-info-detail level %d", session->opt->push_peer_info_detail); goto error; - } } + ret = true; error: