Skip to content

armgit / ARES

Public Imported from GitHub
0

ARES - authorized red-team engagement automation with dashboard, campaign scope, module orchestration, OPSEC controls, encrypted vault, and reporting.

fix(cloud): allow flexible key lengths and aws_ key aliases in AWSParams and AWSPrivescParams

Mafifrizidab90ee44ffc
diff --git a/ares/modules/params.py b/ares/modules/params.py
index 846bed1..a071586 100644
--- a/ares/modules/params.py
+++ b/ares/modules/params.py
@@ -265,7 +265,7 @@ class DCSyncParams(DomainAuthParams):
class AWSParams(ModuleParams):
profile: str | None = param("AWS named profile", required=False, default=None)
access_key: str | None = param(
- "AWS Access Key ID", required=False, default=None, min_length=16, max_length=128
+ "AWS Access Key ID", required=False, default=None, max_length=128
)
secret_key: SecretParam | None = param(
"AWS Secret Key", required=False, default=None, secret=True
@@ -280,6 +280,22 @@ class AWSParams(ModuleParams):
pattern=r"^[a-z]{2}-[a-z]+-\d$",
)
+ @model_validator(mode="before")
+ @classmethod
+ def _normalize_aws_keys(cls, data: Any) -> Any:
+ if isinstance(data, dict):
+ if "aws_access_key" in data and not data.get("access_key"):
+ data["access_key"] = data["aws_access_key"]
+ if "aws_secret_key" in data and not data.get("secret_key"):
+ data["secret_key"] = data["aws_secret_key"]
+ if "aws_session_token" in data and not data.get("session_token"):
+ data["session_token"] = data["aws_session_token"]
+ if "aws_region" in data and not data.get("region"):
+ data["region"] = data["aws_region"]
+ if "aws_profile" in data and not data.get("profile"):
+ data["profile"] = data["aws_profile"]
+ return data
+
class LinuxPrivescParams(ModuleParams):
host: str = param(
@@ -417,7 +433,7 @@ class AWSPrivescParams(ModuleParams):
"""cloud.aws_privesc — AWS IAM privilege escalation."""
access_key: str | None = param(
- "AWS Access Key ID", required=False, default=None, min_length=16, max_length=128
+ "AWS Access Key ID", required=False, default=None, max_length=128
)
secret_key: SecretParam | None = param(
"AWS Secret Key", required=False, default=None, secret=True
@@ -432,6 +448,20 @@ class AWSPrivescParams(ModuleParams):
pattern=r"^[a-z]{2}-[a-z]+-\d+$",
)
+ @model_validator(mode="before")
+ @classmethod
+ def _normalize_aws_keys(cls, data: Any) -> Any:
+ if isinstance(data, dict):
+ if "aws_access_key" in data and not data.get("access_key"):
+ data["access_key"] = data["aws_access_key"]
+ if "aws_secret_key" in data and not data.get("secret_key"):
+ data["secret_key"] = data["aws_secret_key"]
+ if "aws_session_token" in data and not data.get("session_token"):
+ data["session_token"] = data["aws_session_token"]
+ if "aws_region" in data and not data.get("region"):
+ data["region"] = data["aws_region"]
+ return data
+
class AzureParams(ModuleParams):
"""cloud.azure — Azure resource enumeration."""