@@ -982,6 +998,8 @@
const elClosed = document.getElementById('stat-closed');
const elRate = document.getElementById('stat-rate');
const elFailed = document.getElementById('stat-failed');
+ const elDlq = document.getElementById('stat-dlq');
+ const elNoAction = document.getElementById('stat-noaction');
const elLatency = document.getElementById('stat-latency');
if (elCreated) elCreated.textContent = data.created_today;
@@ -989,6 +1007,8 @@
if (elClosed) elClosed.textContent = data.closed_today;
if (elRate) elRate.textContent = data.success_rate;
if (elFailed) elFailed.textContent = data.failed_today;
+ if (elDlq) elDlq.textContent = data.dlq_today;
+ if (elNoAction) elNoAction.textContent = data.non_action_today;
if (elLatency) elLatency.textContent = data.avg_processing_time;
if (typeof MiniChart !== 'undefined') {
diff --git a/tests/test_stats_and_history_filters.py b/tests/test_stats_and_history_filters.py
new file mode 100644
index 0000000..8e21ab6
--- /dev/null
+++ b/tests/test_stats_and_history_filters.py
@@ -0,0 +1,136 @@
+"""Regression tests for the DLQ / no-action stat split and the history
+status / source-IP filters.
+
+Locks in the behaviour introduced alongside the dashboard DLQ + No-Action
+cards and the Webhook History status / source-IP filters:
+
+* ``/api/stats`` reports ``dlq`` separately from ``failed`` (``failed_today``
+ must NOT include dead-lettered logs) and exposes ``dlq_today`` /
+ ``non_action_today``.
+* ``/history`` filters by ``status`` (exact) and ``source_ip`` (partial).
+"""
+
+from datetime import datetime, timezone
+from unittest.mock import patch
+
+import pytest
+
+from hookwise import create_app
+from hookwise.extensions import db
+from hookwise.models import WebhookConfig, WebhookLog
+
+
+@pytest.fixture(autouse=True)
+def mock_redis():
+ # check_maintenance (before_request) reads redis; mock it so tests do not
+ # require a live Redis server.
+ with patch("hookwise.tasks.redis_client") as mock_redis_client:
+ mock_redis_client.get.return_value = None
+ yield mock_redis_client
+
+
+@pytest.fixture
+def app():
+ app = create_app()
+ app.config["TESTING"] = True
+ app.config["WTF_CSRF_ENABLED"] = False
+ app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
+ return app
+
+
+@pytest.fixture
+def client(app):
+ with app.app_context():
+ db.create_all()
+ yield app.test_client()
+ db.session.remove()
+ db.drop_all()
+
+
+@pytest.fixture
+def auth_session(client):
+ with client.session_transaction() as sess:
+ sess["user_id"] = "test-user-id"
+ sess["username"] = "admin"
+ sess["role"] = "admin"
+
+
+def _seed(app):
+ """Create one config plus one log per status, all timestamped 'now'."""
+ with app.app_context():
+ cfg = WebhookConfig(name="Cfg", bearer_token="t")
+ db.session.add(cfg)
+ db.session.commit()
+ cfg_id = cfg.id
+ now = datetime.now(timezone.utc)
+
+ rows = [
+ ("processed", "create", "10.0.0.1"),
+ ("processed", "update", "10.0.0.1"),
+ ("processed", "close", "10.0.0.2"),
+ ("processed", None, "10.0.0.2"), # processed, no ticket action
+ ("skipped", None, "10.0.0.3"), # skipped -> no action
+ ("failed", "create", "192.168.1.9"), # transient failure
+ ("dlq", None, "192.168.1.9"), # dead-lettered
+ ("dlq", "create", "192.168.1.9"), # dead-lettered
+ ]
+ for i, (status, action, ip) in enumerate(rows):
+ db.session.add(
+ WebhookLog(
+ config_id=cfg_id,
+ request_id=f"req-{i}",
+ payload="{}",
+ status=status,
+ action=action,
+ source_ip=ip,
+ created_at=now,
+ )
+ )
+ db.session.commit()
+ return cfg_id
+
+
+def test_stats_splits_dlq_from_failed(client, auth_session, app):
+ _seed(app)
+ resp = client.get("/api/stats")
+ assert resp.status_code == 200
+ data = resp.get_json()
+
+ # failed_today must exclude dead-lettered logs (the DLQ split).
+ assert data["failed_today"] == 1
+ assert data["dlq_today"] == 2
+ # skipped (1) + processed-with-null-action (1)
+ assert data["non_action_today"] == 2
+ # existing action buckets unchanged
+ assert data["created_today"] == 1
+ assert data["updated_today"] == 1
+ assert data["closed_today"] == 1
+
+
+def test_history_status_filter(client, auth_session, app):
+ _seed(app)
+ resp = client.get("/history?status=dlq")
+ assert resp.status_code == 200
+ body = resp.get_data(as_text=True)
+ # 2 dlq rows render; each row carries exactly one data-request-id cell.
+ assert body.count("data-request-id=") == 2
+
+
+def test_history_source_ip_filter_partial(client, auth_session, app):
+ _seed(app)
+ # partial (ilike) match on the 192.168.x prefix -> failed(1) + dlq(2) = 3
+ resp = client.get("/history?source_ip=192.168")
+ assert resp.status_code == 200
+ assert resp.get_data(as_text=True).count("data-request-id=") == 3
+
+
+def test_history_status_and_source_ip_combined(client, auth_session, app):
+ _seed(app)
+ resp = client.get("/history?status=dlq&source_ip=192.168.1.9")
+ assert resp.status_code == 200
+ assert resp.get_data(as_text=True).count("data-request-id=") == 2
+
+ # Non-matching combination returns no rows.
+ resp = client.get("/history?status=dlq&source_ip=10.0.0.1")
+ assert resp.status_code == 200
+ assert resp.get_data(as_text=True).count("data-request-id=") == 0
diff --git a/tests/test_webhook_ingestion_guards.py b/tests/test_webhook_ingestion_guards.py
new file mode 100644
index 0000000..ae4623d
--- /dev/null
+++ b/tests/test_webhook_ingestion_guards.py
@@ -0,0 +1,104 @@
+"""Ingestion-path guard tests for the /w/ endpoint.
+
+Covers the rejection paths that protect the worker and ConnectWise:
+
+* invalid Bearer token -> 401
+* invalid HMAC signature -> 401
+* source IP not in allowlist -> 403
+* body over MAX_CONTENT_LENGTH -> 413 (JSON envelope for /w/ paths)
+"""
+
+import hashlib
+import hmac
+from unittest.mock import patch
+
+import pytest
+
+from hookwise import create_app
+from hookwise.extensions import db
+from hookwise.models import WebhookConfig, WebhookLog
+
+
+@pytest.fixture(autouse=True)
+def mock_redis():
+ with patch("hookwise.tasks.redis_client") as m:
+ m.get.return_value = None
+ yield m
+
+
+@pytest.fixture
+def app():
+ app = create_app()
+ app.config["TESTING"] = True
+ app.config["WTF_CSRF_ENABLED"] = False
+ app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
+ return app
+
+
+@pytest.fixture
+def client(app):
+ with app.app_context():
+ db.create_all()
+ yield app.test_client()
+ db.session.remove()
+ db.drop_all()
+
+
+def _make_config(app, **kw):
+ with app.app_context():
+ cfg = WebhookConfig(name="Ingest", bearer_token="plain-token")
+ cfg.is_enabled = True
+ cfg.bearer_auth_enabled = False
+ for k, v in kw.items():
+ setattr(cfg, k, v)
+ db.session.add(cfg)
+ db.session.commit()
+ return cfg.id
+
+
+def test_invalid_bearer_token_rejected(client, app):
+ cid = _make_config(app, bearer_auth_enabled=True)
+ resp = client.post(f"/w/{cid}", json={"x": 1}, headers={"Authorization": "Bearer wrong"})
+ assert resp.status_code == 401
+ assert resp.get_json()["status"] == "error"
+
+
+def test_invalid_hmac_signature_rejected(client, app):
+ cid = _make_config(app, hmac_secret="shhh")
+ resp = client.post(f"/w/{cid}", json={"x": 1}, headers={"X-HookWise-Signature": "deadbeef"})
+ assert resp.status_code == 401
+
+
+def test_valid_hmac_passes_signature_check(client, app):
+ # Sanity check the negative test above: a correct signature must NOT 401.
+ cid = _make_config(app, hmac_secret="shhh")
+ body = b'{"x": 1}'
+ sig = hmac.HMAC(b"shhh", body, hashlib.sha256).hexdigest()
+ with patch("hookwise.webhook.process_webhook_task") as task:
+ resp = client.post(
+ f"/w/{cid}",
+ data=body,
+ content_type="application/json",
+ headers={"X-HookWise-Signature": sig},
+ )
+ assert resp.status_code == 202
+ task.delay.assert_called_once()
+
+
+def test_source_ip_not_in_allowlist_rejected(client, app):
+ # Test client presents 127.0.0.1, which is outside 10.0.0.0/8.
+ cid = _make_config(app, trusted_ips="10.0.0.0/8")
+ resp = client.post(f"/w/{cid}", json={"x": 1})
+ assert resp.status_code == 403
+ with app.app_context():
+ # The rejection is recorded for the audit trail.
+ assert WebhookLog.query.filter_by(config_id=cid, status="failed").count() == 1
+
+
+def test_oversized_payload_rejected(client, app):
+ cid = _make_config(app)
+ client.application.config["MAX_CONTENT_LENGTH"] = 1024 # 1 KB cap for the test
+ big = "x" * 5000
+ resp = client.post(f"/w/{cid}", data='{"blob": "' + big + '"}', content_type="application/json")
+ assert resp.status_code == 413
+ assert resp.get_json()["message"] == "Payload too large"