Skip to content

Fix inconsistent port type in scan event records [ Fixes #1649] #1652

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
Aarush289 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix inconsistent port type in scan event records [ Fixes #1649] #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aaa9a66
data type of port fixed
Aarush289 Aug 5, 2026
5bcabc0
minor improvement
Aarush289 Aug 5, 2026
3fcedc1
minor fixes
Aarush289 Aug 6, 2026
9278cdf
Merge branch 'master' into port_storage_data_type_fix
Aarush289 Aug 6, 2026
7b83760
fixes as per suggestions by codex
Aarush289 Aug 7, 2026
43552ff
Merge branch 'master' into port_storage_data_type_fix
securestep9 Aug 13, 2026
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
7 changes: 6 additions & 1 deletion nettacker/core/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,12 @@ def get_targets_set(item):
comp_target_set = set(get_targets_set(item) for item in scan_opts_comp)

def get_modules_ports(item):
return (item["target"], item["module_name"], item["port"])
port = item["port"]

if isinstance(port, str) and port.isdigit():
port = int(port)

return (item["target"], item["module_name"], port)

curr_modules_ports = set(get_modules_ports(item) for item in scan_log_curr)
comp_modules_ports = set(get_modules_ports(item) for item in scan_logs_comp)
Expand Down
26 changes: 16 additions & 10 deletions nettacker/core/lib/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,20 @@ def process_conditions(
):
# Remove sensitive keys from headers before submitting to DB
event = remove_sensitive_header_keys(event)
port = (
Comment thread
Aarush289 marked this conversation as resolved.
event.get("ports")
or event.get("port")
or (
event.get("url").split(":")[2].split("/")[0]
if isinstance(event.get("url"), str)
and len(event.get("url").split(":")) >= 3
and event.get("url").split(":")[2].split("/")[0].isdigit()
else ""
)
)
if isinstance(port, str):
if port.isdigit():
port = int(port)
Comment thread
Aarush289 marked this conversation as resolved.
Comment thread
Aarush289 marked this conversation as resolved.
Comment thread
securestep9 marked this conversation as resolved.
if "save_to_temp_events_only" in event.get("response", ""):
submit_temp_logs_to_db(
{
Expand All @@ -130,7 +144,7 @@ def process_conditions(
"module_name": module_name,
"scan_id": scan_id,
"event_name": event["response"]["save_to_temp_events_only"],
"port": event.get("ports", ""),
"port": port,
"event": event,
"data": response,
}
Expand Down Expand Up @@ -159,15 +173,7 @@ def process_conditions(
"target": target,
"module_name": module_name,
"scan_id": scan_id,
"port": event.get("ports")
or event.get("port")
or (
event.get("url").split(":")[2].split("/")[0]
if isinstance(event.get("url"), str)
and len(event.get("url").split(":")) >= 3
and event.get("url").split(":")[2].split("/")[0].isdigit()
else ""
),
"port": port,
"event": " ".join(yaml.dump(event_request_keys).split())
+ " conditions: "
+ " ".join(yaml.dump(event["response"]["conditions_results"]).split()),
Expand Down
Loading