f9519454ca
All 19 open actions/cache-poisoning/poisonable-step alerts (#88-#106) sit in release.yml, release-candidate.yml and release-artifacts.yml: jobs interpolated the caller SHA into ref/caches and let setup-node's implicit npm cache key on run identity. Now caller source_sha is pinned against github.sha by a pin job (refusing any retarget), checkout and build identity use GITHUB_SHA through env indirection instead of template interpolation, rust-cache keys use stable prefix-key values, and setup-node's implicit package cache is off where it cannot be keyed safely. Also carries the CodeQL #107 fix from the same lane: catalog_models_dev.py prints remote limit values as numbers/null/redacted only and drops query and fragment material from source URLs before logging. Harvested from #5401 (workflow+script files; CHANGELOG edit intentionally excluded here and lands with the release branch; GHSA advisory text split to a later PR as advised). No-Issue: CodeQL alert remediation (alerts #88-#107); no single user-facing issue tracks these Signed-off-by: Hunter Bown <hunter@hmbown.com>
174 lines
6.2 KiB
Python
Executable File
174 lines
6.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Offline tests for scripts/catalog_models_dev.py (#4117)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
SCRIPT = ROOT / "scripts" / "catalog_models_dev.py"
|
|
SEED = ROOT / "crates" / "config" / "assets" / "models_dev.bundled.json"
|
|
|
|
|
|
class CatalogModelsDevScriptTests(unittest.TestCase):
|
|
def test_snapshot_check_validates_offline_seed(self) -> None:
|
|
proc = subprocess.run(
|
|
[sys.executable, str(SCRIPT), "snapshot", "--check", str(SEED)],
|
|
cwd=ROOT,
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
self.assertEqual(proc.returncode, 0, proc.stderr)
|
|
self.assertIn("ok:", proc.stdout)
|
|
self.assertIn("providers=", proc.stdout)
|
|
|
|
def test_scrub_drops_api_key_fields(self) -> None:
|
|
# Import helpers without network.
|
|
sys.path.insert(0, str(ROOT / "scripts"))
|
|
import catalog_models_dev as mod # type: ignore
|
|
|
|
dirty = {
|
|
"models": {},
|
|
"providers": {
|
|
"deepseek": {
|
|
"api_key": "sk-should-never-persist",
|
|
"models": {"deepseek-v4-pro": {"id": "deepseek-v4-pro"}},
|
|
}
|
|
},
|
|
"token": "nope",
|
|
}
|
|
clean = mod.scrub_secrets(dirty)
|
|
self.assertNotIn("token", clean)
|
|
self.assertNotIn("api_key", clean["providers"]["deepseek"])
|
|
self.assertIn("models", clean["providers"]["deepseek"])
|
|
|
|
def test_ensure_shape_rejects_empty_object(self) -> None:
|
|
sys.path.insert(0, str(ROOT / "scripts"))
|
|
import catalog_models_dev as mod # type: ignore
|
|
|
|
with self.assertRaises(SystemExit):
|
|
mod.ensure_models_dev_shape({}, "test")
|
|
|
|
def test_public_document_drops_api_key(self) -> None:
|
|
sys.path.insert(0, str(ROOT / "scripts"))
|
|
import catalog_models_dev as mod # type: ignore
|
|
|
|
dirty = {
|
|
"models": {},
|
|
"providers": {"deepseek": {"api_key": "sk-x", "models": {}}},
|
|
"token": "nope",
|
|
}
|
|
clean = mod.public_models_dev_document(dirty)
|
|
self.assertNotIn("token", clean)
|
|
self.assertNotIn("api_key", clean["providers"]["deepseek"])
|
|
|
|
def test_refresh_write_cache_is_rejected_without_writing(self) -> None:
|
|
with tempfile.TemporaryDirectory() as td:
|
|
source = Path(td) / "catalog.json"
|
|
target = Path(td) / "cache.json"
|
|
source.write_text(
|
|
json.dumps({"models": {}, "providers": {}, "api_key": "sk-nope"}),
|
|
encoding="utf-8",
|
|
)
|
|
env = os.environ.copy()
|
|
env["CODEWHALE_MODELS_DEV_PATH"] = str(source)
|
|
|
|
proc = subprocess.run(
|
|
[
|
|
sys.executable,
|
|
str(SCRIPT),
|
|
"refresh",
|
|
"--write-cache",
|
|
str(target),
|
|
],
|
|
cwd=ROOT,
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
env=env,
|
|
)
|
|
|
|
self.assertNotEqual(proc.returncode, 0)
|
|
self.assertIn("disk writes are intentionally unsupported", proc.stderr)
|
|
self.assertFalse(target.exists(), "refresh must remain dry-run only")
|
|
|
|
def test_public_limit_value_never_echoes_tokens(self) -> None:
|
|
sys.path.insert(0, str(ROOT / "scripts"))
|
|
import catalog_models_dev as mod # type: ignore
|
|
|
|
self.assertEqual(mod.public_limit_value(128000), "128000")
|
|
self.assertEqual(mod.public_limit_value(None), "null")
|
|
self.assertEqual(mod.public_limit_value("sk-this-is-a-token"), "redacted")
|
|
self.assertEqual(mod.public_limit_value({"authorization": "Bearer secret"}), "redacted")
|
|
self.assertEqual(mod.public_limit_value(True), "redacted")
|
|
|
|
def test_public_source_label_strips_query_string(self) -> None:
|
|
sys.path.insert(0, str(ROOT / "scripts"))
|
|
import catalog_models_dev as mod # type: ignore
|
|
|
|
self.assertEqual(
|
|
mod.public_source_label("url:https://models.dev/catalog.json?token=sk-leak"),
|
|
"url:https://models.dev/catalog.json",
|
|
)
|
|
self.assertEqual(mod.public_source_label("file:/tmp/catalog.json"), "file:/tmp/catalog.json")
|
|
|
|
def test_drift_does_not_print_token_shaped_upstream_limits(self) -> None:
|
|
with tempfile.TemporaryDirectory() as td:
|
|
seed = Path(td) / "seed.json"
|
|
upstream = Path(td) / "upstream.json"
|
|
seed.write_text(
|
|
json.dumps(
|
|
{
|
|
"models": {
|
|
"demo": {"limit": {"context": 1000, "output": 100}},
|
|
},
|
|
"providers": {},
|
|
}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
upstream.write_text(
|
|
json.dumps(
|
|
{
|
|
"models": {
|
|
"demo": {
|
|
"limit": {
|
|
"context": 1000,
|
|
"output": "sk-this-is-a-token",
|
|
}
|
|
},
|
|
},
|
|
"providers": {},
|
|
"token": "sk-header-token",
|
|
}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
env = os.environ.copy()
|
|
env["CODEWHALE_MODELS_DEV_PATH"] = str(upstream)
|
|
proc = subprocess.run(
|
|
[sys.executable, str(SCRIPT), "drift", "--seed", str(seed)],
|
|
cwd=ROOT,
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
env=env,
|
|
)
|
|
combined = f"{proc.stdout}\n{proc.stderr}"
|
|
self.assertNotEqual(proc.returncode, 0)
|
|
self.assertNotIn("sk-this-is-a-token", combined)
|
|
self.assertNotIn("sk-header-token", combined)
|
|
self.assertIn("redacted", combined)
|
|
self.assertIn("limit.output", combined)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|