Skip to content

Do not extend the networks in teh whitebox env #335

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

Merged
ondrej-lukas merged 4 commits into from
Jul 24, 2025
Merged

Do not extend the networks in teh whitebox env #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4158bd8
Do not extend the networks in teh whitebox env
ondrej-lukas Jul 23, 2025
977981e
Update python-checks.yml
ondrej-lukas Jul 24, 2025
eac4e89
Add required path parameter in DataConfig
ondrej-lukas Jul 24, 2025
cbaf414
Update python-checks.yml
ondrej-lukas Jul 24, 2025
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
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/one_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -169,7 +172,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -209,7 +213,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/scenario_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -162,7 +165,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -202,7 +206,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/smaller_scenario_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -163,7 +166,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -203,7 +207,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/test_scenario_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -160,7 +163,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -200,7 +204,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
12 changes: 6 additions & 6 deletions AIDojoCoordinator/scenarios/three_net_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
version="10.0.19041",
local=False,
private_data=[
cyst_cfg.DataConfig(owner="User1", description="DataFromServer1"),
cyst_cfg.DataConfig(owner="User2", description="Data2FromServer1"),
cyst_cfg.DataConfig(owner="User1", description="Data3FromServer1"),
cyst_cfg.DataConfig(owner="User1", description="DataFromServer1", path="/etc/"),
cyst_cfg.DataConfig(owner="User2", description="Data2FromServer1", path="/etc/"),
cyst_cfg.DataConfig(owner="User1", description="Data3FromServer1", path="/etc/"),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
authentication_providers=[],
Expand Down Expand Up @@ -162,7 +162,7 @@
version="1.4.54",
local=False,
private_data=[
cyst_cfg.DataConfig(owner="User2", description="WebServerData"),
cyst_cfg.DataConfig(owner="User2", description="WebServerData", path="/etc/"),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
authentication_providers=[],
Expand Down Expand Up @@ -310,7 +310,7 @@
version="10.0.19041",
local=False,
private_data=[
cyst_cfg.DataConfig(owner="admin", description="passwords"),
cyst_cfg.DataConfig(owner="admin", description="passwords", path="/etc/"),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
authentication_providers=[],
Expand Down Expand Up @@ -410,7 +410,7 @@
owner="postgresql",
version="14.3.0",
private_data=[
cyst_cfg.DataConfig(owner="User1", description="DatabaseData")
cyst_cfg.DataConfig(owner="User1", description="DatabaseData", path="/etc/")
],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
9 changes: 6 additions & 3 deletions AIDojoCoordinator/scenarios/tiny_scenario_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/two_nets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -162,7 +165,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -202,7 +206,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
15 changes: 10 additions & 5 deletions AIDojoCoordinator/scenarios/two_nets_small.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down Expand Up @@ -163,7 +166,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DatabaseData"
description="DatabaseData",
path="/etc/"
)],
local=False,
access_level=cyst_cfg.AccessLevel.LIMITED
Expand Down Expand Up @@ -203,7 +207,8 @@
private_data=[
cyst_cfg.DataConfig(
owner="User2",
description="WebServerData"
description="WebServerData",
path="/etc/"
),
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
9 changes: 6 additions & 3 deletions AIDojoCoordinator/scenarios/two_nets_tiny.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@
private_data=[
cyst_cfg.DataConfig(
owner="User1",
description="DataFromServer1"
description="DataFromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User2",
description="Data2FromServer1"
description="Data2FromServer1",
path="/etc/"
),
cyst_cfg.DataConfig(
owner="User1",
description="Data3FromServer1"
description="Data3FromServer1",
path="/etc/"
)
],
access_level=cyst_cfg.AccessLevel.LIMITED,
Expand Down
4 changes: 4 additions & 0 deletions AIDojoCoordinator/worlds/WhiteBoxNSGCoordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ def _generate_all_actions(self)-> list:
self.logger.debug(action)
self._all_actions = actions


def _create_state_from_view(self, view, add_neighboring_nets = True):
return super()._create_state_from_view(view, add_neighboring_nets=False)

if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="NetSecGame Coordinator Server Author: Ondrej Lukas ondrej.lukas@aic.fel.cvut.cz",
Expand Down