Loading scan2report.py +12 −8 Original line number Diff line number Diff line Loading @@ -472,7 +472,7 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None rootDir = s2r.rootDir templateDoc = s2r.templateDoc fidAliases = {} fidAliases = get_all_aliases(rootDir) findings = {} services = {} Loading @@ -481,13 +481,6 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None boldStart = '**' boldEnd = '**' # get finding id aliases with open(rootDir + '/plugins/aliases.json', encoding="utf8") as jsonfile: try: fidAliases = json.load(jsonfile) except json.decoder.JSONDecodeError as err: print('Error parsing file ' + rootDir + '/plugins/aliases.json:\n' + format(err)) sys.exit(1) # select profile with open(rootDir + '/plugins/profiles.json', encoding="utf8") as jsonfile: Loading Loading @@ -605,6 +598,17 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None print('Report written:', outfile) def get_all_aliases(rootDir): # get finding id aliases with open(rootDir + '/plugins/aliases.json', encoding="utf8") as jsonfile: try: fidAliases = json.load(jsonfile) except json.decoder.JSONDecodeError as err: print('Error parsing file ' + rootDir + '/plugins/aliases.json:\n' + format(err)) sys.exit(1) return fidAliases def parse_input_file(debug, s2r: Scan2ReportConfig, fidAliases, findings, infile, missingPlugins, rootDir, services, unknownCounter) -> int: hostnames = s2r.hostnames ignore = s2r.ignore Loading Loading
scan2report.py +12 −8 Original line number Diff line number Diff line Loading @@ -472,7 +472,7 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None rootDir = s2r.rootDir templateDoc = s2r.templateDoc fidAliases = {} fidAliases = get_all_aliases(rootDir) findings = {} services = {} Loading @@ -481,13 +481,6 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None boldStart = '**' boldEnd = '**' # get finding id aliases with open(rootDir + '/plugins/aliases.json', encoding="utf8") as jsonfile: try: fidAliases = json.load(jsonfile) except json.decoder.JSONDecodeError as err: print('Error parsing file ' + rootDir + '/plugins/aliases.json:\n' + format(err)) sys.exit(1) # select profile with open(rootDir + '/plugins/profiles.json', encoding="utf8") as jsonfile: Loading Loading @@ -605,6 +598,17 @@ def main(argv, reinit_global_vars: bool = False, s2r: 'Scan2ReportConfig' = None print('Report written:', outfile) def get_all_aliases(rootDir): # get finding id aliases with open(rootDir + '/plugins/aliases.json', encoding="utf8") as jsonfile: try: fidAliases = json.load(jsonfile) except json.decoder.JSONDecodeError as err: print('Error parsing file ' + rootDir + '/plugins/aliases.json:\n' + format(err)) sys.exit(1) return fidAliases def parse_input_file(debug, s2r: Scan2ReportConfig, fidAliases, findings, infile, missingPlugins, rootDir, services, unknownCounter) -> int: hostnames = s2r.hostnames ignore = s2r.ignore Loading