From patchwork Fri Apr 3 14:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1074 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id 8BXPAqXgh16bSwAAIUCqbw for ; Fri, 03 Apr 2020 21:19:33 -0400 Received: from proxy8.mail.ord1c.rsapps.net ([172.28.255.1]) by director11.mail.ord1d.rsapps.net with LMTP id mMatAqXgh15mEQAAvGGmqA ; Fri, 03 Apr 2020 21:19:33 -0400 Received: from smtp24.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1c.rsapps.net with LMTP id QNF9AqXgh14NDAAAHz/atg ; Fri, 03 Apr 2020 21:19:33 -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: smtp24.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 569ca034-7612-11ea-a275-b8ca3a674470-1-1 Received: from [216.105.38.7] ([216.105.38.7:53210] helo=lists.sourceforge.net) by smtp24.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id EF/37-22545-4A0E78E5; Fri, 03 Apr 2020 21:19:32 -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 1jKXS4-0004iU-Vk; Sat, 04 Apr 2020 01:18:24 +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 1jKXS0-0004iC-2R for openvpn-devel@lists.sourceforge.net; Sat, 04 Apr 2020 01:18:20 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kGHUYEO2Vr/B0G+E0bMX+lcI52XwNe7C91/dY5BHV9o=; b=Vf5wLF/sP+0ilxBXCThel2YSB2 rMpMG69qvhp0qQetg6dkYnFsALFypYbGRDoRvcj26L0IJPUeEeiCngK4LzU5P+oESFI8giOxq7DPm vM+LRVhVVNaQKNx52vEhOCVPjJ+sMc/LSU86Am/F/oQ9KZPyZQSA7kry8r6SnYHuxZpI=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kGHUYEO2Vr/B0G+E0bMX+lcI52XwNe7C91/dY5BHV9o=; b=IxjcLULUXKUAPRU7nC9fL8l/eN QH23pYjlWyz9iwnILe136q+n9xFJf0cA4zvzIONVqw7yelKHOgstKm4h0fyJURdQu+2Y/XEur6GEA eDA/D1HDrIKaFF3HSrz9IYiF0l4YC1Z+vEZb590ukd5GS6/yoHxPwYSfgFJFjrvebOKU=; Received: from mail-qv1-f67.google.com ([209.85.219.67]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jKXRr-0016cs-K7 for openvpn-devel@lists.sourceforge.net; Sat, 04 Apr 2020 01:18:20 +0000 Received: by mail-qv1-f67.google.com with SMTP id n1so4619853qvz.4 for ; Fri, 03 Apr 2020 18:18:11 -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:in-reply-to:references; bh=kGHUYEO2Vr/B0G+E0bMX+lcI52XwNe7C91/dY5BHV9o=; b=n84Qy2lRePfaqr2p7gicdZrpzrWTr025wwBuoRaqx5xEEfQcgvA4a9+sTNVdBmsh2t 6LdzWfucQY0ldI6Pr9eaAhywjQVpuK+hJDasjrjHmlMOzbtnjEzKySoiV88jZriluSMg 7/4IhhO1lNmvaxY4aHBRcJugrQYbEYMSl/pDdyQbyvxHxnpoye0kA6IWMT+Zo00itOtO CczkM3PUKTVDR0Zpf69q7Toiv98u5z41Zi0U0SmXc57sksqoJC7mprMRtOyaAz5Jl+pt VxbdLFd5FU1JCeAqOqbLQ6qNWM6JDauI3lF7WpKNr41KjUM3uqzYbOgT+29j1GZQ5gIZ raJg== 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:in-reply-to :references; bh=kGHUYEO2Vr/B0G+E0bMX+lcI52XwNe7C91/dY5BHV9o=; b=U4Kov3f13M0ig0O0VP8dxTdLIxCHVY2zOW6Waeb3JT7H1NfeZZcsj1TRN7KDtuTUVm 9ifurElSeSWf/Fgnuy+PA/tjfr5MK7CbjvfArf9MYWB4n5GnRGkDdwm+kI81vmfkxRUD anaNp1l5xWL4eLGOHeDI2D36ih8AoVutIANEAjSIfIYR2bjahIzHKG7ZruQAGokoewmH ho3m4/aefZcm7yQT+oBFBbWHTmYCi3/8qGFNSSjdr+I/gXkmeW/FOxe365rXjBvfBGnG L5QkJipgJVAzpQOaZUspCHXFXvxauhFcexPyvkXlvrRWv40TEfvjOgi6kUKWGpEWYvLD NZ0Q== X-Gm-Message-State: AGi0Pub3nV+tvvRQnqwwO6PaJrVeX7GheB1rNHjbY4IRACF1p6PyIQvC 1iSM2LXfJe04gBaDPbiCosZlLh1INt8= X-Google-Smtp-Source: APiQypJW/STZI735WYJyDJ6WDgrtH50Y9S7WZXCPzUVBCz1UAgH02KgI+PnBTYcpo6tjfsS7xeZ6Ag== X-Received: by 2002:ad4:4182:: with SMTP id e2mr10773042qvp.247.1585963085237; Fri, 03 Apr 2020 18:18:05 -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 j2sm1370970qth.57.2020.04.03.18.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Apr 2020 18:18:04 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Apr 2020 21:17:43 -0400 Message-Id: <1585963064-10311-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1585591527-23734-1-git-send-email-selva.nair@gmail.com> References: <1585591527-23734-1-git-send-email-selva.nair@gmail.com> 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.219.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.219.67 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 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jKXRr-0016cs-K7 Subject: [Openvpn-devel] [PATCH for-2.4 1/2] Move querying username/password from management interface 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. Same as commit 461e566fb274d6f7647dc3aa81c02e4fbf362a23 in master except for additional ifdef ENABLE_CLIENT_CR Signed-off-by: Selva Nair Acked-by: Gert Doering Acked-by: Gert Doering --- src/openvpn/misc.c | 61 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index f44c65f..2b0d10c 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -880,6 +880,43 @@ absolute_pathname(const char *pathname) } } +#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"); + } + +#ifdef ENABLE_CLIENT_CR + if (auth_challenge && (flags & GET_USER_PASS_STATIC_CHALLENGE)) + { + sc = auth_challenge; + } +#endif + + 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 /* ifdef ENABLE_MANAGEMENT */ + /* * Get and store a username/password */ @@ -913,30 +950,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) - { - management_auth_failure(management, prefix, "previous auth credentials failed"); - } - -#ifdef ENABLE_CLIENT_CR - if (auth_challenge && (flags & GET_USER_PASS_STATIC_CHALLENGE)) + if (!auth_user_pass_mgmt(up, prefix, flags, auth_challenge)) { - sc = auth_challenge; - } -#endif - 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