From 2fa7b4583e7435c51e3c40bc6e00c03b19c0bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Fri, 3 Jan 2020 17:51:55 +0100 Subject: [PATCH] improved cli. removed useless import --- bin/finder.py | 161 +++++++++--------- .../__pycache__/finder.cpython-38.pyc | Bin 3427 -> 3427 bytes git_vuln_finder/finder.py | 2 +- 3 files changed, 82 insertions(+), 81 deletions(-) diff --git a/bin/finder.py b/bin/finder.py index 9e26600..7ac005e 100644 --- a/bin/finder.py +++ b/bin/finder.py @@ -7,7 +7,7 @@ # # This software is part of cve-search.org # -# Copyright (c) 2019 Alexandre Dulaunoy - a@foo.be +# Copyright (c) 2019-2020 Alexandre Dulaunoy - a@foo.be import git @@ -17,102 +17,103 @@ import argparse import typing from git_vuln_finder import ( - build_pattern, get_patterns, find_vuln, - summary, - extract_cve + summary ) -PATTERNS_PATH="./git_vuln_finder/patterns" - -parser = argparse.ArgumentParser(description = "Finding potential software vulnerabilities from git commit messages.", epilog = "More info: https://github.com/cve-search/git-vuln-finder") -parser.add_argument("-v", help="increase output verbosity", action="store_true") -parser.add_argument("-r", type=str, help="git repository to analyse") -parser.add_argument("-o", type=str, help="Output format: [json]", default="json") -parser.add_argument("-s", type=str, help="State of the commit found", default="under-review") -parser.add_argument("-p", type=str, help="Matching pattern to use: [vulnpatterns, cryptopatterns, cpatterns] - the pattern 'all' is used to match all the patterns at once.", default="vulnpatterns") -parser.add_argument("-c", help="output only a list of the CVE pattern found in commit messages (disable by default)", action="store_true") -parser.add_argument("-t", help="Include tags matching a specific commit", action="store_true") -args = parser.parse_args() - - -patterns = get_patterns() -vulnpatterns = patterns["en"]["medium"]["vuln"] -cryptopatterns = patterns["en"]["medium"]["crypto"] -cpatterns = patterns["en"]["medium"]["c"] - -if args.p == "vulnpatterns": - defaultpattern = vulnpatterns -elif args.p == "cryptopatterns": - defaultpattern = cryptopatterns -elif args.p == "cpatterns": - defaultpattern = cpatterns -elif args.p == "all": - defaultpattern = [vulnpatterns, cryptopatterns, cpatterns] -else: - parser.print_usage() - parser.exit() - -if not args.r: - parser.print_usage() - parser.exit() -else: - repo = git.Repo(args.r) - - -found = 0 -all_potential_vulnerabilities = {} -cve_found = set() def main(): - pass + """Point of entry for the script. + """ + # Parsing arguments + parser = argparse.ArgumentParser(description = "Finding potential software vulnerabilities from git commit messages.", epilog = "More info: https://github.com/cve-search/git-vuln-finder") + parser.add_argument("-v", help="increase output verbosity", action="store_true") + parser.add_argument("-r", type=str, help="git repository to analyse") + parser.add_argument("-o", type=str, help="Output format: [json]", default="json") + parser.add_argument("-s", type=str, help="State of the commit found", default="under-review") + parser.add_argument("-p", type=str, help="Matching pattern to use: [vulnpatterns, cryptopatterns, cpatterns] - the pattern 'all' is used to match all the patterns at once.", default="vulnpatterns") + parser.add_argument("-c", help="output only a list of the CVE pattern found in commit messages (disable by default)", action="store_true") + parser.add_argument("-t", help="Include tags matching a specific commit", action="store_true") + args = parser.parse_args() -repo_heads = repo.heads -repo_heads_names = [h.name for h in repo_heads] -print(repo_heads_names, file=sys.stderr) -origin = repo.remotes.origin.url -if args.t: - tagmap = {} - for t in repo.tags: - tagmap.setdefault(repo.commit(t).hexsha, []).append(str(t)) + patterns = get_patterns() + vulnpatterns = patterns["en"]["medium"]["vuln"] + cryptopatterns = patterns["en"]["medium"]["crypto"] + cpatterns = patterns["en"]["medium"]["c"] -for branch in repo_heads_names: - commits = list(repo.iter_commits(branch)) - defaultpattern - for commit in commits: - if isinstance(defaultpattern, typing.Pattern): - ret = find_vuln(commit, pattern=defaultpattern, versbose=args.v) - if ret: - rcommit = ret['commit'] - _, potential_vulnerabilities = summary(rcommit, - branch, - defaultpattern, - origin=origin, - vuln_match=ret['match'], - tags_matching=args.t, - commit_state=args.s) - all_potential_vulnerabilities.update(potential_vulnerabilities) - found += 1 - elif isinstance(defaultpattern, list): - for p in defaultpattern: - ret = find_vuln(commit, pattern=p, versbose=args.v) + + if args.p == "vulnpatterns": + defaultpattern = vulnpatterns + elif args.p == "cryptopatterns": + defaultpattern = cryptopatterns + elif args.p == "cpatterns": + defaultpattern = cpatterns + elif args.p == "all": + defaultpattern = [vulnpatterns, cryptopatterns, cpatterns] + else: + parser.print_usage() + parser.exit() + + if not args.r: + parser.print_usage() + parser.exit() + else: + repo = git.Repo(args.r) + + + # Initialization of the variables for the results + found = 0 + all_potential_vulnerabilities = {} + cve_found = set() + + + repo_heads = repo.heads + repo_heads_names = [h.name for h in repo_heads] + print(repo_heads_names, file=sys.stderr) + origin = repo.remotes.origin.url + if args.t: + tagmap = {} + for t in repo.tags: + tagmap.setdefault(repo.commit(t).hexsha, []).append(str(t)) + + for branch in repo_heads_names: + commits = list(repo.iter_commits(branch)) + defaultpattern + for commit in commits: + if isinstance(defaultpattern, typing.Pattern): + ret = find_vuln(commit, pattern=defaultpattern, versbose=args.v) if ret: rcommit = ret['commit'] _, potential_vulnerabilities = summary(rcommit, branch, - p, + defaultpattern, origin=origin, vuln_match=ret['match'], tags_matching=args.t, commit_state=args.s) all_potential_vulnerabilities.update(potential_vulnerabilities) found += 1 -if not args.c: - print(json.dumps(all_potential_vulnerabilities)) -elif args.c: - print(json.dumps(list(cve_found))) + elif isinstance(defaultpattern, list): + for p in defaultpattern: + ret = find_vuln(commit, pattern=p, versbose=args.v) + if ret: + rcommit = ret['commit'] + _, potential_vulnerabilities = summary(rcommit, + branch, + p, + origin=origin, + vuln_match=ret['match'], + tags_matching=args.t, + commit_state=args.s) + all_potential_vulnerabilities.update(potential_vulnerabilities) + found += 1 -print("{} CVE referenced found in commit(s)".format(len(list(cve_found))), file=sys.stderr) -print("Total potential vulnerability found in {} commit(s)".format(found), file=sys.stderr) + if not args.c: + print(json.dumps(all_potential_vulnerabilities)) + elif args.c: + print(json.dumps(list(cve_found))) + + print("{} CVE referenced found in commit(s)".format(len(list(cve_found))), file=sys.stderr) + print("Total potential vulnerability found in {} commit(s)".format(found), file=sys.stderr) diff --git a/git_vuln_finder/__pycache__/finder.cpython-38.pyc b/git_vuln_finder/__pycache__/finder.cpython-38.pyc index be0a36cf32dcef58ba7f807104e399bf2f83b580..75166b04a83ec699f8a0b7eed039b4307f8ec0ce 100644 GIT binary patch delta 28 icmaDX^;n8Gl$V!_0SHR-`QvVG