github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 08:16:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add complete login table to logs

Browse source
This commit is contained in:
JonnyWong16 2016-05-15 01:01:29 -07:00
parent ae381f7762
commit f598d5046e
9 changed files with 180 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plexpy/users.py
View file

@ -706,17 +706,19 @@ class Users(object):
data_tables = datatables.DataTables()
custom_where = [['user_id', user_id]]
if session.get_session_user_id():
custom_where = [['user_id', session.get_session_user_id()]]
else:
custom_where = [['user_id', user_id]] if user_id else []
columns = ['user_login.user_id',
'user_login.user',
'user_login.user_group',
'user_login.ip_address',
'user_login.host',
'user_login.user_agent',
'user_login.timestamp AS date',
'user_login.timestamp AS time',
'users.friendly_name'
'user_login.timestamp',
'(CASE WHEN users.friendly_name IS NULL THEN user_login.user ELSE users.friendly_name END) \
AS friendly_name'
]
try:
@ -739,15 +741,13 @@ class Users(object):
(os, browser) = httpagentparser.simple_detect(item['user_agent'])
row = {'user_id': item['user_id'],
'user': item['user'],
'user_group': item['user_group'],
'ip_address': item['ip_address'],
'host': item['host'],
'user_agent': item['user_agent'],
'os': os,
'browser': browser,
'date': item['date'],
'time': item['time'],
'timestamp': item['timestamp'],
'friendly_name': item['friendly_name']
}
@ -759,4 +759,16 @@ class Users(object):
'draw': query['draw']
}
return dict
return dict
def delete_login_log(self):
monitor_db = database.MonitorDatabase()
try:
logger.info(u"PlexPy Users :: Clearing login logs from database.")
monitor_db.action('DELETE FROM user_login')
monitor_db.action('VACUUM')
return True
except Exception as e:
logger.warn(u"PlexPy Users :: Unable to execute database query for delete_login_log: %s." % e)
return False

35
plexpy/webserve.py
View file

@ -1190,12 +1190,11 @@ class WebInterface(object):
"recordsFiltered": 10,
"data":
[{"browser": "Safari 7.0.3",
"date": 1462591869,
"friendly_name": "Jon Snow",
"host": "http://plexpy.castleblack.com",
"ip_address": "xxx.xxx.xxx.xxx",
"os": "Mac OS X",
"time": 1462591869,
"timestamp": 1462591869,
"user": "LordCommanderSnow",
"user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A",
"user_group": "guest",
@ -1211,13 +1210,12 @@ class WebInterface(object):
# If not, then build the minimal amount of json data for a query
if not kwargs.get('json_data'):
# TODO: Find some one way to automatically get the columns
dt_columns = [("date", True, False),
("time", True, False),
dt_columns = [("timestamp", True, False),
("ip_address", True, True),
("host", True, True),
("os", True, True),
("browser", True, True)]
kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "time")
kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
user_data = users.Users()
history = user_data.get_datatables_user_login(user_id=user_id, kwargs=kwargs)
@ -2147,7 +2145,7 @@ class WebInterface(object):
@requireAuth(member_of("admin"))
@addtoapi()
def delete_notification_log(self, **kwargs):
""" Delete the notification logs.
""" Delete the PlexPy notification logs.
```
Required paramters:
@ -2167,6 +2165,31 @@ class WebInterface(object):
return {'result': res, 'message': msg}
@cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin"))
@addtoapi()
def delete_login_log(self, **kwargs):
""" Delete the PlexPy login logs.
```
Required paramters:
None
Optional parameters:
None
Returns:
None
```
"""
user_data = users.Users()
result = user_data.delete_login_log()
res = 'success' if result else 'error'
msg = 'Cleared login logs.' if result else 'Failed to clear login logs.'
return {'result': res, 'message': msg}
@cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin"))