From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 3/3] openvpn-authenticator: Break read loop when daemon goes away
Date: Wed, 07 Dec 2022 13:22:44 +0100
Message-ID: <4598f99d-84c1-5131-e976-86c9d7763a93@ipfire.org>
In-Reply-To: <20221206100144.4150532-3-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5539406460525458937=="
List-Id: <development.lists.ipfire.org>

--===============5539406460525458937==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 06/12/2022 11:01, Michael Tremer wrote:
> Fixes: #12963
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   config/ovpn/openvpn-authenticator | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authen=
ticator
> index c22e08f0a..4341993e6 100644
> --- a/config/ovpn/openvpn-authenticator
> +++ b/config/ovpn/openvpn-authenticator
> @@ -68,6 +68,12 @@ class OpenVPNAuthenticator(object):
>  =20
>   		while True:
>   			char =3D self.sock.recv(1)
> +
> +			# Break if we could not read from the socket
> +			if not char:
> +				raise EOFError("Could not read from socket")
> +
> +			# Append to buffer
>   			buf.append(char)
>  =20
>   			# Reached end of line
> @@ -112,7 +118,7 @@ class OpenVPNAuthenticator(object):
>   					self._client_event(line)
>  =20
>   		# Terminate the daemon when it loses its connection to the OpenVPN daem=
on
> -		except ConnectionResetError as e:
> +		except (ConnectionResetError, EOFError) as e:
>   			log.error("Connection to OpenVPN has been lost: %s" % e)
>  =20
>   		log.info("OpenVPN Authenticator terminated")

--=20
Sent from my laptop


--===============5539406460525458937==--