mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user