From patchwork Thu Jul 22 06:24:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1887 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wAEtAgac+WC3XwAAIUCqbw (envelope-from ) for ; Thu, 22 Jul 2021 12:25:42 -0400 Received: from proxy4.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id gBzQAQac+WBFegAAalYnBA (envelope-from ) for ; Thu, 22 Jul 2021 12:25:42 -0400 Received: from smtp36.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1d.rsapps.net with LMTPS id kFGkAQac+WBoRgAAiYrejw (envelope-from ) for ; Thu, 22 Jul 2021 12:25:42 -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: smtp36.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: 74832e20-eb09-11eb-a27d-525400c11307-1-1 Received: from [216.105.38.7] ([216.105.38.7:58256] helo=lists.sourceforge.net) by smtp36.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A0/6C-27054-50C99F06; Thu, 22 Jul 2021 12:25:41 -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 1m6bUs-0008GM-Vr; Thu, 22 Jul 2021 16:24:30 +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 1m6bUs-0008GF-CR for openvpn-devel@lists.sourceforge.net; Thu, 22 Jul 2021 16:24:30 +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:To:From:Sender:Reply-To:Cc: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=5nB5k4Sgb9ONCaFzbOnmwlFQyygvYQe5sgJl7ts5bwc=; b=aCL1VNq+K+myPEcWC/NRFEB6Rf QJK7lJ5VYEdfhvfZExKnffQpg0oo7UQuXmEhaSeTyYtqxXOaZYRdj0Y+EXTHlVafe7DWA7aTs1My2 OBIuwRLkD3WmFB5PvWekz4H9CBi0Z8MXuBDwkImpsBnEPCtNP3DWqIYmO0jSicSVPJgE=; 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:To:From: Sender:Reply-To:Cc: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=5nB5k4Sgb9ONCaFzbOnmwlFQyygvYQe5sgJl7ts5bwc=; b=U XkDZ1PTtYx78/dejRUK44G+ShletrSUl7sx8yIOwFWJCS+cesSaXXdZhO0zrSe7QnoyJXnXZ904eP ur+x5o6w+HfcuFE0rgZ10czgpimavRort2wlBFZuLbPwtWkDY+m7kU80CkxDO14qvp5vHJKh1j1g7 dEel2+e3O7wkx4+c=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1m6bUk-00GzvO-1i for openvpn-devel@lists.sourceforge.net; Thu, 22 Jul 2021 16:24:30 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1m6bUW-0000NP-U5 for openvpn-devel@lists.sourceforge.net; Thu, 22 Jul 2021 18:24:08 +0200 Received: (nullmailer pid 231311 invoked by uid 10006); Thu, 22 Jul 2021 16:24:09 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 22 Jul 2021 18:24:09 +0200 Message-Id: <20210722162409.231265-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: 1m6bUk-00GzvO-1i Subject: [Openvpn-devel] [PATCH] Fix OpenVPN querying user/password if auth-token with user expires 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 The problematic behaviour happens when start a profile without auth-user-pass and connect to a server that pushes auth-token When the auth token expires OpenVPN asks for auth User and password again. The problem is that the auth_user_pass_setup sets auth_user_pass_enabled = true; This function is called from two places. In ssl.c it is only called with an auth-token present or that variable already set. The other one is init_query_passwords. Move setting auth_user_pass_enabled to the second place to ensure it is only set if we really want passwords. --- src/openvpn/init.c | 2 ++ src/openvpn/ssl.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index a1401e805..f9083e69c 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -595,6 +595,7 @@ init_query_passwords(const struct context *c) /* Auth user/pass input */ if (c->options.auth_user_pass_file) { + auth_user_pass_enabled = true; #ifdef ENABLE_MANAGEMENT auth_user_pass_setup(c->options.auth_user_pass_file, &c->options.sc_info); #else @@ -3116,6 +3117,7 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.auth_token_generate = options->auth_token_generate; to.auth_token_lifetime = options->auth_token_lifetime; to.auth_token_call_auth = options->auth_token_call_auth; + to.auth_token_user_common_name = options->auth_token_user_common_name; to.auth_token_key = c->c1.ks.auth_token_key; to.x509_track = options->x509_track; diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index aa8cb3b27..c2dc36019 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -396,7 +396,6 @@ static char *auth_challenge; /* GLOBAL */ void auth_user_pass_setup(const char *auth_file, const struct static_challenge_info *sci) { - auth_user_pass_enabled = true; if (!auth_user_pass.defined && !auth_token.defined) { #ifdef ENABLE_MANAGEMENT