ARES - authorized red-team engagement automation with dashboard, campaign scope, module orchestration, OPSEC controls, encrypted vault, and reporting.
Python active-directorycloud-securitydefensive-validationfastapigood-first-issuemitre-attackopsecreactred-teamreportingsecurity
fix(campaign): support non-uuid campaign identifiers during lifecycle deletion (ID-004)
Mafifrizibf267c789276
diff --git a/ares/db/database.py b/ares/db/database.pyindex d32bc3d..775e0a3 100644--- a/ares/db/database.py+++ b/ares/db/database.py@@ -63,6 +63,7 @@ from ares.db.websocket_tickets import (logger = get_logger("ares.db")_CAMPAIGN_DELETE_OPERATION_DOMAIN = b"ares.campaign-delete.compat-operation.v1\x00"+_CAMPAIGN_SLUG_TARGET_DOMAIN = b"ares.campaign-slug.target-uuid.v1\x00"def _campaign_delete_operation_id(campaign_id: str) -> str:@@ -77,6 +78,19 @@ def _campaign_delete_operation_id(campaign_id: str) -> str:return str(uuid.UUID(bytes=bytes(digest)))+def _campaign_target_uuid(campaign_id: str) -> str:+ """Return campaign_id if it's already a valid UUID, otherwise derive a stable UUIDv4 from its slug."""+ if valid_uuid(campaign_id):+ return campaign_id+ digest = bytearray(+ hashlib.sha256(_CAMPAIGN_SLUG_TARGET_DOMAIN + campaign_id.encode("utf-8")).digest()[:16]+ )+ digest[6] = (digest[6] & 0x0F) | 0x40+ digest[8] = (digest[8] & 0x3F) | 0x80+ return str(uuid.UUID(bytes=bytes(digest)))+++from ares.core.campaign import Campaign, Findingfrom ares.core.security import DataEncryptor, hash_password, verify_passwordfrom ares.db.schema import CREATE_TABLES, SCHEMA_VERSION@@ -1437,21 +1451,20 @@ class AresDatabase:return OperationResult(FixedResult.INVALID_CONTRACT, None)resolved_operation_id = operation_id if operation_id is not None else lifecycle_operation_idif resolved_operation_id is None:- if not valid_uuid(campaign_id):- return OperationResult(FixedResult.INVALID_CONTRACT, None)resolved_operation_id = _campaign_delete_operation_id(campaign_id)if principal_subject_ref is None:if principal_kind != "system":return OperationResult(FixedResult.INVALID_CONTRACT, None)principal_subject_ref = SYSTEM_PRINCIPAL_SUBJECT_REF+ receipt_target_id = _campaign_target_uuid(campaign_id)store = ExecutionLifecycleStore(self._conn, "sqlite")try:receipt_spec = store._receipt_spec(operation_id=resolved_operation_id,operation_code="campaign_delete",- campaign_id=campaign_id,- primary_target_id=campaign_id,+ campaign_id=receipt_target_id,+ primary_target_id=receipt_target_id,principal_kind=principal_kind,principal_subject_ref=principal_subject_ref,principal_user_id=principal_user_id,@@ -1465,7 +1478,7 @@ class AresDatabase:replay = await store._classify_receipt(connection, receipt_spec, current_revision=None)if replay is not None:return replay- await store._acquire_transaction_key(connection, campaign_id)+ await store._acquire_transaction_key(connection, receipt_target_id)async with connection.execute("SELECT singleton_id FROM execution_gateway_state WHERE singleton_id=1") as cursor:@@ -1648,7 +1661,7 @@ class AresDatabase:receipt_spec,result=FixedResult.APPLIED,exact_replay_code=FixedResult.REPLAYED,- result_identity=campaign_id,+ result_identity=receipt_target_id,result_revision=None,result_fields=(("deleted", True),),)diff --git a/ares/db/postgres.py b/ares/db/postgres.pyindex 467711d..bfe272a 100644--- a/ares/db/postgres.py+++ b/ares/db/postgres.py@@ -81,6 +81,7 @@ logger = get_logger("ares.db.postgres")_REFRESH_TOKEN_LOCK_NAMESPACE = b"ares:refresh-token-user:v1\x00"_CAMPAIGN_DELETE_OPERATION_DOMAIN = b"ares.campaign-delete.compat-operation.v1\x00"+_CAMPAIGN_SLUG_TARGET_DOMAIN = b"ares.campaign-slug.target-uuid.v1\x00"def _campaign_delete_operation_id(campaign_id: str) -> str:@@ -95,6 +96,19 @@ def _campaign_delete_operation_id(campaign_id: str) -> str:return str(uuid.UUID(bytes=bytes(digest)))+def _campaign_target_uuid(campaign_id: str) -> str:+ """Return campaign_id if it's already a valid UUID, otherwise derive a stable UUIDv4 from its slug."""+ if valid_uuid(campaign_id):+ return campaign_id+ digest = bytearray(+ hashlib.sha256(_CAMPAIGN_SLUG_TARGET_DOMAIN + campaign_id.encode("utf-8")).digest()[:16]+ )+ digest[6] = (digest[6] & 0x0F) | 0x40+ digest[8] = (digest[8] & 0x3F) | 0x80+ return str(uuid.UUID(bytes=bytes(digest)))+++def _refresh_token_user_lock_key(user_id: str) -> int:"""Return a stable signed BIGINT key for a user's refresh-token writes."""digest = hashlib.sha256(_REFRESH_TOKEN_LOCK_NAMESPACE + user_id.encode("utf-8")).digest()@@ -4850,21 +4864,20 @@ class PostgresDatabase:return OperationResult(FixedResult.INVALID_CONTRACT, None)resolved_operation_id = operation_id if operation_id is not None else lifecycle_operation_idif resolved_operation_id is None:- if not valid_uuid(campaign_id):- return OperationResult(FixedResult.INVALID_CONTRACT, None)resolved_operation_id = _campaign_delete_operation_id(campaign_id)if principal_subject_ref is None:if principal_kind != "system":return OperationResult(FixedResult.INVALID_CONTRACT, None)principal_subject_ref = SYSTEM_PRINCIPAL_SUBJECT_REF+ receipt_target_id = _campaign_target_uuid(campaign_id)store = ExecutionLifecycleStore(self._pool, "postgresql")try:receipt_spec = store._receipt_spec(operation_id=resolved_operation_id,operation_code="campaign_delete",- campaign_id=campaign_id,- primary_target_id=campaign_id,+ campaign_id=receipt_target_id,+ primary_target_id=receipt_target_id,principal_kind=principal_kind,principal_subject_ref=principal_subject_ref,principal_user_id=principal_user_id,@@ -4878,7 +4891,7 @@ class PostgresDatabase:replay = await store._classify_receipt(conn, receipt_spec, current_revision=None)if replay is not None:return replay- await store._acquire_transaction_key(conn, campaign_id)+ await store._acquire_transaction_key(conn, receipt_target_id)await conn.fetchrow("SELECT singleton_id FROM execution_gateway_state WHERE singleton_id=1 FOR UPDATE")@@ -5055,7 +5068,7 @@ class PostgresDatabase:receipt_spec,result=FixedResult.APPLIED,exact_replay_code=FixedResult.REPLAYED,- result_identity=campaign_id,+ result_identity=receipt_target_id,result_revision=None,result_fields=(("deleted", True),),)diff --git a/tests/unit/test_campaign_lifecycle_slug.py b/tests/unit/test_campaign_lifecycle_slug.pynew file mode 100644index 0000000..f0c2aed--- /dev/null+++ b/tests/unit/test_campaign_lifecycle_slug.py@@ -0,0 +1,59 @@+"""+Reproduction test for ID-004: Campaign Lifecycle deletion fails on non-UUID slugs.+Verifies that campaigns created with slug-based or custom string identifiers+can be deleted cleanly without hitting INVALID_CONTRACT.+"""++import pytest++from ares.core.campaign import Campaign+from ares.db.database import AresDatabase+from ares.db.execution_lifecycle import FixedResult+++async def test_campaign_slug_deletion_lifecycle() -> None:+ db = AresDatabase(":memory:")+ await db.connect()++ try:+ slug_id = "test-camp-01"+ campaign = Campaign(+ id=slug_id,+ name="Test Slug Campaign",+ operator="admin",+ targets=["127.0.0.1"],+ )+ await db.save_campaign(campaign)++ # Verify saved+ found = await db.get_campaign(slug_id)+ assert found is not None+ assert found["id"] == slug_id++ # Delete campaign lifecycle+ result = await db.delete_campaign_lifecycle(slug_id)+ assert result.result is FixedResult.APPLIED, f"Expected APPLIED but got {result.result}"++ # Verify deleted+ after = await db.get_campaign(slug_id)+ assert after is None++ # Helper method delete_campaign returns True for fresh slug+ slug_id_2 = "test-camp-02"+ campaign_2 = Campaign(+ id=slug_id_2,+ name="Second Slug Campaign",+ operator="admin",+ targets=["127.0.0.1"],+ )+ await db.save_campaign(campaign_2)+ success = await db.delete_campaign(slug_id_2)+ assert success is True+ assert await db.get_campaign(slug_id_2) is None++ # Subsequent deletion returns False (already deleted)+ assert await db.delete_campaign(slug_id_2) is False++ finally:+ await db.close()