Skip to content

config update: Add severity_modification_type option #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlferrer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

config update: Add severity_modification_type option #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions navi/plugins/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ def search_for_path():
create_vuln_path_table()

pattern = r'''(?ix)
(?:
(?:
[a-zA-Z]:\\(?:[\w\s().-]+\\)*[\w\s().-]{3,} # Windows path with spaces, parentheses
|
(?:\.{1,2}/|/)(?:[\w.-]+/)*[\w.-]{3,} # Unix-style paths
Expand Down Expand Up @@ -814,8 +814,8 @@ def smtp(server, port, email, password):
create_smtp_table = """CREATE TABLE IF NOT EXISTS smtp (
server text,
port text,
email text,
password text
email text,
password text
);"""
create_table(conn, create_smtp_table)

Expand Down Expand Up @@ -1268,19 +1268,24 @@ def update():
@click.option('--severity', multiple=True, default=["critical", "high", "medium", "low", "info"],
type=click.Choice(["critical", "high", "medium", "low", "info"]),
help='Isolate your update to a particular finding severity')
def full(threads, days, c, v, state, severity):
@click.option('--severity-modification-type', multiple=True, default=["NONE", "RECASTED", "ACCEPTED"],
type=click.Choice(["NONE", "RECASTED", "ACCEPTED"]),
help="Modify severity types to include.")
def full(threads, days, c, v, state, severity, severity_modification_type):
if threads:
threads_check(threads)

exid = '0'

if days is None:
vuln_export(30, exid, threads, c, v, list(state), list(severity),
operator="gte", vpr_score=None, plugins=None)
operator="gte", vpr_score=None, plugins=None,
severity_modification_type=list(severity_modification_type))
asset_export(90, exid, threads, c, v)
else:
vuln_export(days, exid, threads, c, v, list(state), list(severity),
operator="gte", vpr_score=None, plugins=None)
operator="gte", vpr_score=None, plugins=None,
severity_modification_type=list(severity_modification_type))
asset_export(days, exid, threads, c, v)


Expand Down Expand Up @@ -1326,14 +1331,18 @@ def agents():
help="VPR operator")
@click.option("--plugin_id", multiple=True, type=click.INT, default=None,
help="Plugin ID(s) that you want downloaded. Use multiple values for multiple plugins")
def vulns(threads, days, exid, c, v, state, severity, vpr_score, operator, plugin_id):
@click.option('--severity-modification-type', multiple=True, default=["NONE", "RECASTED", "ACCEPTED"],
type=click.Choice(["NONE", "RECASTED", "ACCEPTED"]),
help="Modify severity types to include.")
def vulns(threads, days, exid, c, v, state, severity, vpr_score, operator, plugin_id, severity_modification_type):
if threads:
threads_check(threads)

if exid == ' ':
exid = '0'

vuln_export(days, exid, threads, c, v, list(state), list(severity), vpr_score, operator, list(plugin_id))
vuln_export(days, exid, threads, c, v, list(state), list(severity), vpr_score, operator, list(plugin_id),
severity_modification_type=severity_modification_type))


@update.command(help="Update the Compliance data")
Expand Down
4 changes: 3 additions & 1 deletion navi/plugins/th_vuln_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ def parse_data(chunk_data, chunk_number):
vuln_conn.close()


def vuln_export(days, ex_uuid, threads, category, value, state, severity, vpr_score, operator, plugins):
def vuln_export(days, ex_uuid, threads, category, value, state, severity, vpr_score, operator, plugins, severity_modification_type=None):
start = time.time()

database = r"navi.db"
Expand Down Expand Up @@ -513,6 +513,8 @@ def vuln_export(days, ex_uuid, threads, category, value, state, severity, vpr_sc
pay_load = {"num_assets": 50, "filters": {'last_found': int(day_limit),
"state": state, "severity": severity,
"tag.{}".format(category): "[\"{}\"]".format(value)}}
if severity_modification_type:
pay_load['filters']['severity_modification_type'] = severity_modification_type

try:

Expand Down