From patchwork Tue Jul 3 05:58:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 395 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id 7AMyJmqdO1u3XgAAIUCqbw for ; Tue, 03 Jul 2018 11:59:38 -0400 Received: from proxy12.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net (Dovecot) with LMTP id M3WHA2qdO1vSeAAAIasKDg ; Tue, 03 Jul 2018 11:59:38 -0400 Received: from smtp10.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.ord1d.rsapps.net with LMTP id uAXVMGqdO1vTIQAA7PHxkg ; Tue, 03 Jul 2018 11:59:38 -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: smtp10.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; 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: 165e1c90-7eda-11e8-bb53-52540013bccb-1-1 Received: from [216.105.38.7] ([216.105.38.7:52775] helo=lists.sourceforge.net) by smtp10.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id DF/0E-31591-A6D9B3B5; Tue, 03 Jul 2018 11:59:38 -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 1faNhi-0002NN-HF; Tue, 03 Jul 2018 15:58:58 +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 1faNhh-0002NH-2U for openvpn-devel@lists.sourceforge.net; Tue, 03 Jul 2018 15:58:57 +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=+9c839Wl0DIjhzGfpTTMPkCw1ifZOqCEuptOdi841Ac=; b=St+gNrkq4dQWNJ09Gg11mZ5X2u m7VQNAl9j/TvOuVM8WIA49IkIF25x235Z15QqR4LldAsln6SO1M7cNztESfhbPYxzPburGGyISAuH kCgLtyT+y7/+Q3zsLGqxHJmUBJ8kzLjxw31cmdaXrkcuuaY5ecEKHsHRsX9eqPy+rjpA=; 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=+9c839Wl0DIjhzGfpTTMPkCw1ifZOqCEuptOdi841Ac=; b=PNrJJBFSpUamCPIJHu3rHlgTTf TGFydH+GLRGaeuC9v7SpxrbovgWqf25JuY33u9QRqFuyycNEOv6e8w1pdNO5/nN3A1U/tWq06JauY Pncip0OVQmxmCQ17wo5xg4uhMlIC0Dd1jZPf9YfOGv5YZh5Mfp/6lteK/zW7IEEuwfPE=; Received: from mail-it0-f52.google.com ([209.85.214.52]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1faNhf-00GODc-KC for openvpn-devel@lists.sourceforge.net; Tue, 03 Jul 2018 15:58:56 +0000 Received: by mail-it0-f52.google.com with SMTP id a195-v6so3811517itd.3 for ; Tue, 03 Jul 2018 08:58:55 -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=+9c839Wl0DIjhzGfpTTMPkCw1ifZOqCEuptOdi841Ac=; b=O78nP+g6BzD9s1zP+cnRAT96I0/ykZyL0y/bk++721mZeo8AOcMoMgnaJre8SX3Ln0 CEzqXvnbzSCrmlXhMFCqVz6CcwgfUlu2NP3xl2zMEHlbMGaymqxR4Mp61V4qUMbg02Vn kasFVOZ6agaUl0J37WWS4CGwxanlskH5guC2XqXvMffw9J0l32ZsTBWFHG/p3LEYpWZk lAxKgIhmDzuz5LUwwMqhdDNbi9riZGr2T3IJJGOrpXrV9hzaUjSsWK+f2armkvivGqUj yH13o67nIvv8xsZHsAtN/W31C9dBMGIfXoI/OwhRbuYp6vwR5BHydJmzvH+XIQ0++9wC 5sFQ== 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=+9c839Wl0DIjhzGfpTTMPkCw1ifZOqCEuptOdi841Ac=; b=ISTxvPujFFBWe7pheL143qsAgLe46hzvWLbz+OtiOOr/Cl76g/1yuqQFlAULIezVSq C7E7CkR6/QGR1/mmD8FYyUzE134FJ3audlBLwPs1xjnrFCkpZ0Uam9RUw0MHW4tZyQiJ mfdUJYaltIq5h5mABUchnZ1nxsQDlfWhfyj7rr9wmvOVWlj/a1vvKYqhZL2Mkz88IjSP Uhx0dUeDFYLdI0d+0AZCaiKjY2Jgtg6sfwqBbce4YIy8r3no4+q4VO+tCfLQR6kQChj7 MJWfMKB39BjARGnJiAn2xinPf1BP5G2uLw/dC1m5AE0kgD4DSozCBBraivP95DTENgc2 IaKg== X-Gm-Message-State: APt69E1QhvsPyPnUx6h7jpsFaT3p+azIka/spcqBPVeYICi/vsP/zbj/ wghCS6xmpnbgjaNkn3dr6IxAfubk X-Google-Smtp-Source: AAOMgpfcoMQjS1ZDRrgBdsUdTlaVDL6YQnVMK9fqZ5bGj0euXD2bjestTBXNdno6VXDfofbZymmOmQ== X-Received: by 2002:a24:99c4:: with SMTP id a187-v6mr13429488ite.148.1530633529751; Tue, 03 Jul 2018 08:58:49 -0700 (PDT) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id o71-v6sm700956ita.37.2018.07.03.08.58.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jul 2018 08:58:48 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Jul 2018 11:58:29 -0400 Message-Id: <1530633509-4959-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1530581086-7825-1-git-send-email-selva.nair@gmail.com> References: <1530581086-7825-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_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.214.52 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.52 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1faNhf-00GODc-KC Subject: [Openvpn-devel] [PATCH v2] Make up/down script errors not FATAL 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 Treat the error as not FATAL only if its triggered due to script_security < SSEC_SCRIPTS. This helps user interfaces enforce a safer script-security setting without causing a FATAL error. Signed-off-by: Selva Nair --- v2 changes: - Have script errors continue to trigger a FATAL error. - Update the commit message to match this change. src/openvpn/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b748357..074a2d3 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -168,13 +168,14 @@ run_up_down(const char *command, if (command) { struct argv argv = argv_new(); + int flags = (script_security >= SSEC_SCRIPTS)? S_FATAL : 0; ASSERT(arg); setenv_str(es, "script_type", script_type); argv_parse_cmd(&argv, command); argv_printf_cat(&argv, "%s %d %d %s %s %s", arg, tun_mtu, link_mtu, ifconfig_local, ifconfig_remote, context); argv_msg(M_INFO, &argv); - openvpn_run_script(&argv, es, S_FATAL, "--up/--down"); + openvpn_run_script(&argv, es, flags, "--up/--down"); argv_reset(&argv); }