From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 14 Jun 2022 15:57:03 +0000 (+0000)
Subject: openvpn-authenticator: Always return general connection data
X-Git-Tag: v2.27-core170~61^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9dc7fdec09ceec217534cf4a9832338ac9be671;p=ipfire-2.x.git

openvpn-authenticator: Always return general connection data

The function returned different output when TOTP was configured and not
which is not what it should do.

This version will now try to add the TOTP configuration, or will add
nothing it if fails to do so.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenticator
index 5773fb40b2..65844012b2 100644
--- a/config/ovpn/openvpn-authenticator
+++ b/config/ovpn/openvpn-authenticator
@@ -294,16 +294,20 @@ class OpenVPNAuthenticator(object):
 					continue
 
 				# Return match!
-				conn = {}
-				if len(row) < 45:
-					# General connection data
-					conn['name'] = row[2]
-					conn['common_name'] = row[3]
-				elif len(row) >= 45:
-					# TOTP options
-					conn['totp_protocol'] = row[43]
-					conn['totp_status'] = row[44]
-					conn['totp_secret'] = row[45]
+				conn = {
+					"name"        : row[2],
+					"common_name" : row[3],
+				}
+
+				# TOTP options
+				try:
+					conn |= {
+						"totp_protocol" : row[43],
+						"totp_status"   : row[44],
+						"totp_secret"   : row[45],
+					}
+				except IndexError:
+					pass
 
 				return conn