From patchwork Thu Jul 22 23:43:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1888 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 uNLOKJmP+mChYAAAIUCqbw (envelope-from ) for ; Fri, 23 Jul 2021 05:44:57 -0400 Received: from proxy11.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id yOqSKJmP+mCGDAAAalYnBA (envelope-from ) for ; Fri, 23 Jul 2021 05:44:57 -0400 Received: from smtp40.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.ord1d.rsapps.net with LMTPS id ID2OD4uP+mDKJAAAgKDEHA (envelope-from ) for ; Fri, 23 Jul 2021 05:44:43 -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: smtp40.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: a2faf134-eb9a-11eb-91e9-525400f204c2-1-1 Received: from [216.105.38.7] ([216.105.38.7:50352] helo=lists.sourceforge.net) by smtp40.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E1/9E-27814-89F8AF06; Fri, 23 Jul 2021 05:44:56 -0400 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.90_1) (envelope-from ) id 1m6rj7-0001Va-DO; Fri, 23 Jul 2021 09:44:17 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6rj5-0001VF-W9 for openvpn-devel@lists.sourceforge.net; Fri, 23 Jul 2021 09:44:16 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kN9waHQZ3oiKEWauPY/agynYP34XXWuJxy6ldwsXSVs=; b=D+nebwIT4PxFZ6x66tUZCzdtQg P8AZgo1ymDFjBTcheL/cSEKpPARbEK4qhl9J4YOzSNK/l6miN3mNXBFxkIsIWzlWTQV0PkngleJ9A WPW+4cB+5qL+Eodl34LHWxEyWQD6mb+A1XGS8d3kAw/0Vh+LCaqxv4WZp5luLc4q7HuI=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kN9waHQZ3oiKEWauPY/agynYP34XXWuJxy6ldwsXSVs=; b=l+YzPwd/cUsPng8Ge1lWAuiw1v I4BgCFJ7gvFnIe3mxV9XaDyyVh1Uzf5YYDVV4Uew4QtOvZQypy4zw1T/o4HwcAIySRezc4XSpeoc3 uZOiatHhh2iSXC542B4iaiNp6uQSJezQfJogTbwo2z4orz9Zh+4ZaYeWW8QvZWVKdW5w=; 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 1m6rix-0007nz-2N for openvpn-devel@lists.sourceforge.net; Fri, 23 Jul 2021 09:44:15 +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 1m6rip-0003If-7A for openvpn-devel@lists.sourceforge.net; Fri, 23 Jul 2021 11:43:59 +0200 Received: (nullmailer pid 282051 invoked by uid 10006); Fri, 23 Jul 2021 09:43:59 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 23 Jul 2021 11:43:59 +0200 Message-Id: <20210723094359.282005-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210722162409.231265-1-arne@rfc2549.org> References: <20210722162409.231265-1-arne@rfc2549.org> MIME-Version: 1.0 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: 1m6rix-0007nz-2N Subject: [Openvpn-devel] [PATCH v2] 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. Patch V2: Remove unrelated code change Signed-off-by: Arne Schwabe --- src/openvpn/init.c | 1 + src/openvpn/ssl.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index a1401e805..d5d192663 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 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