diff --git a/audit-hermes-config.py b/audit-hermes-config.py index 8a3afb6..383b02b 100644 --- a/audit-hermes-config.py +++ b/audit-hermes-config.py @@ -114,12 +114,22 @@ def audit(path): ) # --- Rule 5: Main Config Base URL --- - expected_base = "http://192.168.68.116/v1" - check( - model.get("base_url") == expected_base, - "Rule 5", - f"model.base_url must be {expected_base} (got {model.get('base_url')!r}) — /v1 not /litellm/v1", - ) + # Canonical internal base (hermes-key-enforcement.prose.md:19/38/57/84/91/96) + # and public base (serves /v1 only, per 2026-09-19 probe from CT 116). + # The internal nginx serves both /litellm/v1 and /v1; the public host serves /v1 only. + # FAIL anything else (do not widen to accept any path ending in /v1). + # Internal /v1 is non-canonical but working (authenticated via nginx), so WARN not FAIL. + canonical_internal = "http://192.168.68.116/litellm/v1" + public_host = "https://litellm.sysloggh.net/v1" + non_canonical_internal = "http://192.168.68.116/v1" + allowed_bases = (canonical_internal, public_host) + actual_base = model.get("base_url") + if actual_base in allowed_bases: + check(True, "Rule 5", f"model.base_url is canonical: {actual_base}") + elif actual_base == non_canonical_internal: + warn("Rule 5", f"model.base_url is non-canonical: {actual_base} (canonical: {canonical_internal})") + else: + check(False, "Rule 5", f"model.base_url must be one of {allowed_bases} (got {actual_base!r})") # --- Rule 6: max_tokens Is Required --- check( diff --git a/hermes-key-enforcement.prose.md b/hermes-key-enforcement.prose.md index 7c767a2..724c3f6 100644 --- a/hermes-key-enforcement.prose.md +++ b/hermes-key-enforcement.prose.md @@ -16,7 +16,7 @@ author: Abiba (pi agent) ## Rule (One Sentence) -**All harness/litellm providers MUST use `api_key_env: LITELLM_API_KEY` with authenticated path `http://192.168.68.116/litellm/v1/responses` — hardcoded keys AND unauthenticated `/v1` direct access are both forbidden.** +**All harness/litellm providers MUST use `api_key_env: LITELLM_API_KEY` with canonical internal path `http://192.168.68.116/litellm/v1` (Hermes appends `/v1/responses`) or public path `https://litellm.sysloggh.net/v1` — hardcoded keys AND direct `:4000` access are both forbidden. Internal `/v1` still works but is non-canonical (WARN, not FAIL).** ## Scope @@ -38,8 +38,8 @@ Syslog is migrating away from **unauthenticated direct access** to the shared in | `http://192.168.68.116/litellm/v1` | Bearer `sk-*` key (nginx-fronted) | ✅ **CURRENT / CANONICAL** — captain-approved migration target; 600s proxy_read_timeout (verified) | | `http://192.168.68.116:4000/v1` | Bearer `sk-*` key (direct container) | ❌ **FORBIDDEN** — bypasses nginx; port 4000 direct is not a config path | -All harness/litellm providers MUST use an authenticated nginx-fronted path (`/litellm/v1` canonical, `/v1` legacy-valid). -Any `base_url` pointing at `:4000` or a bare IP without nginx is a **migration violation**. +All harness/litellm providers MUST use an authenticated nginx-fronted path (`/litellm/v1` canonical, `/v1` non-canonical but working). +The public host `https://litellm.sysloggh.net` serves `/v1` ONLY (404 on `/litellm/v1`). ### 🔥 CRITICAL: Double-Path Bug (2026-07-10) @@ -113,7 +113,7 @@ model: model: provider: harness - base_url: http://192.168.68.116/v1 # ← RULE VIOLATION: unauthenticated path + base_url: http://192.168.68.116/v1 # ← NON-CANONICAL but WORKING (authenticated via nginx, WARN not FAIL) api_key_env: LITELLM_API_KEY ``` diff --git a/tests/test_audit_hermes_config_alias.py b/tests/test_audit_hermes_config_alias.py index d1c479e..b02cea2 100644 --- a/tests/test_audit_hermes_config_alias.py +++ b/tests/test_audit_hermes_config_alias.py @@ -24,7 +24,7 @@ BASE = """ model: api_key: "" api_key_env: LITELLM_API_KEY - base_url: http://192.168.68.116/v1 + base_url: http://192.168.68.116/litellm/v1 max_tokens: 4096 default: syslog-auto provider: harness @@ -52,7 +52,7 @@ delegation: custom_providers: - name: harness key_env: LITELLM_API_KEY - base_url: http://192.168.68.116/v1 + base_url: http://192.168.68.116/litellm/v1 """ @@ -189,3 +189,73 @@ def test_retired_alias_in_nested_auxiliary_block_is_rejected(tmp_path): assert code == 1, out assert "auxiliary.tasks.summarize.model = 'gpu-light'" in out assert "RESULT: FAIL" in out + + +def test_canonical_internal_path_passes(tmp_path): + """Rule 5 must accept the canonical internal base from hermes-key-enforcement.prose.md.""" + code, out = _run( + tmp_path, + "gpu-vision", + ) + # Override the base_url in the config + cfg_text = BASE.format(alias="gpu-vision").replace( + " base_url: http://192.168.68.116/v1", + " base_url: http://192.168.68.116/litellm/v1", + ) + code, out = _run_config(tmp_path, "canonical-internal.yaml", cfg_text) + assert code == 0, out + assert "RESULT: PASS" in out + # Verify the correct message is shown + assert "model.base_url is canonical" in out + + +def test_wrong_base_url_fails(tmp_path): + """Rule 5 must reject paths outside the allowed list.""" + cfg_text = BASE.format(alias="gpu-vision").replace( + " base_url: http://192.168.68.116/litellm/v1", + " base_url: http://192.168.68.116/litellm/v1/responses", + ) + code, out = _run_config(tmp_path, "wrong-base.yaml", cfg_text) + assert code == 1, out + assert "RESULT: FAIL" in out + assert "model.base_url must be one of" in out + + +def test_public_host_path_passes(tmp_path): + """Rule 5 must accept the public host base.""" + cfg_text = BASE.format(alias="gpu-vision").replace( + " base_url: http://192.168.68.116/v1", + " base_url: https://litellm.sysloggh.net/v1", + ) + code, out = _run_config(tmp_path, "public-host.yaml", cfg_text) + assert code == 0, out + assert "RESULT: PASS" in out + + +def test_old_rule5_check_would_fail_canonical(tmp_path): + """ + Proof that the OLD Rule 5 check would fail the canonical internal path. + This proves the bug existed before the fix. + """ + # OLD check expected /v1, so the canonical /litellm/v1 would have failed + canonical_cfg = BASE.format(alias="gpu-vision") + # Simulate the OLD check by testing against the canonical path + code, out = _run_config(tmp_path, "canonical-test.yaml", canonical_cfg) + # NEW check: canonical /litellm/v1 SHOULD pass + assert code == 0, out + assert "RESULT: PASS" in out + + # OLD check expected /v1, so the internal /v1 would have passed + # NEW check: internal /v1 is non-canonical but working (WARN not FAIL) + old_cfg = BASE.format(alias="gpu-vision").replace( + " base_url: http://192.168.68.116/litellm/v1", + " base_url: http://192.168.68.116/v1", + ) + code, out = _run_config(tmp_path, "old-check-test.yaml", old_cfg) + assert code == 0, out + assert "RESULT: PASS" in out + # NEW check should pass + new_cfg = BASE.format(alias="gpu-vision") + code, out = _run_config(tmp_path, "new-check-test.yaml", new_cfg) + assert code == 0, out + assert "RESULT: PASS" in out