Additional Auth Changes

Data/Server/Modules/auth/device_auth.py

@@ -8,6 +8,7 @@ import jwt
 from flask import g, jsonify, request
 
 from Modules.auth.dpop import DPoPValidator, DPoPVerificationError, DPoPReplayError
+from Modules.auth.rate_limit import SlidingWindowRateLimiter
 
 
 @dataclass
@@ -25,11 +26,18 @@ class DeviceAuthError(Exception):
     status_code = 401
     error_code = "unauthorized"
 
-    def __init__(self, message: str = "unauthorized", *, status_code: Optional[int] = None):
+    def __init__(
+        self,
+        message: str = "unauthorized",
+        *,
+        status_code: Optional[int] = None,
+        retry_after: Optional[float] = None,
+    ):
         super().__init__(message)
         if status_code is not None:
             self.status_code = status_code
         self.message = message
+        self.retry_after = retry_after
 
 
 class DeviceAuthManager:
@@ -40,11 +48,13 @@ class DeviceAuthManager:
         jwt_service,
         dpop_validator: Optional[DPoPValidator],
         log: Callable[[str, str], None],
+        rate_limiter: Optional[SlidingWindowRateLimiter] = None,
     ) -> None:
         self._db_conn_factory = db_conn_factory
         self._jwt_service = jwt_service
         self._dpop_validator = dpop_validator
         self._log = log
+        self._rate_limiter = rate_limiter
 
     def authenticate(self) -> DeviceAuthContext:
         auth_header = request.headers.get("Authorization", "")
@@ -67,6 +77,15 @@ class DeviceAuthManager:
         if not guid or not fingerprint or token_version <= 0:
             raise DeviceAuthError("invalid_claims")
 
+        if self._rate_limiter:
+            decision = self._rate_limiter.check(f"fp:{fingerprint}", 60, 60.0)
+            if not decision.allowed:
+                raise DeviceAuthError(
+                    "rate_limited",
+                    status_code=429,
+                    retry_after=decision.retry_after,
+                )
+
         conn = self._db_conn_factory()
         try:
             cur = conn.cursor()
@@ -138,6 +157,12 @@ def require_device_auth(manager: DeviceAuthManager):
             except DeviceAuthError as exc:
                 response = jsonify({"error": exc.message})
                 response.status_code = exc.status_code
+                retry_after = getattr(exc, "retry_after", None)
+                if retry_after:
+                    try:
+                        response.headers["Retry-After"] = str(max(1, int(retry_after)))
+                    except Exception:
+                        response.headers["Retry-After"] = "1"
                 return response
 
             g.device_auth = ctx

Data/Server/Modules/enrollment/routes.py

@@ -26,6 +26,7 @@ def register(
     ip_rate_limiter: SlidingWindowRateLimiter,
     fp_rate_limiter: SlidingWindowRateLimiter,
     nonce_cache: NonceCache,
+    script_signer,
 ) -> None:
     blueprint = Blueprint("enrollment", __name__)
 
@@ -42,6 +43,14 @@ def register(
         addr = request.remote_addr or "unknown"
         return addr.strip()
 
+    def _signing_key_b64() -> str:
+        if not script_signer:
+            return ""
+        try:
+            return script_signer.public_base64_spki()
+        except Exception:
+            return ""
+
     def _rate_limited(key: str, limiter: SlidingWindowRateLimiter, limit: int, window_s: float):
         decision = limiter.check(key, limit, window_s)
         if not decision.allowed:
@@ -312,6 +321,7 @@ def register(
             "server_nonce": server_nonce_b64,
             "poll_after_ms": 3000,
             "server_certificate": _load_tls_bundle(tls_bundle_path),
+            "signing_key": _signing_key_b64(),
         }
         log("server", f"enrollment request queued fingerprint={fingerprint[:12]} host={hostname} ip={remote}")
         return jsonify(response)
@@ -466,6 +476,7 @@ def register(
                 "refresh_token": refresh_info["token"],
                 "token_type": "Bearer",
                 "server_certificate": _load_tls_bundle(tls_bundle_path),
+                "signing_key": _signing_key_b64(),
             }
         )
 

Data/Server/Modules/jobs/prune.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import Callable
 
 import eventlet
@@ -25,7 +25,9 @@ def start_prune_job(
 
 
 def _run_once(db_conn_factory: Callable[[], any], log: Callable[[str, str], None]) -> None:
-    now_iso = datetime.now(tz=timezone.utc).isoformat()
+    now = datetime.now(tz=timezone.utc)
+    now_iso = now.isoformat()
+    stale_before = (now - timedelta(hours=24)).isoformat()
     conn = db_conn_factory()
     try:
         cur = conn.cursor()
@@ -55,7 +57,7 @@ def _run_once(db_conn_factory: Callable[[], any], log: Callable[[str, str], None
                     OR created_at < ?
                )
             """,
-            (now_iso, now_iso, now_iso),
+            (now_iso, now_iso, stale_before),
         )
         approvals_marked = cur.rowcount or 0
 

Data/Server/server.py

@@ -27,7 +27,7 @@ from eventlet import tpool
 import requests
 import re
 import base64
-from flask import Flask, request, jsonify, Response, send_from_directory, make_response, session
+from flask import Flask, request, jsonify, Response, send_from_directory, make_response, session, g
 from flask_socketio import SocketIO, emit, join_room
 from flask_cors import CORS
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -51,7 +51,7 @@ from datetime import datetime, timezone
 from Modules import db_migrations
 from Modules.auth import jwt_service as jwt_service_module
 from Modules.auth.dpop import DPoPValidator
-from Modules.auth.device_auth import DeviceAuthManager
+from Modules.auth.device_auth import DeviceAuthManager, require_device_auth
 from Modules.auth.rate_limit import SlidingWindowRateLimiter
 from Modules.agents import routes as agent_routes
 from Modules.crypto import certificates, signing
@@ -95,9 +95,8 @@ def _rotate_daily(path: str):
             dt = _dt.datetime.fromtimestamp(mtime)
             today = _dt.datetime.now().date()
             if dt.date() != today:
-                base, ext = os.path.splitext(path)
                 suffix = dt.strftime('%Y-%m-%d')
-                newp = f"{base}.{suffix}{ext}"
+                newp = f"{path}.{suffix}"
                 try:
                     os.replace(path, newp)
                 except Exception:
@@ -158,6 +157,7 @@ JWT_SERVICE = jwt_service_module.load_service()
 SCRIPT_SIGNER = signing.load_signer()
 IP_RATE_LIMITER = SlidingWindowRateLimiter()
 FP_RATE_LIMITER = SlidingWindowRateLimiter()
+AUTH_RATE_LIMITER = SlidingWindowRateLimiter()
 ENROLLMENT_NONCE_CACHE = NonceCache()
 DPOP_VALIDATOR = DPoPValidator()
 DEVICE_AUTH_MANAGER: Optional[DeviceAuthManager] = None
@@ -1263,6 +1263,7 @@ if DEVICE_AUTH_MANAGER is None:
         jwt_service=JWT_SERVICE,
         dpop_validator=DPOP_VALIDATOR,
         log=_write_service_log,
+        rate_limiter=AUTH_RATE_LIMITER,
     )
 
 def _update_last_login(username: str) -> None:
@@ -4851,6 +4852,7 @@ enrollment_routes.register(
     ip_rate_limiter=IP_RATE_LIMITER,
     fp_rate_limiter=FP_RATE_LIMITER,
     nonce_cache=ENROLLMENT_NONCE_CACHE,
+    script_signer=SCRIPT_SIGNER,
 )
 
 token_routes.register(
@@ -6254,6 +6256,7 @@ def _deep_merge_preserve(prev: dict, incoming: dict) -> dict:
 # Endpoint: /api/agent/details — methods POST.
 
 @app.route("/api/agent/details", methods=["POST"])
+@require_device_auth(DEVICE_AUTH_MANAGER)
 def save_agent_details():
     data = request.get_json(silent=True) or {}
     hostname = data.get("hostname")
@@ -6264,11 +6267,9 @@ def save_agent_details():
         agent_hash = agent_hash.strip() or None
     else:
         agent_hash = None
-    agent_guid = data.get("agent_guid")
-    if isinstance(agent_guid, str):
-        agent_guid = agent_guid.strip() or None
-    else:
-        agent_guid = None
+    ctx = getattr(g, "device_auth")
+    auth_guid = _normalize_guid(ctx.guid)
+    fingerprint = (ctx.ssl_key_fingerprint or "").strip()
     if not hostname and isinstance(details, dict):
         hostname = (details.get("summary") or {}).get("hostname")
     if not hostname or not isinstance(details, dict):
@@ -6285,6 +6286,13 @@ def save_agent_details():
         created_at = int(snapshot.get("created_at") or 0)
         existing_guid = (snapshot.get("agent_guid") or "").strip() or None
         existing_agent_hash = (snapshot.get("agent_hash") or "").strip() or None
+        db_fp = (snapshot.get("ssl_key_fingerprint") or "").strip().lower()
+        if db_fp and fingerprint and db_fp != fingerprint.lower():
+            return jsonify({"error": "fingerprint_mismatch"}), 403
+
+        normalized_existing_guid = _normalize_guid(existing_guid) if existing_guid else None
+        if normalized_existing_guid and auth_guid and normalized_existing_guid != auth_guid:
+            return jsonify({"error": "guid_mismatch"}), 403
 
         # Ensure summary exists and attach hostname/agent_id if missing
         incoming_summary = details.setdefault("summary", {})
@@ -6300,10 +6308,12 @@ def save_agent_details():
                 incoming_summary["agent_hash"] = agent_hash
             except Exception:
                 pass
-        effective_guid = agent_guid or existing_guid
-        normalized_effective_guid = _normalize_guid(effective_guid) if effective_guid else None
+        effective_guid = auth_guid or existing_guid
+        normalized_effective_guid = auth_guid or normalized_existing_guid
         if normalized_effective_guid:
             incoming_summary["agent_guid"] = normalized_effective_guid
+        if fingerprint:
+            incoming_summary.setdefault("ssl_key_fingerprint", fingerprint)
 
         # Preserve last_seen if incoming omitted it
         if not incoming_summary.get("last_seen"):
@@ -6366,6 +6376,24 @@ def save_agent_details():
             agent_hash=agent_hash or existing_agent_hash,
             guid=normalized_effective_guid,
         )
+        if normalized_effective_guid and fingerprint:
+            now_iso = datetime.now(timezone.utc).isoformat()
+            cur.execute(
+                """
+                UPDATE devices
+                   SET ssl_key_fingerprint = ?,
+                       key_added_at = COALESCE(key_added_at, ?)
+                 WHERE guid = ?
+                """,
+                (fingerprint, now_iso, normalized_effective_guid),
+            )
+            cur.execute(
+                """
+                INSERT OR IGNORE INTO device_keys (id, guid, ssl_key_fingerprint, added_at)
+                VALUES (?, ?, ?, ?)
+                """,
+                (str(uuid.uuid4()), normalized_effective_guid, fingerprint, now_iso),
+            )
         conn.commit()
         conn.close()
 
@@ -7149,16 +7177,28 @@ def _service_acct_set(conn, agent_id: str, username: str, plaintext_password: st
 # Endpoint: /api/agent/checkin — methods POST.
 
 @app.route('/api/agent/checkin', methods=['POST'])
+@require_device_auth(DEVICE_AUTH_MANAGER)
 def api_agent_checkin():
     payload = request.get_json(silent=True) or {}
     agent_id = (payload.get('agent_id') or '').strip()
     if not agent_id:
         return jsonify({'error': 'agent_id required'}), 400
+
+    ctx = getattr(g, "device_auth")
+    auth_guid = _normalize_guid(ctx.guid)
+    fingerprint = (ctx.ssl_key_fingerprint or "").strip()
     raw_username = (payload.get('username') or '').strip()
     username = raw_username or DEFAULT_SERVICE_ACCOUNT
     if username in LEGACY_SERVICE_ACCOUNTS:
         username = DEFAULT_SERVICE_ACCOUNT
     hostname = (payload.get('hostname') or '').strip()
+
+    reg = registered_agents.get(agent_id) or {}
+    reg_guid = _normalize_guid(reg.get("agent_guid") or "")
+    if reg_guid and auth_guid and reg_guid != auth_guid:
+        return jsonify({'error': 'guid_mismatch'}), 403
+
+    conn = None
     try:
         conn = _db_conn()
         row = _service_acct_get(conn, agent_id)
@@ -7189,38 +7229,92 @@ def api_agent_checkin():
                     'password': plain,
                     'last_rotated_utc': row[3] or _now_iso_utc(),
                 }
-        conn.close()
-        _ansible_log_server(f"[checkin] return creds agent_id={agent_id} user={out['username']}")
+
+        now_ts = int(time.time())
         try:
             if hostname:
-                _persist_last_seen(hostname, int(time.time()), agent_id)
+                _persist_last_seen(hostname, now_ts, agent_id)
         except Exception:
             pass
-        agent_guid = _ensure_agent_guid(agent_id, hostname or None)
-        if agent_guid and agent_id:
-            rec = registered_agents.setdefault(agent_id, {})
-            rec['agent_guid'] = agent_guid
-        else:
-            agent_guid = agent_guid or ''
-        return jsonify({
-            'username': out['username'],
-            'password': out['password'],
-            'policy': { 'force_rotation_minutes': 43200 },
-            'agent_guid': agent_guid or None,
-        })
+
+        try:
+            cur = conn.cursor()
+            if auth_guid:
+                cur.execute(
+                    """
+                    UPDATE devices
+                       SET agent_id = COALESCE(?, agent_id),
+                           ssl_key_fingerprint = COALESCE(?, ssl_key_fingerprint),
+                           last_seen = ?
+                     WHERE guid = ?
+                    """,
+                    (agent_id or None, fingerprint or None, now_ts, auth_guid),
+                )
+                if cur.rowcount == 0 and hostname:
+                    cur.execute(
+                        """
+                        UPDATE devices
+                           SET guid = ?,
+                               agent_id = COALESCE(?, agent_id),
+                               ssl_key_fingerprint = COALESCE(?, ssl_key_fingerprint),
+                               last_seen = ?
+                         WHERE hostname = ?
+                        """,
+                        (auth_guid, agent_id or None, fingerprint or None, now_ts, hostname),
+                    )
+                if fingerprint:
+                    cur.execute(
+                        """
+                        INSERT OR IGNORE INTO device_keys (id, guid, ssl_key_fingerprint, added_at)
+                        VALUES (?, ?, ?, ?)
+                        """,
+                        (str(uuid.uuid4()), auth_guid, fingerprint, datetime.now(timezone.utc).isoformat()),
+                    )
+            conn.commit()
+        except Exception as exc:
+            _write_service_log("server", f"device update during checkin failed: {exc}")
+
+        registered = registered_agents.setdefault(agent_id, {})
+        if auth_guid:
+            registered["agent_guid"] = auth_guid
+
+        _ansible_log_server(f"[checkin] return creds agent_id={agent_id} user={out['username']}")
+        return jsonify(
+            {
+                'username': out['username'],
+                'password': out['password'],
+                'policy': {'force_rotation_minutes': 43200},
+                'agent_guid': auth_guid or None,
+            }
+        )
     except Exception as e:
         _ansible_log_server(f"[checkin] error agent_id={agent_id} err={e}")
         return jsonify({'error': str(e)}), 500
+    finally:
+        if conn:
+            try:
+                conn.close()
+            except Exception:
+                pass
 
 
 # Endpoint: /api/agent/service-account/rotate — methods POST.
 
 @app.route('/api/agent/service-account/rotate', methods=['POST'])
+@require_device_auth(DEVICE_AUTH_MANAGER)
 def api_agent_service_account_rotate():
     payload = request.get_json(silent=True) or {}
     agent_id = (payload.get('agent_id') or '').strip()
     if not agent_id:
         return jsonify({'error': 'agent_id required'}), 400
+
+    ctx = getattr(g, "device_auth")
+    auth_guid = _normalize_guid(ctx.guid)
+    reg = registered_agents.get(agent_id) or {}
+    reg_guid = _normalize_guid(reg.get("agent_guid") or "")
+    if reg_guid and auth_guid and reg_guid != auth_guid:
+        return jsonify({'error': 'guid_mismatch'}), 403
+
     requested_username = (payload.get('username') or '').strip()
     try:
         conn = _db_conn()
@@ -7234,7 +7328,12 @@ def api_agent_service_account_rotate():
             _ansible_log_server(f"[rotate] upgrading legacy service user for agent_id={agent_id}")
         pw_new = _gen_strong_password()
         out = _service_acct_set(conn, agent_id, user_eff, pw_new)
-        conn.close()
+        try:
+            registered = registered_agents.setdefault(agent_id, {})
+            if auth_guid:
+                registered["agent_guid"] = auth_guid
+        finally:
+            conn.close()
         _ansible_log_server(f"[rotate] rotated agent_id={agent_id} user={out['username']} at={out['last_rotated_utc']}")
         return jsonify({
             'username': out['username'],