From 6619aed611693d4bca7c009867c838b2fbaf85ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Tue, 13 Dec 2022 15:27:30 +0000 Subject: [PATCH] Revert "openvpn-authenticator: Avoid infinite loop when losing socket connection" This reverts commit 92a9ce54bc63ebea153fc46365a1aa299856fbbe. --- config/ovpn/openvpn-authenticator | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenticator index c22e08f0a9..36374caf83 100644 --- a/config/ovpn/openvpn-authenticator +++ b/config/ovpn/openvpn-authenticator @@ -104,16 +104,11 @@ class OpenVPNAuthenticator(object): log.info("OpenVPN Authenticator started") - try: - while True: - line = self._read_line() - - if line.startswith(">CLIENT"): - self._client_event(line) + while True: + line = self._read_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) + if line.startswith(">CLIENT"): + self._client_event(line) log.info("OpenVPN Authenticator terminated") @@ -262,7 +257,7 @@ class OpenVPNAuthenticator(object): @staticmethod def _b64decode(s): return base64.b64decode(s.encode()).decode() - + @staticmethod def _escape(s): return s.replace(" ", "\ ") -- 2.39.5