From patchwork Fri Jul 22 02:51:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2598 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id YAruJJ2d2mIhbAAAIUCqbw (envelope-from ) for ; Fri, 22 Jul 2022 08:52:45 -0400 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id IFfcJJ2d2mLpUgAAovjBpQ (envelope-from ) for ; Fri, 22 Jul 2022 08:52:45 -0400 Received: from smtp34.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net with LMTPS id YEV8JJ2d2mJrSAAAfawv4w (envelope-from ) for ; Fri, 22 Jul 2022 08:52:45 -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: smtp34.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 2dc993b0-09bd-11ed-b56e-545200247500-1-1 Received: from [216.105.38.7] ([216.105.38.7:35484] helo=lists.sourceforge.net) by smtp34.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6E/31-25443-C9D9AD26; Fri, 22 Jul 2022 08:52:44 -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.94.2) (envelope-from ) id 1oEs84-0003hJ-1Q; Fri, 22 Jul 2022 12:51:40 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oEs82-0003hD-Ke for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 12:51:39 +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=ohcvdPY0ut37Dx/+2QqAi3lQZk5Zef1NACKLXFhh59o=; b=j/0PfsRFwO/aHAEos+0BLLqLHn ba8RHnKJJFqVJ+lqN+X7Ul28jOuu1rtEadZnkmSEDpfvWDHw9F+ECMm3XTqJvYFNSuLpLgLEtsJvn l7pmeofx6gOr/pzjNqyMnvHN5MNaYzM5H9K/DYf/d1dxFbgSWMdJI7/bpd3sPEKaMkQw=; 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=ohcvdPY0ut37Dx/+2QqAi3lQZk5Zef1NACKLXFhh59o=; b=A EJn6CQlL1aDLNVf/VgzJCq42ycJfh7xpXPQugShKOfBCMIP8O9EZd7WraH2ix+NchoG5171P5yozN gITILlwszKzsOSCQmSBCoeFdsl9El8HxzFoh/Dy6yy1RIZrOmdDtIGNN3EJ5WV6WUFfcImVJYogEU R8b46aEinvYyHM5U=; 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 1oEs7z-006tP1-Il for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 12:51:39 +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 1oEs7m-000DlA-TX for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 14:51:22 +0200 Received: (nullmailer pid 2441860 invoked by uid 10006); Fri, 22 Jul 2022 12:51:22 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Jul 2022 14:51:22 +0200 Message-Id: <20220722125122.2441814-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-1.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.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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 X-Headers-End: 1oEs7z-006tP1-Il 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. --- src/openvpn/options.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index abda8c379..e56df7d4c 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-sigusr 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);