[checkmk-commits] Fixed some useless eval calls

Module: check_mk Branch: master Commit: 9b0d394b866a5fb3a99415e700b21d4962bff118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0d394b866a5f… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Jan 9 08:23:04 2017 +0100 Fixed some useless eval calls Change-Id: Ie511a1a6fd6287ba466258cb183cd9fd408f3923 --- active_checks/check_mkevents.py | 5 +++-- bin/mkbackup | 3 ++- bin/mkeventd | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/active_checks/check_mkevents.py b/active_checks/check_mkevents.py index ad1d540..e5d40c7 100755 --- a/active_checks/check_mkevents.py +++ b/active_checks/check_mkevents.py @@ -28,9 +28,10 @@ # anymore... import os, socket, sys +import ast try: - socket_path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" + socket_path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" # nosec except: sys.stdout.write("UNKNOWN - OMD_ROOT is not set, no socket path is defined.\n") sys.exit(3) @@ -62,7 +63,7 @@ def query(query, remote_host): if not chunk: break - return eval(response_text) + return ast.literal_eval(response_text) except SyntaxError, e: sys.stdout.write("UNKNOWN - Invalid answer from event daemon\n%s\nQuery was:\n%s\n" \ % (e, query)) diff --git a/bin/mkbackup b/bin/mkbackup index f0da654..421a7cb 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -26,6 +26,7 @@ VERSION = "1.4.0i1" +import ast import base64 import errno import fcntl @@ -258,7 +259,7 @@ def makedir(path, user=None, group=None, mode=None): # - Site-Konfiguration laden def load_config(): def load_file(path): - return eval(file(path).read()) + return ast.literal_eval(file(path).read()) if is_root(): config = load_file(system_config_path()) diff --git a/bin/mkeventd b/bin/mkeventd index 979e367..c1389af 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -31,6 +31,7 @@ # creating objects. Or at least update the documentation. It is not clear # which fields are mandatory for the events. +import ast import socket, os, time, sys, getopt, signal, thread, pprint, re, \ select, subprocess, stat, string import traceback @@ -3474,7 +3475,7 @@ class EventStatus(): path = g_state_dir + "/status" if os.path.exists(path): try: - status = eval(file(path).read()) + status = ast.literal_eval(file(path).read()) self._next_event_id = status["next_event_id"] self._events = status["events"] self._rule_stats = status["rule_stats"] @@ -4343,7 +4344,7 @@ def save_master_config(new_state): def load_master_config(): path = g_state_dir + "/master_config" try: - config = eval(file(path).read()) + config = ast.literal_eval(file(path).read()) g_config["rules"] = config["rules"] g_config["rule_packs"] = config.get("rule_packs", []) g_config["actions"] = config["actions"] @@ -4371,7 +4372,7 @@ def get_state_from_master(): if not chunk: break - return eval(response_text) + return ast.literal_eval(response_text) except SyntaxError, e: raise Exception("Invalid response from event daemon: <pre>%s</pre>" % response_text) @@ -4396,7 +4397,7 @@ def load_slave_status(): path = g_state_dir + "/slave_status" if is_replication_slave(): try: - g_slave_status = eval(file(path).read()) + g_slave_status = ast.literal_eval(file(path).read()) except: g_slave_status = { "last_sync" : 0, # Time of last successfull sync