github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 13:41:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use cherrypy remote for login IP info

Browse source
This commit is contained in:
JonnyWong16 2018-03-13 10:00:08 -07:00
parent d18820b832
commit 525f1e4b0b
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
plexpy/webauth.py
View file

@ -215,14 +215,12 @@ class AuthController(object):
return return
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT) raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
def on_login(self, user_id, username, user_group): def on_login(self, username, user_id=None, user_group=None, success=0):
"""Called on successful login""" """Called on successful login"""
# Save login to the database # Save login to the database
ip_address = cherrypy.request.remote.ip
host = cherrypy.request.base host = cherrypy.request.base
ip_address = cherrypy.request.headers.get('X-Forwarded-For',
cherrypy.request.headers.get('X-Real-Ip',
cherrypy.request.headers.get('Remote-Addr')))
user_agent = cherrypy.request.headers.get('User-Agent') user_agent = cherrypy.request.headers.get('User-Agent')
Users().set_user_login(user_id=user_id, Users().set_user_login(user_id=user_id,
@ -231,30 +229,15 @@ class AuthController(object):
ip_address=ip_address, ip_address=ip_address,
host=host, host=host,
user_agent=user_agent, user_agent=user_agent,
success=1) success=success)
logger.debug(u"Tautulli WebAuth :: %s user '%s' logged into Tautulli." % (user_group.capitalize(), username)) if success == 1:
logger.debug(u"Tautulli WebAuth :: %s user '%s' logged into Tautulli." % (user_group.capitalize(), username))
def on_logout(self, username, user_group): def on_logout(self, username, user_group):
"""Called on logout""" """Called on logout"""
logger.debug(u"Tautulli WebAuth :: %s user '%s' logged out of Tautulli." % (user_group.capitalize(), username)) logger.debug(u"Tautulli WebAuth :: %s user '%s' logged out of Tautulli." % (user_group.capitalize(), username))
def on_login_failed(self, username):
"""Called on failed login"""
# Save login attempt to the database
host = cherrypy.request.base
ip_address = cherrypy.request.headers.get('X-Forwarded-For',
cherrypy.request.headers.get('X-Real-Ip',
cherrypy.request.headers.get('Remote-Addr')))
user_agent = cherrypy.request.headers.get('User-Agent')
Users().set_user_login(user=username,
ip_address=ip_address,
host=host,
user_agent=user_agent,
success=0)
def get_loginform(self): def get_loginform(self):
from plexpy.webserve import serve_template from plexpy.webserve import serve_template
return serve_template(templatename="login.html", title="Login") return serve_template(templatename="login.html", title="Login")
@ -320,7 +303,10 @@ class AuthController(object):
jwt_token = jwt.encode(payload, plexpy.CONFIG.JWT_SECRET, algorithm=JWT_ALGORITHM) jwt_token = jwt.encode(payload, plexpy.CONFIG.JWT_SECRET, algorithm=JWT_ALGORITHM)
self.on_login(user_id, username, user_group) self.on_login(username=username,
user_id=user_id,
user_group=user_group,
success=1)
jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID jwt_cookie = JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID
cherrypy.response.cookie[jwt_cookie] = jwt_token cherrypy.response.cookie[jwt_cookie] = jwt_token
@ -332,13 +318,13 @@ class AuthController(object):
return {'status': 'success', 'token': jwt_token.decode('utf-8'), 'uuid': plexpy.CONFIG.PMS_UUID} return {'status': 'success', 'token': jwt_token.decode('utf-8'), 'uuid': plexpy.CONFIG.PMS_UUID}
elif admin_login == '1': elif admin_login == '1':
self.on_login_failed(username) self.on_login(username=username)
logger.debug(u"Tautulli WebAuth :: Invalid admin login attempt from '%s'." % username) logger.debug(u"Tautulli WebAuth :: Invalid admin login attempt from '%s'." % username)
cherrypy.response.status = 401 cherrypy.response.status = 401
return error_message return error_message
else: else:
self.on_login_failed(username) self.on_login(username=username)
logger.debug(u"Tautulli WebAuth :: Invalid login attempt from '%s'." % username) logger.debug(u"Tautulli WebAuth :: Invalid login attempt from '%s'." % username)
cherrypy.response.status = 401 cherrypy.response.status = 401
return error_message return error_message