Skip to content

Commit 09c42d1

Browse files
author
Patrick Bareiss
committed
caldera improvements
1 parent 0160862 commit 09c42d1

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

attack_range.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ def init(args):
5555

5656
if config["general"]["cloud_provider"] == "aws":
5757
config.pop("azure")
58+
config.pop("gcp")
5859
controller = AwsController(config)
5960
elif config["general"]["cloud_provider"] == "azure":
6061
config.pop("aws")
62+
config.pop("gcp")
6163
controller = AzureController(config)
6264
elif config["general"]["cloud_provider"] == "gcp":
6365
config.pop("aws")

modules/aws_controller.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,17 @@ def show(self) -> None:
325325
+ "\n\tusername: ubuntu \n\tpassword: "
326326
+ self.config["general"]["attack_range_password"]
327327
)
328+
elif instance_name.startswith("ar-caldera"):
329+
messages.append(
330+
"\nAccess Caldera via:\n\tWeb > http://"
331+
+ instance["NetworkInterfaces"][0]["Association"]["PublicIp"]
332+
+ ":8888\n\tSSH > ssh -i"
333+
+ self.config["aws"]["private_key_path"]
334+
+ " admin@"
335+
+ instance["NetworkInterfaces"][0]["Association"]["PublicIp"]
336+
+ "\n\tusername: admin \n\tpassword: "
337+
+ self.config["general"]["attack_range_password"]
338+
)
328339
else:
329340
response.append(
330341
[instance["Tags"][0]["Value"], instance["State"]["Name"]]

modules/config_handler.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def read_config(self, config_path: str) -> dict:
3030
"simulation",
3131
"zeek_server",
3232
"snort_server",
33+
"caldera_server",
3334
]
3435

3536
for parent_key in parent_keys:

0 commit comments

Comments
 (0)