mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-27 01:22:18 +00:00
* ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: move tests/test_litellm integrations and secret_managers into tests/unit Rename-only. Mirrors the old paths, including the directory conftests and the prompt and JSON fixtures. Follow-up commits prune and wire them. * test: prune and repoint the moved integrations tests Deletes the 7 audited tests a stronger test in the same tree already covers, imports the TLS sink helpers from their new conftest path, and restores os.environ after each integrations test. Some presets write OTEL_EXPORTER_OTLP_HEADERS straight into os.environ, and without the legacy tree's test ordering that header leaked into the AgentOps tests. * ci: run the moved integrations tests under their legacy flag The integrations GHA shard and a new CircleCI job run the integrations unit selection. secret_managers joins the misc selection. * docs: point integrations and secret_managers references at tests/unit * test: make the moved integrations directories packages * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: keep the job's UNIT_FLAG out of the shard-script tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
125 lines
4.5 KiB
Python
125 lines
4.5 KiB
Python
"""SSTI regression coverage for non-dotprompt prompt managers.
|
|
|
|
DotpromptManager was hardened to render through
|
|
``ImmutableSandboxedEnvironment``. The sibling managers (gitlab, arize,
|
|
bitbucket) ship the exact same attacker-controlled-template surface —
|
|
repository write access or workspace edit access turns into RCE on the
|
|
proxy host if the renderer is unsandboxed. This suite locks in the sandbox
|
|
so the regression can't recur.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
from jinja2.exceptions import SecurityError
|
|
from jinja2.sandbox import ImmutableSandboxedEnvironment
|
|
|
|
from litellm.integrations.arize.arize_phoenix_prompt_manager import (
|
|
ArizePhoenixTemplateManager,
|
|
)
|
|
from litellm.integrations.bitbucket.bitbucket_prompt_manager import (
|
|
BitBucketTemplateManager,
|
|
)
|
|
from litellm.integrations.gitlab.gitlab_prompt_manager import GitLabTemplateManager
|
|
|
|
# Classic Jinja2 SSTI payloads. Any one of these rendering as anything other
|
|
# than the literal string (or raising) means the sandbox isn't engaged.
|
|
_SSTI_PAYLOADS = [
|
|
"{{ ''.__class__.__mro__[1].__subclasses__() }}",
|
|
"{{ config.__class__.__init__.__globals__['os'].popen('id').read() }}",
|
|
"{{ cycler.__init__.__globals__.os.popen('id').read() }}",
|
|
"{{ ().__class__.__bases__[0].__subclasses__() }}",
|
|
]
|
|
|
|
|
|
def _build_gitlab_manager() -> GitLabTemplateManager:
|
|
# The constructor calls into a GitLab client when prompt_id is set; pass
|
|
# None so __init__ stops at jinja_env construction and we can assert on it.
|
|
return GitLabTemplateManager(
|
|
gitlab_config={"project": "p", "access_token": "t", "branch": "main"},
|
|
prompt_id=None,
|
|
gitlab_client=MagicMock(),
|
|
)
|
|
|
|
|
|
def _build_bitbucket_manager(monkeypatch) -> BitBucketTemplateManager:
|
|
# Stub the BitBucket client so we don't need network or real config.
|
|
from litellm.integrations.bitbucket import bitbucket_prompt_manager
|
|
|
|
monkeypatch.setattr(
|
|
bitbucket_prompt_manager, "BitBucketClient", lambda *a, **kw: MagicMock()
|
|
)
|
|
return BitBucketTemplateManager(
|
|
bitbucket_config={"workspace": "w", "repository": "r", "access_token": "t"},
|
|
prompt_id=None,
|
|
)
|
|
|
|
|
|
def _build_arize_manager(monkeypatch) -> ArizePhoenixTemplateManager:
|
|
from litellm.integrations.arize import arize_phoenix_prompt_manager
|
|
|
|
monkeypatch.setattr(
|
|
arize_phoenix_prompt_manager, "ArizePhoenixClient", lambda *a, **kw: MagicMock()
|
|
)
|
|
return ArizePhoenixTemplateManager(
|
|
api_key="k",
|
|
api_base="https://example.test",
|
|
prompt_id=None,
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"manager_factory",
|
|
[
|
|
("gitlab", lambda mp: _build_gitlab_manager()),
|
|
("bitbucket", _build_bitbucket_manager),
|
|
("arize", _build_arize_manager),
|
|
],
|
|
ids=lambda v: v[0] if isinstance(v, tuple) else v,
|
|
)
|
|
def test_jinja_env_is_sandboxed(manager_factory, monkeypatch):
|
|
"""Each prompt manager must render via ``ImmutableSandboxedEnvironment``."""
|
|
_, factory = manager_factory
|
|
manager = factory(monkeypatch)
|
|
assert isinstance(manager.jinja_env, ImmutableSandboxedEnvironment)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"manager_factory",
|
|
[
|
|
("gitlab", lambda mp: _build_gitlab_manager()),
|
|
("bitbucket", _build_bitbucket_manager),
|
|
("arize", _build_arize_manager),
|
|
],
|
|
ids=lambda v: v[0] if isinstance(v, tuple) else v,
|
|
)
|
|
@pytest.mark.parametrize("payload", _SSTI_PAYLOADS)
|
|
def test_jinja_env_blocks_ssti_payloads(manager_factory, payload, monkeypatch):
|
|
"""Attribute-traversal payloads must raise ``SecurityError`` at render time.
|
|
|
|
A plain ``Environment()`` would happily evaluate these and execute
|
|
arbitrary Python on the proxy host.
|
|
"""
|
|
_, factory = manager_factory
|
|
manager = factory(monkeypatch)
|
|
template = manager.jinja_env.from_string(payload)
|
|
with pytest.raises(SecurityError):
|
|
template.render()
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"manager_factory",
|
|
[
|
|
("gitlab", lambda mp: _build_gitlab_manager()),
|
|
("bitbucket", _build_bitbucket_manager),
|
|
("arize", _build_arize_manager),
|
|
],
|
|
ids=lambda v: v[0] if isinstance(v, tuple) else v,
|
|
)
|
|
def test_jinja_env_still_renders_normal_variables(manager_factory, monkeypatch):
|
|
"""The sandbox is a strict superset for the legitimate use case — plain
|
|
``{{ var }}`` substitution must keep working unchanged."""
|
|
_, factory = manager_factory
|
|
manager = factory(monkeypatch)
|
|
template = manager.jinja_env.from_string("Hello {{ name }}!")
|
|
assert template.render(name="world") == "Hello world!"
|