From patchwork Wed Mar 17 02:03:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1618 X-Patchwork-Delegate: gert@greenie.muc.de Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id gFKJNWn+UWCYZwAAIUCqbw (envelope-from ) for ; Wed, 17 Mar 2021 09:04:41 -0400 Received: from proxy12.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id MOVQNWn+UWCkBQAAIasKDg (envelope-from ) for ; Wed, 17 Mar 2021 09:04:41 -0400 Received: from smtp9.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.ord1d.rsapps.net with LMTPS id YLAZNWn+UWBoYQAA7PHxkg (envelope-from ) for ; Wed, 17 Mar 2021 09:04:41 -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: smtp9.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: 555119be-8721-11eb-b2c6-525400bd3b1f-1-1 Received: from [216.105.38.7] ([216.105.38.7:47480] helo=lists.sourceforge.net) by smtp9.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3F/BA-05275-86EF1506; Wed, 17 Mar 2021 09:04:40 -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 1lMVpp-0005Ne-47; Wed, 17 Mar 2021 13:03:37 +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 1lMVpi-0005Mr-WE for openvpn-devel@lists.sourceforge.net; Wed, 17 Mar 2021 13:03:31 +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=9oE7HZtkk3H3VNL8Q4CxvDC1pfFWjk1OdMVzYn1MQTI=; b=mhf8VRb26+9m27PGNo2zgzgci0 Mhj36XJoqsfKgh0k0GYo2ZvMrnS7Z1ogVwgdljwfdtBy82aHj+AQ65ZCC/FRHCu5MhELJVnR60tg1 ASbpkKb+Fl9r2Tx3254IflnJK94KO6VLE9omjNLDX1oAeAYH5eC1Iyo8jfD9tMN0TCBE=; 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=9oE7HZtkk3H3VNL8Q4CxvDC1pfFWjk1OdMVzYn1MQTI=; b=hKhhqUizw1w83N3hQxQXFMA0b4 +eIXjHZIOTD80CVmSF8YYexdZscHjdVbywMvqGx2TcTMm+hVBT9pXq+JSJ7OnQr0FM5r5G3wL1H4F qzegcLZNKIyw2c3KSbhGZ4TLjKaVLzbqS/+VulCK4AJS/LYI7CNItpvVdUz5NU8G+EPo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lMVpd-0004O0-95 for openvpn-devel@lists.sourceforge.net; Wed, 17 Mar 2021 13:03:30 +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 1lMVpQ-000FwF-P5 for openvpn-devel@lists.sourceforge.net; Wed, 17 Mar 2021 14:03:12 +0100 Received: (nullmailer pid 8634 invoked by uid 10006); Wed, 17 Mar 2021 13:03:12 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 17 Mar 2021 14:03:11 +0100 Message-Id: <20210317130312.8585-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210310154754.GH976@greenie.muc.de> References: <20210310154754.GH976@greenie.muc.de> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 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 X-Headers-End: 1lMVpd-0004O0-95 Subject: [Openvpn-devel] [PATCH v5 1/2] Move auth deferred related members into its own struct 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 structures the code a bit nicer and also prepares for deferred scripts that needs their own set of files. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/ssl.c | 4 +-- src/openvpn/ssl_common.h | 12 ++++++-- src/openvpn/ssl_verify.c | 63 ++++++++++++++++++++-------------------- src/openvpn/ssl_verify.h | 7 +++-- 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 893e5753..b6c553be 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -992,9 +992,7 @@ key_state_free(struct key_state *ks, bool clear) packet_id_free(&ks->crypto_options.packet_id); -#ifdef PLUGIN_DEF_AUTH - key_state_rm_auth_control_files(ks); -#endif + key_state_rm_auth_control_files(&ks->plugin_auth); if (clear) { diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 2e3c98db..0773376e 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -145,6 +145,13 @@ enum ks_auth_state { */ }; +struct auth_deferred_status +{ + char *auth_control_file; + char *auth_pending_file; + unsigned int auth_control_status; +}; + /** * Security parameter state of one TLS and data channel %key session. * @ingroup control_processor @@ -212,10 +219,9 @@ struct key_state unsigned int mda_key_id; unsigned int mda_status; #endif - unsigned int auth_control_status; time_t acf_last_mod; - char *auth_control_file; - char *auth_pending_file; + + struct auth_deferred_status plugin_auth; }; /** Control channel wrapping (--tls-auth/--tls-crypt) context */ diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 4b120f7b..c9983d66 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -870,13 +870,13 @@ man_def_auth_test(const struct key_state *ks) * and key_state structure */ static void -key_state_rm_auth_pending_file(struct key_state *ks) +key_state_rm_auth_pending_file(struct auth_deferred_status *ads) { - if (ks && ks->auth_pending_file) + if (ads && ads->auth_pending_file) { - platform_unlink(ks->auth_pending_file); - free(ks->auth_pending_file); - ks->auth_pending_file = NULL; + platform_unlink(ads->auth_pending_file); + free(ads->auth_pending_file); + ads->auth_pending_file = NULL; } } @@ -921,13 +921,13 @@ check_auth_pending_method(const char *peer_info, const char *method) * @returns false The file had an invlaid format or another error occured */ static bool -key_state_check_auth_pending_file(struct key_state *ks, +key_state_check_auth_pending_file(struct auth_deferred_status *ads, struct tls_multi *multi) { bool ret = true; - if (ks && ks->auth_pending_file) + if (ads->auth_pending_file) { - struct buffer_list *lines = buffer_list_file(ks->auth_pending_file, + struct buffer_list *lines = buffer_list_file(ads->auth_pending_file, 1024); if (lines && lines->head) { @@ -977,7 +977,7 @@ key_state_check_auth_pending_file(struct key_state *ks, buffer_list_free(lines); } - key_state_rm_auth_pending_file(ks); + key_state_rm_auth_pending_file(ads); return ret; } @@ -987,15 +987,15 @@ key_state_check_auth_pending_file(struct key_state *ks, * and key_state structure */ void -key_state_rm_auth_control_files(struct key_state *ks) +key_state_rm_auth_control_files(struct auth_deferred_status *ads) { - if (ks && ks->auth_control_file) + if (ads->auth_control_file) { - platform_unlink(ks->auth_control_file); - free(ks->auth_control_file); - ks->auth_control_file = NULL; + platform_unlink(ads->auth_control_file); + free(ads->auth_control_file); + ads->auth_control_file = NULL; } - key_state_rm_auth_pending_file(ks); + key_state_rm_auth_pending_file(ads); } /** @@ -1005,20 +1005,21 @@ key_state_rm_auth_control_files(struct key_state *ks) * @return true if file creation was successful */ static bool -key_state_gen_auth_control_files(struct key_state *ks, const struct tls_options *opt) +key_state_gen_auth_control_files(struct auth_deferred_status *ads, + const struct tls_options *opt) { struct gc_arena gc = gc_new(); - key_state_rm_auth_control_files(ks); + key_state_rm_auth_control_files(ads); const char *acf = platform_create_temp_file(opt->tmp_dir, "acf", &gc); const char *apf = platform_create_temp_file(opt->tmp_dir, "apf", &gc); if (acf && apf) { - ks->auth_control_file = string_alloc(acf, NULL); - ks->auth_pending_file = string_alloc(apf, NULL); - setenv_str(opt->es, "auth_control_file", ks->auth_control_file); - setenv_str(opt->es, "auth_pending_file", ks->auth_pending_file); + ads->auth_control_file = string_alloc(acf, NULL); + ads->auth_pending_file = string_alloc(apf, NULL); + setenv_str(opt->es, "auth_control_file", ads->auth_control_file); + setenv_str(opt->es, "auth_pending_file", ads->auth_pending_file); } gc_free(&gc); @@ -1026,14 +1027,14 @@ key_state_gen_auth_control_files(struct key_state *ks, const struct tls_options } static unsigned int -key_state_test_auth_control_file(struct key_state *ks) +key_state_test_auth_control_file(struct auth_deferred_status *ads) { - if (ks && ks->auth_control_file) + if (ads->auth_control_file) { - unsigned int ret = ks->auth_control_status; + unsigned int ret = ads->auth_control_status; if (ret == ACF_UNDEFINED) { - FILE *fp = fopen(ks->auth_control_file, "r"); + FILE *fp = fopen(ads->auth_control_file, "r"); if (fp) { const int c = fgetc(fp); @@ -1046,7 +1047,7 @@ key_state_test_auth_control_file(struct key_state *ks) ret = ACF_FAILED; } fclose(fp); - ks->auth_control_status = ret; + ads->auth_control_status = ret; } } return ret; @@ -1088,7 +1089,7 @@ tls_authentication_status(struct tls_multi *multi, const int latency) { unsigned int s1 = ACF_DISABLED; unsigned int s2 = ACF_DISABLED; - s1 = key_state_test_auth_control_file(ks); + s1 = key_state_test_auth_control_file(&ks->plugin_auth); #ifdef ENABLE_MANAGEMENT s2 = man_def_auth_test(ks); #endif @@ -1267,7 +1268,7 @@ verify_user_pass_plugin(struct tls_session *session, struct tls_multi *multi, setenv_str(session->opt->es, "password", up->password); /* generate filename for deferred auth control file */ - if (!key_state_gen_auth_control_files(ks, session->opt)) + if (!key_state_gen_auth_control_files(&ks->plugin_auth, session->opt)) { msg(D_TLS_ERRORS, "TLS Auth Error (%s): " "could not create deferred auth control file", __func__); @@ -1281,16 +1282,16 @@ verify_user_pass_plugin(struct tls_session *session, struct tls_multi *multi, { /* Check if the plugin has written the pending auth control * file and send the pending auth to the client */ - if(!key_state_check_auth_pending_file(ks, multi)) + if(!key_state_check_auth_pending_file(&ks->plugin_auth, multi)) { retval = OPENVPN_PLUGIN_FUNC_ERROR; - key_state_rm_auth_control_files(ks); + key_state_rm_auth_control_files(&ks->plugin_auth); } } else { /* purge auth control filename (and file itself) for non-deferred returns */ - key_state_rm_auth_control_files(ks); + key_state_rm_auth_control_files(&ks->plugin_auth); } setenv_del(session->opt->es, "password"); diff --git a/src/openvpn/ssl_verify.h b/src/openvpn/ssl_verify.h index 0221e81f..874d2dcb 100644 --- a/src/openvpn/ssl_verify.h +++ b/src/openvpn/ssl_verify.h @@ -113,11 +113,12 @@ tls_authentication_status(struct tls_multi *multi, const int latency); #define TLS_AUTHENTICATED(multi, ks) ((ks)->state >= (S_GOT_KEY - (multi)->opt.server)) /** - * Remove the given key state's auth control file, if it exists. + * Remove the given key state's auth deferred status auth control file, + * if it exists. * - * @param ks The key state the remove the file for + * @param ads The key state the remove the file for */ -void key_state_rm_auth_control_files(struct key_state *ks); +void key_state_rm_auth_control_files(struct auth_deferred_status *ads); /** * Frees the given set of certificate hashes.