indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

If handle is given at login then check the domain

merge-requests/30/head
Bob Mottram 2021-03-08 21:44:44 +00:00
parent 8c809f6f20
commit 93aec5d4d9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -1463,7 +1463,9 @@ class PubServer(BaseHTTPRequestHandler):
return return
loginNickname, loginPassword, register = \ loginNickname, loginPassword, register = \
htmlGetLoginCredentials(loginParams, self.server.lastLoginTime) htmlGetLoginCredentials(loginParams,
self.server.lastLoginTime,
self.server.domain)
if loginNickname: if loginNickname:
if isSystemAccount(loginNickname): if isSystemAccount(loginNickname):
print('Invalid username login: ' + loginNickname + print('Invalid username login: ' + loginNickname +

7
webapp_login.py
View File

@ -18,7 +18,8 @@ from theme import getTextModeLogo
def htmlGetLoginCredentials(loginParams: str, def htmlGetLoginCredentials(loginParams: str,
lastLoginTime: int) -> (str, str, bool): lastLoginTime: int,
domain: str) -> (str, str, bool):
"""Receives login credentials via HTTPServer POST """Receives login credentials via HTTPServer POST
""" """
if not loginParams.startswith('username='): if not loginParams.startswith('username='):
@ -39,7 +40,9 @@ def htmlGetLoginCredentials(loginParams: str,
nickname = arg.split('=', 1)[1] nickname = arg.split('=', 1)[1]
if '@' in nickname: if '@' in nickname:
# the full nickname@domain has been entered # the full nickname@domain has been entered
nickname = nickname.split('@')[0] handleDomain = nickname.split('@')[1].strip()
if handleDomain == domain:
nickname = nickname.split('@')[0]
elif arg.split('=', 1)[0] == 'password': elif arg.split('=', 1)[0] == 'password':
password = arg.split('=', 1)[1] password = arg.split('=', 1)[1]
elif arg.split('=', 1)[0] == 'register': elif arg.split('=', 1)[0] == 'register':