diff --git a/app.py b/app.py
index 0c2a310..7e3e357 100644
--- a/app.py
+++ b/app.py
@@ -161,7 +161,7 @@ def post_user():
if(newSession().get()['secureAuth']):
# encrypt and store the credentials
sid = newSession().get()['id']
- data = ';'.join([form('username'),form('password'),newSession().get()['authToken']])
+ data = ';'.join([form('username'),form('password'),newSession().get()['authCode']])
data_enc = cryptocode.encrypt(data, newSession().get()['id'])
data_to_url = base64.urlsafe_b64encode(str.encode(data_enc))
memo.get(data_enc)
@@ -195,8 +195,8 @@ def post_user_step2(path):
newSession()
return error(i18n.msg[27])
- #if not tools._2fa_validation(form('code'), newSession().get()['authToken']):
- if not tools._2fa_validation(form('code'), secret):
+ #if not tools._2fa_validation(form('token'), newSession().get()['authCode']):
+ if not tools._2fa_validation(form('token'), secret):
return error(i18n.msg[6])
else:
@@ -533,7 +533,7 @@ def login_user_ldap(conf, username, password):
LOG.debug("%s logged in to %s" % (username, conf['base']))
#generate qr if it doenst exists when 2fa enable
if(newSession().get()['secureAuth']):
- tools.gen_qr(newSession().get()['authToken'])
+ tools.gen_qr(newSession().get()['authCode'])
#LOGOUT
def logout(username):
@@ -827,14 +827,14 @@ def add_auth_attribute_step3(conf, username, code, action):
with connect_ldap(conf, user=superUser.admin_dn, password=superUser.admin_pwd) as c:
user_dn = find_user_dn(conf, c, username)
if(action == 'enable'):
- c.modify(user_dn,{'authToken': [(MODIFY_ADD, [code])]})
+ c.modify(user_dn,{'authCode': [(MODIFY_ADD, [code])]})
c.modify(user_dn,{'secureAuth': [MODIFY_REPLACE, [True]]})
elif(action == 'disable'):
- c.modify(user_dn,{'authToken': [(MODIFY_DELETE, [])]})
+ c.modify(user_dn,{'authCode': [(MODIFY_DELETE, [])]})
c.modify(user_dn,{'secureAuth': [MODIFY_REPLACE, [False]]})
#remove file
try:
- remove('static/tmp/'+newSession().get()['authToken']+'.png')
+ remove('static/tmp/'+newSession().get()['authCode']+'.png')
except OSError as e:
LOG.warning(str(e))
#raise Error(e)
@@ -1014,7 +1014,7 @@ def get_user_data(user_dn, conn):
search_filter = '(objectClass=*)'
conn.search(user_dn, search_filter,
attributes=['active','fakeCn','givenName','sn','uid','mail','devices','ip','lastLogin','secureAuth',
- 'authToken'])
+ 'authCode'])
data = []
data.append(conn.entries[0].active.values[0])
data.append(conn.entries[0].fakeCn.values[0])
@@ -1029,8 +1029,8 @@ def get_user_data(user_dn, conn):
#ts = datetime.strftime(t, '%Y-%m-%d %H:%M:%S')
data.append(str(conn.entries[0].lastLogin.values[0])[:-6])
data.append(conn.entries[0].secureAuth.values[0])
- if(conn.entries[0].authToken):
- data.append(conn.entries[0].authToken.values[0])
+ if(conn.entries[0].authCode):
+ data.append(conn.entries[0].authCode.values[0])
return(data)
@@ -1143,9 +1143,9 @@ def newSession():
self.lastLogin = data[8]
self.secureAuth = data[9]
try:
- self.authToken = data[10]
+ self.authCode = data[10]
except:
- self.authToken = None
+ self.authCode = None
self.data['active'] = self.active
self.data['fakeCn'] = self.fakeCn
@@ -1157,7 +1157,7 @@ def newSession():
self.data['ip'] = self.ip
self.data['lastLogin'] = self.lastLogin
self.data['secureAuth'] = self.secureAuth
- self.data['authToken'] = self.authToken
+ self.data['authCode'] = self.authCode
def close(self):
self.data.pop('username')
diff --git a/index.tpl b/index.tpl
index 258c45d..32b7f67 100644
--- a/index.tpl
+++ b/index.tpl
@@ -18,8 +18,8 @@
%try:
%if two_factor_authentication:
+ 