From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] openvpn-authenticator: Avoid infinite loop when losing socket connection Date: Tue, 06 Dec 2022 10:01:42 +0000 Message-ID: <20221206100144.4150532-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2595166638161041975==" List-Id: --===============2595166638161041975== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch will gracefully terminate the daemon when it loses its connection to the OpenVPN daemon. Fixes: #12963 Signed-off-by: Michael Tremer --- config/ovpn/openvpn-authenticator | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenti= cator index 65844012b..5d9348d7e 100644 --- a/config/ovpn/openvpn-authenticator +++ b/config/ovpn/openvpn-authenticator @@ -116,11 +116,16 @@ class OpenVPNAuthenticator(object): =20 log.info("OpenVPN Authenticator started") =20 - while True: - line =3D self._read_line() + try: + while True: + line =3D self._read_line() =20 - if line.startswith(">CLIENT"): - self._client_event(line) + if line.startswith(">CLIENT"): + self._client_event(line) + + # Terminate the daemon when it loses its connection to the OpenVPN daemon + except ConnectionResetError as e: + log.error("Connection to OpenVPN has been lost: %s" % e) =20 log.info("OpenVPN Authenticator terminated") =20 @@ -269,7 +274,7 @@ class OpenVPNAuthenticator(object): @staticmethod def _b64decode(s): return base64.b64decode(s.encode()).decode() - =09 + @staticmethod def _escape(s): return s.replace(" ", "\ ") --=20 2.30.2 --===============2595166638161041975==--