[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6619aed611693d4bca7c009867c838b2fbaf85ac

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6619aed611693d4bca7c009867c838b2fbaf85ac

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2870 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  6619aed611693d4bca7c009867c838b2fbaf85ac (commit)
       via  6d4110d214cd2b7bae59a560f01a3ed3501a98c8 (commit)
      from  4acb701b84f2f6a950e0d03d8e2234018bacb9df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6619aed611693d4bca7c009867c838b2fbaf85ac
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Tue Dec 13 15:27:30 2022 +0000

    Revert "openvpn-authenticator: Avoid infinite loop when losing socket connection"
    
    This reverts commit 92a9ce54bc63ebea153fc46365a1aa299856fbbe.

commit 6d4110d214cd2b7bae59a560f01a3ed3501a98c8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Tue Dec 13 15:26:45 2022 +0000

    Revert "openvpn-authenticator: Break read loop when daemon goes away"
    
    This reverts commit 7ec3664c320707b51407fce854e19b6254eb4836.

-----------------------------------------------------------------------

Summary of changes:
 config/ovpn/openvpn-authenticator | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

Difference in files:
diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenticator
index 4341993e6..36374caf8 100644
--- a/config/ovpn/openvpn-authenticator
+++ b/config/ovpn/openvpn-authenticator
@@ -68,12 +68,6 @@ 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
@@ -110,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, EOFError) 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")
 
@@ -268,7 +257,7 @@ class OpenVPNAuthenticator(object):
 	@staticmethod
 	def _b64decode(s):
 		return base64.b64decode(s.encode()).decode()
-
+		
 	@staticmethod
 	def _escape(s):
 		return s.replace(" ", "\ ")


hooks/post-receive
--
IPFire 2.x development tree