From patchwork Sun Mar 29 09:32:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1056 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id SDzDHEIGgV7RFgAAIUCqbw for ; Sun, 29 Mar 2020 16:34:10 -0400 Received: from proxy19.mail.iad3b.rsapps.net ([172.31.255.6]) by director8.mail.ord1d.rsapps.net with LMTP id GK1/GkIGgV4pMQAAfY0hYg ; Sun, 29 Mar 2020 16:34:10 -0400 Received: from smtp23.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3b.rsapps.net with LMTP id wKxaFUIGgV6kHgAAIG4riQ ; Sun, 29 Mar 2020 16:34:10 -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: smtp23.gate.iad3b.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: a45f7efa-71fc-11ea-bb4f-525400aa5716-1-1 Received: from [216.105.38.7] ([216.105.38.7:36106] helo=lists.sourceforge.net) by smtp23.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/82-26570-146018E5; Sun, 29 Mar 2020 16:34:10 -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.90_1) (envelope-from ) id 1jIecH-0006a2-4E; Sun, 29 Mar 2020 20:33:09 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jIecF-0006Zu-2D for openvpn-devel@lists.sourceforge.net; Sun, 29 Mar 2020 20:33:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: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=naRR7Cg5QMzalseeNqCn6vcM341tm9/oodc51RtBQpE=; b=EvkWFVF7YFzw1QBx9NRuqS9lQa P821AByEFZcrcoqpm3uEuaTev0ME8tEDhZFL7v8u20HKtNunllIrsdtGXsmNYGsBmXRn+D+QCnabA y1x4z5LAmq1dwkLQkDEbtwcilAgcRPVb6p9pfyddJbubmRrdsmGMer3PSGji9dE2RKHo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding: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=naRR7Cg5QMzalseeNqCn6vcM341tm9/oodc51RtBQpE=; b=TvI5cW/BhPyfo2uWPTh+epUIvZ NcTCMpzevVGKhtNfvJ1XRIAvg9ZB61QTbdIYYiEiVyCvl3LKoeCdavbxaTl69GaNAzKwXI4uoFIip WAwJ9VyC4p5WpyysSOJ7Gc16IRD0OSnAlGdGAartgXA8As95it+dp5gPKyJEFDVwpLcM=; Received: from mail-qk1-f196.google.com ([209.85.222.196]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jIecD-00EazB-PR for openvpn-devel@lists.sourceforge.net; Sun, 29 Mar 2020 20:33:07 +0000 Received: by mail-qk1-f196.google.com with SMTP id v7so16981394qkc.0 for ; Sun, 29 Mar 2020 13:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=naRR7Cg5QMzalseeNqCn6vcM341tm9/oodc51RtBQpE=; b=jxAzy1hmZkTuretCzOKBh7cdTyPb20TxLa4vx3BoCDG0HZYJmhwWi7yYip1glqETrv MyzF0FD4cBFtyiSe9WN7Qmg6ky7DSDlaXoa6FaFEEJmzhL1WLkWh4An4ZcikWUqB4NVx Gtqrf7gu+67o6wf49WqUd7Re4uFEkSGwbw93XZUWbLjdHr7BvwRnieCup6LY/sr19mRZ rLhNju+fvCKG+tA20V0uDYo1iDIFWruV967SuNdv7XTffEBmrzwc3lxxYu4f2bLG4M8n X841BEms9uFNk2E6+KRbcIl9lVctL8HpfoqrEu2qiQbCtuGYD2Ha7ZDB/d1/MKB3DJ0V eAvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=naRR7Cg5QMzalseeNqCn6vcM341tm9/oodc51RtBQpE=; b=gphaFwLFVNYCdiSjIVCvDE1Fc/kpVPfobWJxZgNmoAXwThvnrELlE/oiMLx5XB55CF 9+pD7W3RrnEx8Dy6aGT1DB2uiTEAjKtHjd2TV/uRwqJRGbpieAn7+o4CPHRzAGGCWdt/ IUq3iXLoZ/USHb17GxjdiyDkGARDCnS3gXBU2gPYAcsKlF0Nbjg6eMSox06AU3KNKhcL rRrtHURa9t6i06CEC7qZ4Zlq6Mew4z8t5RGi8bza9cBTwNgeGFfBdJUh1TUWrdlAsSrH zbfZbQ41sJ1gmUSZFs1pWLMF5m1B0Z8k2LXqxuSoW7EpMAJPfresne1jnV8mznvCIThV +iIg== X-Gm-Message-State: ANhLgQ21mWRp5c8hCQG84G4UhDyAJBONwA7Fz7g/H4nESrktWT/Y8S1S fDegkA0MDJasvhKnsx0sfA2WEqNOrvE= X-Google-Smtp-Source: ADFU+vtA2jrLXadpLl6NnEFhH/tYbJJ8yWmalP/Xk6uv0L2v4Gaz5sM/V7cPj/4d8O2dmkwxo/JFOA== X-Received: by 2002:a05:620a:1275:: with SMTP id b21mr5922714qkl.198.1585513978444; Sun, 29 Mar 2020 13:32:58 -0700 (PDT) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.216.21]) by smtp.gmail.com with ESMTPSA id f19sm8989794qtq.78.2020.03.29.13.32.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Mar 2020 13:32:57 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sun, 29 Mar 2020 16:32:49 -0400 Message-Id: <1585513970-32658-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.196 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.196 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1jIecD-00EazB-PR Subject: [Openvpn-devel] [PATCH 1/2] Move querying username/password from management to a function 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 From: Selva Nair This helps the next patch. No functionality changes, only refactoring. Signed-off-by: Selva Nair --- src/openvpn/misc.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index 1931149..0d5ac30 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -116,6 +116,38 @@ hostname_randomize(const char *hostname, struct gc_arena *gc) #undef n_rnd_bytes } +#ifdef ENABLE_MANAGEMENT +/* Get username/password from the management interface */ +static bool +auth_user_pass_mgmt(struct user_pass *up, const char *prefix, const unsigned int flags, + const char *auth_challenge) +{ + const char *sc = NULL; + + if (flags & GET_USER_PASS_PREVIOUS_CREDS_FAILED) + { + management_auth_failure(management, prefix, "previous auth credentials failed"); + } + + if (auth_challenge && (flags & GET_USER_PASS_STATIC_CHALLENGE)) + { + sc = auth_challenge; + } + if (!management_query_user_pass(management, up, prefix, flags, sc)) + { + if ((flags & GET_USER_PASS_NOFATAL) != 0) + { + return false; + } + else + { + msg(M_FATAL, "ERROR: could not read %s username/password/ok/string from management interface", prefix); + } + } + return true; +} +#endif + /* * Get and store a username/password */ @@ -149,28 +181,10 @@ get_user_pass_cr(struct user_pass *up, && (!from_authfile && (flags & GET_USER_PASS_MANAGEMENT)) && management_query_user_pass_enabled(management)) { - const char *sc = NULL; response_from_stdin = false; - - if (flags & GET_USER_PASS_PREVIOUS_CREDS_FAILED) + if (!auth_user_pass_mgmt(up, prefix, flags, auth_challenge)) { - management_auth_failure(management, prefix, "previous auth credentials failed"); - } - - if (auth_challenge && (flags & GET_USER_PASS_STATIC_CHALLENGE)) - { - sc = auth_challenge; - } - if (!management_query_user_pass(management, up, prefix, flags, sc)) - { - if ((flags & GET_USER_PASS_NOFATAL) != 0) - { - return false; - } - else - { - msg(M_FATAL, "ERROR: could not read %s username/password/ok/string from management interface", prefix); - } + return false; } } else