This repository was archived by the owner on May 15, 2024. It is now read-only.

Commit 7081173

committed

Merge branch 'release/0.1' into main

2 parents bd41183 + 999398b commit 7081173Copy full SHA for 7081173

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,7 @@ JSONFILE: "./DATA/metasploit-framework/db/modules_metadata_base.json"`
`6`	`6`	`MTSP_OUTFILE_CVE: "./DATA/metasploit_cves.csv"`
`7`	`7`	`MTSP_OUTFILE_ALL: "./DATA/metasploit_all_vul_ids.csv"`
`8`	`8`	`N_RECS: 5`
	`9`	`+`
	`10`	`+# DEBUG=true overrides VERBOSE`
	`11`	`+DEBUG: true`
	`12`	`+VERBOSE: true`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`from mtsp_parser.repo_manager import RepoManager`
`9`	`9`
`10`	`10`	`logger = logging.getLogger()`
`11`		`-logger.setLevel(logging.DEBUG)`
	`11`	`+# we now set this in main`
	`12`	`+# logger.setLevel(logging.DEBUG)`
`12`	`13`	`hdlr = logging.StreamHandler(sys.stderr)`
`13`	`14`	`logger.addHandler(hdlr)`
`14`	`15`
`@@ -23,10 +24,22 @@ def read_config(cfgfile):`
`23`	`24`	`if __name__ == '__main__':`
`24`	`25`	`# load config`
`25`	`26`	`cfg = read_config(CONFIGFILE)`
	`27`	`+ DEBUG = cfg['DEBUG']`
	`28`	`+ VERBOSE = cfg['VERBOSE']`
	`29`	`+`
	`30`	`+ if DEBUG:`
	`31`	`+ logger.setLevel(logging.DEBUG)`
	`32`	`+ elif VERBOSE:`
	`33`	`+ logger.setLevel(logging.INFO)`
	`34`	`+ else:`
	`35`	`+ logger.setLevel(logging.WARN)`
	`36`	`+`
`26`	`37`	`logger.debug("Config values:")`
`27`	`38`	`for k,v in cfg.items():`
`28`	`39`	`logger.debug(f"\t{k}: {v}")`
`29`	`40`
	`41`	`+`
	`42`	`+`
`30`	`43`	`local_data_ = cfg['LOCAL_DATA']`
`31`	`44`	`clone_to_ = cfg['CLONE_TARGET']`
`32`	`45`	`clone_from_ = cfg['GIT_REPO']`

Comments

(0)