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

Remove the use of eval for evaluating custom notification logic

Browse source
This commit is contained in:
JonnyWong16 2017-07-05 19:13:02 -07:00
parent d4e5a750e0
commit 161e6f70d0
2 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plexpy/notification_handler.py
View file

@ -205,7 +205,6 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
try:
# Parse and validate the custom conditions logic
logic_groups = helpers.parse_condition_logic_string(custom_conditions_logic, len(custom_conditions))
logic_string = helpers.nested_list_to_string(logic_groups)
except ValueError as e:
logger.error(u"PlexPy NotificationHandler :: Unable to parse custom condition logic '%s': %s."
% (custom_conditions_logic, e))
@ -291,7 +290,7 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
# Format and evaluate the logic string
try:
evaluated_logic = bool(eval(logic_string.format(*evaluated_conditions)))
evaluated_logic = helpers.eval_logic_groups_to_bool(logic_groups, evaluated_conditions)
except Exception as e:
logger.error(u"PlexPy NotificationHandler :: Unable to evaluate custom condition logic: %s." % e)
return False