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

Only sanitize script output when viewing the logs in the UI

Browse source
This commit is contained in:
JonnyWong16 2018-04-08 10:44:47 -07:00
parent fabced9942
commit 32df79bb83
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/notifiers.py
View file

@ -2933,6 +2933,8 @@ class SCRIPTS(Notifier):
'.sh': '' '.sh': ''
} }
self.arg_overrides = ('python2', 'python3', 'python', 'pythonw', 'php', 'ruby', 'perl')
def list_scripts(self): def list_scripts(self):
scriptdir = self.config['script_folder'] scriptdir = self.config['script_folder']
scripts = {'': ''} scripts = {'': ''}
@ -2994,12 +2996,12 @@ class SCRIPTS(Notifier):
return False return False
if error: if error:
err = '\n '.join([helpers.sanitize(l) for l in error.splitlines()]) err = '\n '.join([l for l in error.splitlines()])
logger.error(u"Tautulli Notifiers :: Script error: \n %s" % err) logger.error(u"Tautulli Notifiers :: Script error: \n %s" % err)
return False return False
if output: if output:
out = '\n '.join([helpers.sanitize(l) for l in output.splitlines()]) out = '\n '.join([l for l in output.splitlines()])
logger.debug(u"Tautulli Notifiers :: Script returned: \n %s" % out) logger.debug(u"Tautulli Notifiers :: Script returned: \n %s" % out)
if not self.script_killed: if not self.script_killed:
@ -3055,7 +3057,7 @@ class SCRIPTS(Notifier):
# Allow overrides for shitty systems # Allow overrides for shitty systems
if prefix and script_args: if prefix and script_args:
if script_args[0] in ('python2', 'python', 'pythonw', 'php', 'ruby', 'perl'): if script_args[0] in self.arg_overrides:
script[0] = script_args[0] script[0] = script_args[0]
del script_args[0] del script_args[0]

4
plexpy/webserve.py
View file

@ -2310,13 +2310,13 @@ class WebInterface(object):
try: try:
temp_loglevel_and_time = l.split(' - ', 1) temp_loglevel_and_time = l.split(' - ', 1)
loglvl = temp_loglevel_and_time[1].split(' ::', 1)[0].strip() loglvl = temp_loglevel_and_time[1].split(' ::', 1)[0].strip()
msg = unicode(l.split(' : ', 1)[1].replace('\n', ''), 'utf-8') msg = helpers.sanitize(unicode(l.split(' : ', 1)[1].replace('\n', ''), 'utf-8'))
fa([temp_loglevel_and_time[0], loglvl, msg]) fa([temp_loglevel_and_time[0], loglvl, msg])
except IndexError: except IndexError:
# Add traceback message to previous msg. # Add traceback message to previous msg.
tl = (len(filt) - 1) tl = (len(filt) - 1)
n = len(l) - len(l.lstrip(' ')) n = len(l) - len(l.lstrip(' '))
ll = ' ' * (2 * n) + unicode(l[n:], 'utf-8') ll = ' ' * (2 * n) + helpers.sanitize(unicode(l[n:], 'utf-8'))
filt[tl][2] += '<br>' + ll filt[tl][2] += '<br>' + ll
continue continue