From patchwork Fri Jul 22 03:02:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2599 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id cDnbICOg2mKQfwAAIUCqbw (envelope-from ) for ; Fri, 22 Jul 2022 09:03:31 -0400 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id EKPMICOg2mIxdQAAvGGmqA (envelope-from ) for ; Fri, 22 Jul 2022 09:03:31 -0400 Received: from smtp7.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTPS id cGCWICOg2mJNLQAATCaURg (envelope-from ) for ; Fri, 22 Jul 2022 09:03:31 -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: smtp7.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: aeaf8fe2-09be-11ed-8707-525400d0c497-1-1 Received: from [216.105.38.7] ([216.105.38.7:49162] helo=lists.sourceforge.net) by smtp7.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 62/E8-02674-220AAD26; Fri, 22 Jul 2022 09:03:30 -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.94.2) (envelope-from ) id 1oEsIc-0002qZ-JN; Fri, 22 Jul 2022 13:02:34 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oEsIa-0002qT-9d for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 13:02:32 +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=wAmqVuWdEVU3HKM2G8/TRJzYXksW+n84XVTLx/z11ZY=; b=bNo7bf/brFZAYp7Nhu98ivDtsr lf6qdsT1GnKDDwnVxTfSeggbZtiXoGbS2srIkvtX75PMjgSW/Q0FoMvwnaZIOH6gQIRcXnPZaLIre KMykjZY5oV8mIxEGZAH9m1MWKampche/lxS+DemVYaNjwinjRroTTsWB4+iguuiVcyKU=; 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=wAmqVuWdEVU3HKM2G8/TRJzYXksW+n84XVTLx/z11ZY=; b=m UU2bZVDWpy4jYDxRjbIW8euyx5ZbxSo/A3z4WRwp7rY87Z6rI2CBhmj6dzazpgpN4hQO96p7npkMd L04yxk3a9OkMS1Ci3+HbXenzk3oEEvr07E11R2r0akShPeZ5IfespUN0AY1+srVIEI5EnDgKGq8+Q I5C1It7IBNWNlyIY=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1oEsIZ-006tsF-HI for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 13:02:32 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oEsIT-000Doj-3C for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 15:02:25 +0200 Received: (nullmailer pid 2442805 invoked by uid 10006); Fri, 22 Jul 2022 13:02:25 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Jul 2022 15:02:24 +0200 Message-Id: <20220722130224.2442759-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: OpenVPN for Android uses config stdin to avoid writing the config file containing private keys to 'disk'. However using stdin means that config cannot be reread using SIGHUP. While there might be othe [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1oEsIZ-006tsF-HI Subject: [Openvpn-devel] [PATCH] Error out if both remap-usr1 SIGHUP and config stdin are used 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 OpenVPN for Android uses config stdin to avoid writing the config file containing private keys to 'disk'. However using stdin means that config cannot be reread using SIGHUP. While there might be other corner cases that trigger SIGHUP, this is an obvious one, so we error out if we detect this misconfiguration. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/options.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index abda8c379..b9de2e5d0 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3680,6 +3680,12 @@ options_postprocess_mutate(struct options *o, struct env_set *es) o->verify_hash_no_ca = true; } + if (streq(o->config, "stdin") && o->remap_sigusr1 == SIGHUP) + { + msg(M_USAGE, "Options 'config stdin' and 'remap-usr1 SIGHUP' are " + "incompatible with each other."); + } + /* check if any option should force disabling DCO */ #if defined(TARGET_LINUX) o->tuntap_options.disable_dco = !dco_check_option_conflict(D_DCO, o);