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

#2449 fix observation integration

Browse Source
This commit is contained in:
Marek Wolan
2024-04-03 15:58:01 +01:00
parent 985628f2da
commit a4caa3dfe4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/primaite/game/agent/observations/file_system_observations.py
View File

@@ -205,7 +205,7 @@ class FolderObservation(AbstractObservation, identifier="FOLDER"):
:return: Constructed folder observation instance. :return: Constructed folder observation instance.
:rtype: FolderObservation :rtype: FolderObservation
""" """
where = parent_where + ["folders", config.folder_name] where = parent_where + ["file_system", "folders", config.folder_name]
# pass down shared/common config items # pass down shared/common config items
for file_config in config.files: for file_config in config.files:

2
src/primaite/game/agent/observations/firewall_observation.py
View File

@@ -215,7 +215,7 @@ class FirewallObservation(AbstractObservation, identifier="FIREWALL"):
:rtype: FirewallObservation :rtype: FirewallObservation
""" """
return cls( return cls(
where=parent_where + ["nodes", config.hostname], where=parent_where + [config.hostname],
ip_list=config.ip_list, ip_list=config.ip_list,
wildcard_list=config.wildcard_list, wildcard_list=config.wildcard_list,
port_list=config.port_list, port_list=config.port_list,

2
src/primaite/game/agent/observations/host_observations.py
View File

@@ -216,7 +216,7 @@ class HostObservation(AbstractObservation, identifier="HOST"):
if parent_where == []: if parent_where == []:
where = ["network", "nodes", config.hostname] where = ["network", "nodes", config.hostname]
else: else:
where = parent_where + ["nodes", config.hostname] where = parent_where + [config.hostname]
# Pass down shared/common config items # Pass down shared/common config items
for folder_config in config.folders: for folder_config in config.folders:

2
src/primaite/game/agent/observations/node_observations.py
View File

@@ -164,7 +164,7 @@ class NodesObservation(AbstractObservation, identifier="NODES"):
:return: Constructed nodes observation instance. :return: Constructed nodes observation instance.
:rtype: NodesObservation :rtype: NodesObservation
""" """
if parent_where is None: if not parent_where:
where = ["network", "nodes"] where = ["network", "nodes"]
else: else:
where = parent_where + ["nodes"] where = parent_where + ["nodes"]

2
src/primaite/game/agent/observations/router_observation.py
View File

@@ -124,7 +124,7 @@ class RouterObservation(AbstractObservation, identifier="ROUTER"):
:return: Constructed router observation instance. :return: Constructed router observation instance.
:rtype: RouterObservation :rtype: RouterObservation
""" """
where = parent_where + ["nodes", config.hostname] where = parent_where + [config.hostname]
if config.acl is None: if config.acl is None:
config.acl = ACLObservation.ConfigSchema() config.acl = ACLObservation.ConfigSchema()

6
src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
View File

@@ -592,7 +592,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"obs['ACL']" "obs['NODES']['ROUTER0']"
] ]
}, },
{ {
@@ -616,12 +616,12 @@
" tries += 1\n", " tries += 1\n",
" obs, reward, terminated, truncated, info = env.step(0)\n", " obs, reward, terminated, truncated, info = env.step(0)\n",
"\n", "\n",
" if obs['NODES'][6]['NICS'][1]['NMNE']['outbound'] == 1:\n", " if obs['NODES']['HOST5']['NICS'][1]['NMNE']['outbound'] == 1:\n",
" # client 1 has NMNEs, let's block it\n", " # client 1 has NMNEs, let's block it\n",
" obs, reward, terminated, truncated, info = env.step(50) # block client 1\n", " obs, reward, terminated, truncated, info = env.step(50) # block client 1\n",
" print(\"blocking client 1\")\n", " print(\"blocking client 1\")\n",
" break\n", " break\n",
" elif obs['NODES'][7]['NICS'][1]['NMNE']['outbound'] == 1:\n", " elif obs['NODES']['HOST6']['NICS'][1]['NMNE']['outbound'] == 1:\n",
" # client 2 has NMNEs, so let's block it\n", " # client 2 has NMNEs, so let's block it\n",
" obs, reward, terminated, truncated, info = env.step(51) # block client 2\n", " obs, reward, terminated, truncated, info = env.step(51) # block client 2\n",
" print(\"blocking client 2\")\n", " print(\"blocking client 2\")\n",