mirror of
https://github.com/trustedsec/hate_crack.git
synced 2026-07-28 14:47:22 -07:00
Justin BollingerandClaude
2376ac5c10
ollamaUrl was built as "http://" + OLLAMA_HOST, so any value carrying a scheme
- the form Ollama's own tooling accepts - was mangled:
OLLAMA_HOST=https://ollama.example.com
-> http://https://ollama.example.com
The LLM attack then could not connect, and reaching a remote Ollama over TLS
was impossible. llm.py derives its client base URL as f"{ollamaUrl}/v1", so the
malformation propagated into the OpenAI-compatible client.
Extract _normalize_ollama_url() so the logic is unit-testable - ollamaUrl is
assigned at module import, which is otherwise only reachable via reload - and
prepend the scheme only when absent. Also strip trailing slashes, since callers
append paths. The bare host:port default is unchanged.
Fixes #119
Co-Authored-By: Claude <noreply@anthropic.com>
76 lines
2.8 KiB
Python
76 lines
2.8 KiB
Python
"""Tests for OLLAMA_HOST -> ollamaUrl normalization (issue #119).
|
|
|
|
``ollamaUrl`` used to be built as ``"http://" + OLLAMA_HOST``, which mangled any
|
|
value that already carried a scheme -- the form Ollama's own tooling accepts.
|
|
"""
|
|
|
|
import importlib
|
|
import os
|
|
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
from hate_crack import main as hc_main
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("host", "expected"),
|
|
[
|
|
# Bare host:port -- the historical default, must keep working.
|
|
("localhost:11434", "http://localhost:11434"),
|
|
("box:11434", "http://box:11434"),
|
|
("127.0.0.1:11434", "http://127.0.0.1:11434"),
|
|
# Scheme already present -- previously produced http://http://...
|
|
("http://box:11434", "http://box:11434"),
|
|
("https://ollama.example.com", "https://ollama.example.com"),
|
|
("https://ollama.example.com:443", "https://ollama.example.com:443"),
|
|
# Trailing slashes stripped: callers append f"{ollamaUrl}/v1".
|
|
("http://box:11434/", "http://box:11434"),
|
|
("https://ollama.example.com///", "https://ollama.example.com"),
|
|
("box:11434/", "http://box:11434"),
|
|
# Whitespace and empty values fall back to the default.
|
|
(" box:11434 ", "http://box:11434"),
|
|
("", "http://localhost:11434"),
|
|
(" ", "http://localhost:11434"),
|
|
],
|
|
)
|
|
def test_normalize_ollama_url(host, expected):
|
|
assert hc_main._normalize_ollama_url(host) == expected
|
|
|
|
|
|
def test_scheme_is_never_doubled():
|
|
"""The exact regression from issue #119."""
|
|
for host in ("http://box:11434", "https://ollama.example.com"):
|
|
assert "http://http" not in hc_main._normalize_ollama_url(host)
|
|
assert "http://https" not in hc_main._normalize_ollama_url(host)
|
|
|
|
|
|
def test_result_builds_a_valid_v1_endpoint():
|
|
"""llm.py derives its client base URL as f"{ollamaUrl}/v1"."""
|
|
for host in ("box:11434", "http://box:11434/", "https://x.example.com//"):
|
|
url = hc_main._normalize_ollama_url(host)
|
|
assert f"{url}/v1".count("//") == 1
|
|
|
|
|
|
def test_module_level_ollamaUrl_honours_a_scheme_in_the_env():
|
|
"""Guard the wiring, not just the helper: ollamaUrl is built at import."""
|
|
with mock.patch.dict(
|
|
os.environ, {"OLLAMA_HOST": "https://ollama.example.com"}, clear=False
|
|
):
|
|
reloaded = importlib.reload(hc_main)
|
|
try:
|
|
assert reloaded.ollamaUrl == "https://ollama.example.com"
|
|
finally:
|
|
# Restore the module to the ambient environment for other tests.
|
|
importlib.reload(reloaded)
|
|
|
|
|
|
def test_module_level_ollamaUrl_defaults_to_localhost():
|
|
env = {k: v for k, v in os.environ.items() if k != "OLLAMA_HOST"}
|
|
with mock.patch.dict(os.environ, env, clear=True):
|
|
reloaded = importlib.reload(hc_main)
|
|
try:
|
|
assert reloaded.ollamaUrl == "http://localhost:11434"
|
|
finally:
|
|
importlib.reload(reloaded)
|