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>
This commit is contained in:
Michael Tremer
2022-06-14 15:57:03 +00:00
parent b6f9fff2bc
commit c9dc7fdec0

View File

@@ -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