From: "plaisthos (Code Review)" Date: Mon, 6 May 2024 13:50:28 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="F53lgdAWvCY="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Avoid SIGUSR1 to SIGHUP when the configuration is read from stdin List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --F53lgdAWvCY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/533?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: Avoid SIGUSR1 to SIGHUP when the configuration is read from= stdin ...................................................................... Avoid SIGUSR1 to SIGHUP when the configuration is read from stdin If the configuration is read from stdin, we cannot reread the configuration as stdin provides the configuration only once. So whenever we hit the "close_context usr1 to hup" logic, the OpenVPN process will fail as tries to restart with an empty configuration. While OpenVPN tries to block USR1 from normal unix signal, I have observed cases in my app which sends USR1 from management interface where the CC_HARD_USR1_TO_HUP logic is trigger and breaking the OpenVPN process. Change-Id: Icfc179490d6821e22d14817941fb0bad667c713f Signed-off-by: Arne Schwabe --- M src/openvpn/openvpn.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/33/533/2 diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c index 0e85ebc..a55dde6 100644 --- a/src/openvpn/openvpn.c +++ b/src/openvpn/openvpn.c @@ -32,6 +32,7 @@ #include "multi.h" #include "win32.h" #include "platform.h" +#include "string.h" #include "memdbg.h" @@ -60,9 +61,10 @@ /* set point-to-point mode */ c->mode =3D CM_P2P; - - /* initialize tunnel instance */ - init_instance_handle_signals(c, c->es, CC_HARD_USR1_TO_HUP); + /* initialize tunnel instance, avoid SIGHUP when config is stdin since + * reading the config from stdin will not work */ + bool stdin_config =3D c->options.config && (strcmp(c->options.config, = "stdin") =3D=3D 0); + init_instance_handle_signals(c, c->es, stdin_config ? 0 : CC_HARD_USR1= _TO_HUP); if (IS_SIG(c)) { return; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/533?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Icfc179490d6821e22d14817941fb0bad667c713f Gerrit-Change-Number: 533 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --F53lgdAWvCY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

plaisthos uploaded patch set #2 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/533?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Avoid SIGUSR1 to SIGHUP when the configuratio=
n is read from stdin

If the configuration is read from stdin, we can= not reread the configuration
as stdin provides the configuration only on= ce. So whenever we hit the
"close_context usr1 to hup" logic, = the OpenVPN process will fail as tries
to restart with an empty configur= ation.

While OpenVPN tries to block USR1 from normal unix signal, I= have observed
cases in my app which sends USR1 from management interfac= e where the
CC_HARD_USR1_TO_HUP logic is trigger and breaking the OpenVP= N process.

Change-Id: Icfc179490d6821e22d14817941fb0bad667c713f
S= igned-off-by: Arne Schwabe <arne@...1227...>
---
M src/openvpn/= openvpn.c
1 file changed, 5 insertions(+), 3 deletions(-)

<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">git = pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/33/533/2d= iff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c
i= ndex 0e85ebc..a55dde6 100644
--- a/src/openvpn/openvpn.c
+++ b/src/openvpn/openvpn.c
@@ -32,6 +32,7 @@=
#include "multi.h"
#include &q= uot;win32.h"
#include "platform.h"+#include "string.h"= ;

#include "memdbg.h"
@@ -60,9 +61,10 @@

/* set point-to-point mode */

c->mode =3D = CM_P2P;
-
- /* initialize tunnel instance *= /
- init_instance_ha= ndle_signals(c, c->es, CC_HARD_USR1_TO_HUP);
+ /* initialize tunnel instance, avoid SIGHUP= when config is stdin since
+ * reading the config from stdin will not work */
+ bool stdin_config =3D c->o= ptions.config && (strcmp(c->options.config, "stdin") = =3D=3D 0);
+ init_= instance_handle_signals(c, c->es, stdin_config ? 0 : CC_HARD_USR1_TO_HUP= );
if (IS_SIG(c))
{
return;

To view, visit change 533. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icfc179490d6821e22d14817941f= b0bad667c713f
Gerrit-Change-Number: 533
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--F53lgdAWvCY=--