oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed being unable to specify all addresses in acl rule

Browse Source
This commit is contained in:
Marek Wolan
2024-01-25 15:17:09 +00:00
parent 0056bfddee
commit 2ba05e7348
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/primaite/game/agent/actions.py
View File

@@ -453,27 +453,33 @@ class NetworkACLAddRuleAction(AbstractAction):
protocol = self.manager.get_internet_protocol_by_idx(protocol_id - 2) protocol = self.manager.get_internet_protocol_by_idx(protocol_id - 2)
# subtract 2 to account for UNUSED=0 and ALL=1. # subtract 2 to account for UNUSED=0 and ALL=1.
if source_ip_id in [0, 1]: if source_ip_id == 0:
return ["do_nothing"] # invalid formulation
elif source_ip_id == 1:
src_ip = "ALL" src_ip = "ALL"
return ["do_nothing"] # NOT SUPPORTED, JUST DO NOTHING IF WE COME ACROSS THIS
else: else:
src_ip = self.manager.get_ip_address_by_idx(source_ip_id - 2) src_ip = self.manager.get_ip_address_by_idx(source_ip_id - 2)
# subtract 2 to account for UNUSED=0, and ALL=1 # subtract 2 to account for UNUSED=0, and ALL=1
if source_port_id == 1: if source_port_id == 0:
return ["do_nothing"] # invalid formulation
elif source_port_id == 1:
src_port = "ALL" src_port = "ALL"
else: else:
src_port = self.manager.get_port_by_idx(source_port_id - 2) src_port = self.manager.get_port_by_idx(source_port_id - 2)
# subtract 2 to account for UNUSED=0, and ALL=1 # subtract 2 to account for UNUSED=0, and ALL=1
if dest_ip_id in (0, 1): if source_ip_id == 0:
return ["do_nothing"] # invalid formulation
elif dest_ip_id == 1:
dst_ip = "ALL" dst_ip = "ALL"
return ["do_nothing"] # NOT SUPPORTED, JUST DO NOTHING IF WE COME ACROSS THIS
else: else:
dst_ip = self.manager.get_ip_address_by_idx(dest_ip_id - 2) dst_ip = self.manager.get_ip_address_by_idx(dest_ip_id - 2)
# subtract 2 to account for UNUSED=0, and ALL=1 # subtract 2 to account for UNUSED=0, and ALL=1
if dest_port_id == 1: if dest_port_id == 0:
return ["do_nothing"] # invalid formulation
elif dest_port_id == 1:
dst_port = "ALL" dst_port = "ALL"
else: else:
dst_port = self.manager.get_port_by_idx(dest_port_id - 2) dst_port = self.manager.get_port_by_idx(dest_port_id - 2)

4
src/primaite/simulator/network/hardware/nodes/router.py
View File

@@ -162,9 +162,9 @@ class AccessControlList(SimComponent):
func=lambda request, context: self.add_rule( func=lambda request, context: self.add_rule(
ACLAction[request[0]], ACLAction[request[0]],
None if request[1] == "ALL" else IPProtocol[request[1]], None if request[1] == "ALL" else IPProtocol[request[1]],
IPv4Address(request[2]), None if request[2] == "ALL" else IPv4Address(request[2]),
None if request[3] == "ALL" else Port[request[3]], None if request[3] == "ALL" else Port[request[3]],
IPv4Address(request[4]), None if request[4] == "ALL" else IPv4Address(request[4]),
None if request[5] == "ALL" else Port[request[5]], None if request[5] == "ALL" else Port[request[5]],
int(request[6]), int(request[6]),
) )