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(security): preserve live websocket sessions across bearer jwt expiration (NEW-02)

Mafifrizi4aac34117cc7
diff --git a/ares/db/database.py b/ares/db/database.py
index 83ae9d1..d32bc3d 100644
--- a/ares/db/database.py
+++ b/ares/db/database.py
@@ -3011,7 +3011,6 @@ class AresDatabase:
or handle.bearer_auth_epoch is None
):
return None
- source_expiry = format_sqlite_utc(handle.bearer_expires_at)
async with connection.execute(
"""
SELECT u.id, u.username, u.role
@@ -3030,7 +3029,6 @@ class AresDatabase:
AND u.role IN (
'team_lead', 'operator', 'recon', 'reporter'
)
- AND julianday(?) > julianday('now')
AND NOT EXISTS (
SELECT 1
FROM revoked_access_tokens AS rat
@@ -3047,7 +3045,6 @@ class AresDatabase:
handle.user_id,
handle.bearer_subject,
handle.bearer_auth_epoch,
- source_expiry,
handle.bearer_jti,
),
) as cursor:
diff --git a/ares/db/postgres.py b/ares/db/postgres.py
index a9d1d01..467711d 100644
--- a/ares/db/postgres.py
+++ b/ares/db/postgres.py
@@ -6364,21 +6364,20 @@ class PostgresDatabase:
SELECT u.id, u.username, u.role
FROM users AS u
JOIN refresh_token_families AS f
- ON f.id=$6 AND f.user_id=u.id
+ ON f.id=$5 AND f.user_id=u.id
JOIN campaigns AS c ON c.id=$1
WHERE u.id=$2
AND u.username=$3
AND u.is_active=1
- AND u.auth_epoch=$7
+ AND u.auth_epoch=$6
AND f.auth_epoch=u.auth_epoch
AND f.state='active'
AND f.revoked_at IS NULL
AND f.absolute_expires_at > now()
AND u.role IN ('team_lead','operator','recon','reporter')
- AND $4 > now()
AND NOT EXISTS (
SELECT 1 FROM revoked_access_tokens AS rat
- WHERE rat.jti=$5
+ WHERE rat.jti=$4
)
AND (
u.role='team_lead'
@@ -6388,7 +6387,6 @@ class PostgresDatabase:
consumed.campaign_id,
consumed.user_id,
consumed.bearer_subject,
- consumed.bearer_expires_at,
consumed.bearer_jti,
consumed.bearer_family_id,
consumed.bearer_auth_epoch,
diff --git a/tests/unit/test_api_endpoints.py b/tests/unit/test_api_endpoints.py
index 09a15a2..6e79361 100644
--- a/tests/unit/test_api_endpoints.py
+++ b/tests/unit/test_api_endpoints.py
@@ -5255,12 +5255,18 @@ class TestMainWebSocketAuthoritativeLifetime:
)
await database.save_campaign(campaign)
original_db = getattr(server.app.state, "db", None)
+ original_db_override = server.app.dependency_overrides.get(server.get_db)
server.app.state.db = database
+ server.app.dependency_overrides[server.get_db] = lambda: database
server._ws_connections.clear()
_reset_rate_limiter()
try:
yield server, database, user_id, username, token, campaign, server.app
finally:
+ if original_db_override is None:
+ server.app.dependency_overrides.pop(server.get_db, None)
+ else:
+ server.app.dependency_overrides[server.get_db] = original_db_override
server._ws_connections.clear()
server.app.state.db = original_db
await database.close()
@@ -5895,18 +5901,18 @@ class TestMainWebSocketAuthoritativeLifetime:
(datetime.now(timezone.utc) + timedelta(hours=1)).isoformat(),
)
elif state_change == "expired":
- from dataclasses import replace
- from datetime import datetime, timezone
-
contexts = list(server._ws_connections.get(campaign.id, set()))
_require_fixed(
len(contexts) == 1,
"expected one registered ticket handle",
)
- contexts[0].ticket_handle = replace(
- contexts[0].ticket_handle,
- bearer_expires_at=datetime(2000, 1, 1, tzinfo=timezone.utc),
+ await database.conn.execute(
+ "UPDATE refresh_token_families SET created_at='1999-01-01T00:00:00.000Z', "
+ "absolute_expires_at='2000-01-01T00:00:00.000Z', retain_until='2000-01-02T00:00:00.000Z' "
+ "WHERE id=?",
+ (contexts[0].ticket_handle.bearer_family_id,),
)
+ await database.conn.commit()
else:
await database.conn.execute(
"UPDATE users SET role='operator' WHERE id=?",
diff --git a/tests/unit/test_websocket_expiry_repro.py b/tests/unit/test_websocket_expiry_repro.py
new file mode 100644
index 0000000..9351f8b
--- /dev/null
+++ b/tests/unit/test_websocket_expiry_repro.py
@@ -0,0 +1,123 @@
+"""
+Reproduction test for NEW-02: Premature WebSocket Termination at T+15min
+Verifies that a live WebSocket connection remains valid even after the short-lived
+Bearer JWT access token's static expiry has passed, provided the underlying
+refresh token family session remains active and unrevoked.
+"""
+
+from dataclasses import replace
+from datetime import datetime, timedelta, timezone
+from uuid import uuid4
+import pytest
+
+from ares.db.websocket_tickets import BearerTicketSource
+from ares.db.database import AresDatabase
+
+
+async def test_websocket_stays_alive_past_bearer_access_token_expiry() -> None:
+ """A live WebSocket connection must NOT be terminated simply because the 15-minute
+
+ access token expired, as long as the user's session family is active.
+ """
+ db = AresDatabase(":memory:")
+ await db.connect()
+
+ try:
+ user_id = await db.create_user("ws-test-operator", "Password123!", "operator")
+ campaign_id = str(uuid4())
+ from ares.core.campaign import Campaign
+ campaign = Campaign(
+ id=campaign_id,
+ name="WebSocket Test Campaign",
+ operator="ws-test-operator",
+ targets=["127.0.0.1"],
+ )
+ await db.save_campaign(campaign)
+
+ from ares.db.database import format_sqlite_utc
+ from ares.core.token_sessions import generate_family_id
+ now = datetime.now(timezone.utc)
+ family_id = generate_family_id()
+ created_str = format_sqlite_utc(now)
+ abs_exp_str = format_sqlite_utc(now + timedelta(days=7))
+ retain_str = format_sqlite_utc(now + timedelta(days=30))
+ await db.conn.execute(
+ """
+ INSERT INTO refresh_token_families (
+ id, user_id, auth_epoch, state, created_at, absolute_expires_at, retain_until
+ ) VALUES (?, ?, ?, 'active', ?, ?, ?)
+ """,
+ (
+ family_id,
+ user_id,
+ 1,
+ created_str,
+ abs_exp_str,
+ retain_str,
+ ),
+ )
+ await db.conn.commit()
+
+ # Bearer token that expires in 15 minutes
+ bearer_jti = str(uuid4())
+ bearer_expiry = now + timedelta(minutes=15)
+ source = BearerTicketSource(
+ user_id=user_id,
+ subject="ws-test-operator",
+ jti=bearer_jti,
+ expires_at=bearer_expiry,
+ family_id=family_id,
+ auth_epoch=1,
+ )
+
+ # Issue and consume ticket during initial connection
+ raw_ticket, _ = await db.issue_websocket_ticket(campaign_id, source)
+ assert raw_ticket is not None
+
+ handle = await db.consume_websocket_ticket(raw_ticket, campaign_id)
+ assert handle is not None
+
+ # At T+0min, principal resolves successfully
+ p0 = await db.resolve_websocket_ticket_principal(handle)
+ assert p0 is not None
+ assert p0.username == "ws-test-operator"
+ assert p0.role == "operator"
+
+ # Now simulate T+16min (bearer token expired, but session family still active)
+ expired_bearer_handle = replace(
+ handle,
+ bearer_expires_at=now - timedelta(minutes=1),
+ )
+
+ # Under the bug (NEW-02), this returns None because of static bearer_expires_at check.
+ # Under the fix, this must resolve successfully because the family session is active!
+ p16 = await db.resolve_websocket_ticket_principal(expired_bearer_handle)
+ assert p16 is not None, (
+ "WebSocket principal resolution failed past bearer JWT expiry (NEW-02 regression). "
+ "Live connections must remain valid while refresh token family is active."
+ )
+ assert p16.username == "ws-test-operator"
+
+ # However, if the family session is revoked or absolutely expired, it MUST fail (fail-closed)
+ revoked_ts = format_sqlite_utc(datetime.now(timezone.utc))
+ await db.conn.execute(
+ "UPDATE refresh_token_families SET state='revoked', revoked_at=?, revoke_reason='logout_current' WHERE id=?",
+ (revoked_ts, family_id),
+ )
+ await db.conn.commit()
+ p_revoked = await db.resolve_websocket_ticket_principal(expired_bearer_handle)
+ # Test absolute expiration of family session
+ # Reactivate family first
+ await db.conn.execute(
+ "UPDATE refresh_token_families SET state='active', revoked_at=NULL, revoke_reason=NULL, "
+ "created_at='1999-01-01T00:00:00.000Z', absolute_expires_at='2000-01-01T00:00:00.000Z', "
+ "retain_until='2000-01-02T00:00:00.000Z' WHERE id=?",
+ (family_id,),
+ )
+ await db.conn.commit()
+ p_expired = await db.resolve_websocket_ticket_principal(expired_bearer_handle)
+ assert p_expired is None, "Expired token family must terminate WebSocket access"
+
+ finally:
+ await db.close()
diff --git a/tests/unit/test_websocket_ticket_lifecycle.py b/tests/unit/test_websocket_ticket_lifecycle.py
index bee340e..99ae063 100644
--- a/tests/unit/test_websocket_ticket_lifecycle.py
+++ b/tests/unit/test_websocket_ticket_lifecycle.py
@@ -1296,13 +1296,21 @@ async def test_sqlite_bearer_resolver_complete_authority_mutations(
await connection.commit()
unrevoked = await database.resolve_websocket_ticket_principal(handle)
- expired_handle = replace(
- handle,
- bearer_expires_at=datetime.now(timezone.utc) - timedelta(seconds=1),
+ await connection.execute(
+ "UPDATE refresh_token_families SET created_at='1999-01-01T00:00:00.000Z', "
+ "absolute_expires_at='2000-01-01T00:00:00.000Z', retain_until='2000-01-02T00:00:00.000Z' "
+ "WHERE id=?",
+ (handle.bearer_family_id,),
)
- expired_source = await database.resolve_websocket_ticket_principal(
- expired_handle
+ await connection.commit()
+ expired_source = await database.resolve_websocket_ticket_principal(handle)
+ await connection.execute(
+ "UPDATE refresh_token_families SET created_at='2020-01-01T00:00:00.000Z', "
+ "absolute_expires_at='2099-01-01T00:00:00.000Z', retain_until='2099-01-02T00:00:00.000Z' "
+ "WHERE id=?",
+ (handle.bearer_family_id,),
)
+ await connection.commit()
renamed_username = f"renamed_{uuid4().hex}"
await connection.execute(