From 3fc877ebff0b84bb7d450c93ac02d7697838ac03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 11:29:16 +0000 Subject: [PATCH 1/8] update tools/startup_guard/config_parser_mgr/cfg/config_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- tools/startup_guard/config_parser_mgr/cfg/config_parser.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py index ca77a50..9094a71 100644 --- a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py +++ b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py @@ -37,6 +37,7 @@ class ItemParser(dict): def __init__(self, config): self._config_parser = config self["name"] = "" + def create(self, json_node, parent = None, fileId = None): return -- Gitee From 1de6d630778e16d4a224dfbeb2a2f8ba5c5350ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 11:34:18 +0000 Subject: [PATCH 2/8] update tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- .../param/system_parameter_parser.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py index 5aa7948..4b077b1 100644 --- a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py +++ b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py @@ -53,16 +53,16 @@ class ParameterDacParser(ParameterParser): ParameterParser.__init__(self, prefix, parameter) def decode(self, info): - dacInfo = info.strip("\"").strip("\'").split(":") - if len(dacInfo) < 3: + dac_info = info.strip("\"").strip("\'").split(":") + if len(dac_info) < 3: print("Invalid dac %s" % info) return False - self["dacUser"] = dacInfo[0] - self["dacGroup"] = dacInfo[1] - self["dacMode"] = dacInfo[2] - if len(dacInfo) > 3: - self["type"] = dacInfo[3] + self["dacUser"] = dac_info[0] + self["dacGroup"] = dac_info[1] + self["dacMode"] = dac_info[2] + if len(dac_info) > 3: + self["type"] = dac_info[3] return True class ParameterSelinuxParser(ParameterParser): -- Gitee From 0b3d0997a96c83a63efe3c2ffdc1f2aacfaa40cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 11:35:41 +0000 Subject: [PATCH 3/8] update tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- .../config_parser_mgr/param/system_parameter_parser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py index 4b077b1..1ea4ea7 100644 --- a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py +++ b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py @@ -85,11 +85,11 @@ class ParameterFileParser(): if line.startswith("#") or len(line) < 3: line = fp.readline() continue - paramInfo = line.partition(str) - if len (paramInfo) != 3: + param_info = line.partition(str) + if len (param_info) != 3: line = fp.readline() continue - self._handle_param_info(file_name, paramInfo) + self._handle_param_info(file_name, param_info) line = fp.readline() except: print("Error, invalid parameter file ", file_name) -- Gitee From 3ad39d70f059bfb90ca9664242b7bf216731d333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 11:53:46 +0000 Subject: [PATCH 4/8] update tools/startup_guard/config_parser_mgr/cfg/config_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- .../config_parser_mgr/cfg/config_parser.py | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py index 9094a71..daf7856 100644 --- a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py +++ b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py @@ -38,10 +38,10 @@ class ItemParser(dict): self._config_parser = config self["name"] = "" - def create(self, json_node, parent = None, fileId = None): + def create(self, json_node, parent = None, file_id = None): return - def update(self, json_node, parent = None, fileId = None): + def update(self, json_node, parent = None, file_id = None): return def get_name(self): @@ -128,9 +128,9 @@ class JobParser(ItemParser): self._add_cmds(json_node.get("cmds"), fileId) return - def _add_cmds(self, cmdList, fileId): - for cmd in cmdList: - self._config_parser.add_cmd(cmd, self, fileId) + def _add_cmds(self, cmd_list, file_id): + for cmd in cmd_list: + self._config_parser.add_cmd(cmd, self, file_id) class ServiceParser(ItemParser): def __init__(self, config): @@ -167,7 +167,7 @@ class ServiceParser(ItemParser): if fileId : self["fileId"] = fileId self._handle_string_filed(json_node) - self._handle_Bool_filed(json_node) + self._handle_bool_filed(json_node) self._handle_array_filed(json_node) self._handle_integer_filed(json_node) @@ -215,7 +215,7 @@ class ServiceParser(ItemParser): if json_node.__contains__(name): self[key] = json_node.get(name) - def _handle_Bool_filed(self, json_node): + def _handle_bool_filed(self, json_node): bool_field_map = { "once" : "once", "console" : "console", "notify_state" : "notify_state", "on_demand" : "ondemand", "sandbox" : "sandbox", "disabled" : "disabled", @@ -308,11 +308,11 @@ class ConfigParser(): self._files = {} self._cmds = [] self._services = {} - self._serviceSockets = {} - self._serviceFiles = {} - self._jobId = 0 + self._service_sockets = {} + self._service_files = {} + self._job_id = 0 self._file_id = 0 - self._serviceId = 0 + self._service_id = 0 self._selinux = "" self._plug_in = [] @@ -324,13 +324,13 @@ class ConfigParser(): with open(path, encoding='utf-8') as content: try: root = json.load(content) - fileId = self.add_File(file_name) + file_id = self.add_File(file_name) if not isinstance(root, dict): raise Exception("root type error") if (root.__contains__("services")): - self._load_services(root["services"], fileId) + self._load_services(root["services"], file_id) if (root.__contains__("jobs")): - self._load_jobs(root["jobs"], fileId) + self._load_jobs(root["jobs"], file_id) if (root.__contains__("import")): self._load_import(root["import"]) pass @@ -371,19 +371,19 @@ class ConfigParser(): def add_service_socket(self, item, service): parser = ServiceSocketParser(self) parser.create(item, service) - self._serviceSockets[parser.get_name()] = parser + self._service_sockets[parser.get_name()] = parser def add_service_file(self, item, service): parser = ServiceFileParser(self) parser.create(item, service) - self._serviceFiles[parser.get_name()] = parser + self._service_files[parser.get_name()] = parser def get_job_id(self): - self._jobId = self._jobId + 1 - return self._jobId + self._job_id = self._job_id + 1 + return self._job_id def get_service_id(self): - self._serviceId = self._serviceId + 1 + self._service_id = self._service_id + 1 return self._serviceId def dump_config(self): -- Gitee From a4a33b2beb5f073ea75ceb7cf50872b524f2ac5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 11:56:20 +0000 Subject: [PATCH 5/8] update tools/startup_guard/config_parser_mgr/cfg/config_parser.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- .../config_parser_mgr/cfg/config_parser.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py index daf7856..97f9241 100644 --- a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py +++ b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py @@ -53,13 +53,13 @@ class ItemParser(dict): return None # get value form json array - def get_strings_value(self, jsonStrArray): - if jsonStrArray == None or len(jsonStrArray) == 0: + def get_strings_value(self, json_str_array): + if json_str_array == None or len(json_str_array) == 0: return "" - string = jsonStrArray[0] - for i in range(1, len(jsonStrArray)): - string = "{}@{}".format(string, jsonStrArray[i]) + string = json_str_array[0] + for i in range(1, len(json_str_array)): + string = "{}@{}".format(string, json_str_array[i]) return string class CmdParser(ItemParser): @@ -324,7 +324,7 @@ class ConfigParser(): with open(path, encoding='utf-8') as content: try: root = json.load(content) - file_id = self.add_File(file_name) + file_id = self.add_file(file_name) if not isinstance(root, dict): raise Exception("root type error") if (root.__contains__("services")): @@ -337,7 +337,7 @@ class ConfigParser(): except: pass - def add_File(self, file_name): + def add_file(self, file_name): if self._files.get(file_name): return self._files.get(file_name).get("fileId") self._file_id = self._file_id + 1 -- Gitee From 50b021843cc7a4b9a779f38e383cfdf073f7adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 12:15:06 +0000 Subject: [PATCH 6/8] update tools/startup_guard/startup_checker/cmds_rule.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- tools/startup_guard/startup_checker/cmds_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/startup_guard/startup_checker/cmds_rule.py b/tools/startup_guard/startup_checker/cmds_rule.py index 3c846a9..88efbb7 100644 --- a/tools/startup_guard/startup_checker/cmds_rule.py +++ b/tools/startup_guard/startup_checker/cmds_rule.py @@ -21,7 +21,7 @@ import json from .base_rule import BaseRule -class cmdRule(BaseRule): +class CmdRule(BaseRule): RULE_NAME = "NO-Config-Cmds-In-Init" def __init__(self, mgr, args): -- Gitee From 366bc57bd2690c880f8dd8be3d552bba6508e261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 12:15:36 +0000 Subject: [PATCH 7/8] update tools/startup_guard/startup_checker/__init__.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- tools/startup_guard/startup_checker/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/startup_guard/startup_checker/__init__.py b/tools/startup_guard/startup_checker/__init__.py index 1bad042..298b3b6 100755 --- a/tools/startup_guard/startup_checker/__init__.py +++ b/tools/startup_guard/startup_checker/__init__.py @@ -16,14 +16,14 @@ # limitations under the License. # -from .cmds_rule import cmdRule +from .cmds_rule import CmdRule from .system_parameter_rules import SystemParameterRule from .user_group_rule import UserGroupModuleRule from .plug_in_rule import PlugInModuleRule def check_all_rules(mgr, args): rules = [ - cmdRule, + CmdRule, SystemParameterRule, UserGroupModuleRule, PlugInModuleRule, -- Gitee From 6f0ff7a04660c5207c8aa1c02f399f49974190d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E5=9C=B0=E7=94=BB=E7=8C=AB?= Date: Mon, 15 Apr 2024 12:18:05 +0000 Subject: [PATCH 8/8] update tools/startup_guard/startup_checker/system_parameter_rules.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 雪地画猫 --- tools/startup_guard/startup_checker/system_parameter_rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/startup_guard/startup_checker/system_parameter_rules.py b/tools/startup_guard/startup_checker/system_parameter_rules.py index 1b71c8f..d23c3bc 100644 --- a/tools/startup_guard/startup_checker/system_parameter_rules.py +++ b/tools/startup_guard/startup_checker/system_parameter_rules.py @@ -22,7 +22,7 @@ class SystemParameterRule(BaseRule): RULE_NAME = "NO-Config-SystemParameter-In-INIT" CONFIG_DAC_MAX_NUM = 200 def __check__(self): - return self._check_Param_in_init() + return self._check_param_in_init() def _check_param_name(self, param_name, empty_flag): # len: (0, 96] @@ -47,7 +47,7 @@ class SystemParameterRule(BaseRule): return False return True - def _check_Param_in_init(self): + def _check_param_in_init(self): passed = True value_empty_flag = True white_list =self.get_white_lists() -- Gitee