From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] openvpn-authenticator: Break read loop when daemon goes away Date: Tue, 06 Dec 2022 10:01:44 +0000 Message-ID: <20221206100144.4150532-3-michael.tremer@ipfire.org> In-Reply-To: <20221206100144.4150532-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6291899901470685678==" List-Id: --===============6291899901470685678== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fixes: #12963 Signed-off-by: Michael Tremer --- config/ovpn/openvpn-authenticator | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenti= cator 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 daemon - 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 2.30.2 --===============6291899901470685678==--