From: Michael Tremer <michael.tremer@ipfire.org>
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 [thread overview]
Message-ID: <20221206100144.4150532-3-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20221206100144.4150532-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
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-authenticator
index c22e08f0a..4341993e6 100644
--- a/config/ovpn/openvpn-authenticator
+++ b/config/ovpn/openvpn-authenticator
@@ -68,6 +68,12 @@ class OpenVPNAuthenticator(object):
while True:
char = 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)
# Reached end of line
@@ -112,7 +118,7 @@ class OpenVPNAuthenticator(object):
self._client_event(line)
# 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)
log.info("OpenVPN Authenticator terminated")
--
2.30.2
next prev parent reply other threads:[~2022-12-06 10:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 10:01 [PATCH 1/3] openvpn-authenticator: Avoid infinite loop when losing socket connection Michael Tremer
2022-12-06 10:01 ` [PATCH 2/3] openvpn-authenticator: Drop some dead code Michael Tremer
2022-12-07 12:22 ` Adolf Belka
2022-12-06 10:01 ` Michael Tremer [this message]
2022-12-07 12:22 ` [PATCH 3/3] openvpn-authenticator: Break read loop when daemon goes away Adolf Belka
2022-12-07 12:21 ` [PATCH 1/3] openvpn-authenticator: Avoid infinite loop when losing socket connection Adolf Belka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221206100144.4150532-3-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox