Skip to content
Merged
Changes from all commits
Commits
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
33 changes: 13 additions & 20 deletions src/plugin/manager/ec2/security_group_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,17 @@ def custom_security_group_inbound_rule_info(self, raw_rule, remote, remote_type,

protocol_display = raw_rule.get("protocol_display")

raw_rule.update({"vulnerable_ports": self._get_vulnerable_ports(protocol_display, raw_rule, vulnerable_ports)})
ports = self._get_vulnerable_ports(protocol_display, raw_rule, vulnerable_ports)

raw_rule.update(
{
"vulnerable_ports": ports,
"has_vulnerable_ports": "true" if ports else "false"
}
)

print(raw_rule.get("vulnerable_ports"))
print(raw_rule.get("has_vulnerable_ports"))

return raw_rule

Expand Down Expand Up @@ -303,24 +313,6 @@ def get_instance_name_from_tags(instance):

@staticmethod
def _get_vulnerable_ports(protocol_display: str, raw_rule: dict, vulnerable_ports: str):
# try:
# ports = [int(port.strip()) for port in vulnerable_ports.split(',')]
#
# if protocol_display == "ALL":
# return ports
#
# to_port = raw_rule.get("ToPort")
# from_port = raw_rule.get("FromPort")
#
# if to_port is None or from_port is None:
# return None
#
# filtered_ports = [str(port) for port in ports if from_port <= port <= to_port]
#
# return filtered_ports if filtered_ports else None
# except ValueError:
# raise ERROR_VULNERABLE_PORTS(vulnerable_ports)

try:
ports = []

Expand All @@ -337,6 +329,7 @@ def _get_vulnerable_ports(protocol_display: str, raw_rule: dict, vulnerable_port
ports.append(port)
elif from_port <= target_port <= to_port:
ports.append(port)
return ports if ports else None

return ",".join(ports)
except ValueError:
raise ERROR_VULNERABLE_PORTS(vulnerable_ports)
Loading