Two changes:
1) Drop every check except the allowlist lookup.
Old _validate_url_host did: scheme check, host-presence check,
IP-literal check, empty-allowlist check, then glob match.
New _validate_url_host does: parse host, return on glob match,
raise on miss. That's it. The only remaining structural check is
'the URL must have a host' (otherwise the glob has nothing to
test against).
Security implication: scheme (file://, gopher://, ftp://) and
IP literals (10.0.0.1, ::1) are NO LONGER rejected by the
validator. The allowlist is the single source of truth. If the
user writes ['*.*.*.*'], they have opted in to 4-label hosts
including IP literals; if they write ['ccam*'], they get ccam1-
ccam99 and nothing else. The default ['ccam*'] / [] pattern is
tight by construction.
Removed: import ipaddress, the scheme/IP rejection branches, the
'allowlist empty' explicit branch (the empty list naturally
matches nothing).
2) Rename allowed_url_hosts -> url_allowlist.
The previous name was a verbose double-negative ('allowed ... hosts').
The new name is short, modern (allowlist > whitelist), and matches
the pattern of the field (URL hosts allowed). Renamed in:
- Connection (models.py)
- SaveConnectionRequest, UpdateConnectionRequest, FetchUrlRequest
(requests.py)
- _validate_url_host, _host_matches_any_glob parameters
(fetch_url.py)
- save_connection / update_connection call sites and error
messages (connections.py, fetch_url.py)
- Route descriptions (server.py)
- All test files
- README
No backward-compat alias: the field was added in 0291f36 and
hasn't shipped, so no production migration. Local dev data
(data/connections.json, gitignored) with allowed_url_hosts set
will be silently dropped by Pydantic v2 (default for extra
fields is ignore) — those connections lose their allowlist and
fetch_url will reject everything until re-saved.
Test cleanup:
- Removed 9 obsolete tests (scheme/IP/suffix rejection)
- Renamed allowed_url_hosts -> url_allowlist in 11 surviving tests
- Added 4 new tests documenting the 'allowlist is the only gate'
model: IP literal accepted, HTTPS accepted, no-host rejected,
empty allowlist rejected, error message mentions url_allowlist
-1 obsolete test, net -4 from 386 -> 382 tests passing.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
189 lines
6.5 KiB
Python
189 lines
6.5 KiB
Python
# coding=utf-8
|
|
import json
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from spark_executor.core import connection_store
|
|
from spark_executor.tools import connections
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _fresh_store(tmp_path: Path, monkeypatch):
|
|
monkeypatch.setattr(connection_store, "DEFAULT_DATA_DIR", str(tmp_path))
|
|
monkeypatch.setattr(connection_store, "store", connection_store.ConnectionStore())
|
|
monkeypatch.setattr(connections, "store", connection_store.store)
|
|
return connection_store.store
|
|
|
|
|
|
# --- save_connection ---
|
|
|
|
def test_save_connection(_fresh_store):
|
|
out = connections.save_connection(name="prod", master="yarn")
|
|
assert out == {"name": "prod", "status": "SAVED"}
|
|
assert _fresh_store.get("prod") is not None
|
|
|
|
|
|
def test_save_connection_upserts(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
connections.save_connection(name="prod", master="spark://new:7077", deploy_mode="client")
|
|
assert _fresh_store.get("prod").master == "spark://new:7077"
|
|
assert _fresh_store.get("prod").deploy_mode == "client"
|
|
|
|
|
|
def test_save_connection_with_spark_conf(_fresh_store):
|
|
connections.save_connection(
|
|
name="dev",
|
|
master="yarn",
|
|
spark_conf={"spark.sql.shuffle.partitions": "200"},
|
|
)
|
|
assert _fresh_store.get("dev").spark_conf["spark.sql.shuffle.partitions"] == "200"
|
|
|
|
|
|
# --- list_connections ---
|
|
|
|
def test_list_connections_empty(_fresh_store):
|
|
assert connections.list_connections() == []
|
|
|
|
|
|
def test_list_connections_returns_all_saved(_fresh_store):
|
|
connections.save_connection(name="a", master="yarn")
|
|
connections.save_connection(name="b", master="spark://m:7077", deploy_mode="client")
|
|
out = connections.list_connections()
|
|
names = {c["name"] for c in out}
|
|
assert names == {"a", "b"}
|
|
masters = {c["name"]: c["master"] for c in out}
|
|
assert masters == {"a": "yarn", "b": "spark://m:7077"}
|
|
|
|
|
|
# --- get_connection ---
|
|
|
|
def test_get_connection_returns_dict(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn", deploy_mode="cluster")
|
|
out = connections.get_connection("prod")
|
|
assert out["name"] == "prod"
|
|
assert out["master"] == "yarn"
|
|
assert out["deploy_mode"] == "cluster"
|
|
assert out["yarn_rm_url"] is None
|
|
assert out["spark_conf"] == {}
|
|
assert out["ssl_verify"] is None
|
|
assert out["ssl_ca_bundle"] is None
|
|
|
|
|
|
def test_save_connection_preserves_ssl_fields(_fresh_store):
|
|
connections.save_connection(
|
|
name="secure",
|
|
master="yarn",
|
|
ssl_verify=False,
|
|
ssl_ca_bundle="/tmp/ca.crt",
|
|
)
|
|
out = connections.get_connection("secure")
|
|
assert out["ssl_verify"] is False
|
|
assert out["ssl_ca_bundle"] == "/tmp/ca.crt"
|
|
|
|
|
|
def test_save_connection_with_basic_auth(_fresh_store):
|
|
connections.save_connection(
|
|
name="secure",
|
|
master="yarn",
|
|
auth_type="basic",
|
|
auth_user="hdfs",
|
|
auth_password="secret",
|
|
)
|
|
out = connections.get_connection("secure")
|
|
assert out["auth_type"] == "basic"
|
|
assert out["auth_user"] == "hdfs"
|
|
assert out["auth_password"] == "secret"
|
|
|
|
|
|
def test_save_connection_invalid_auth_type_raises(_fresh_store):
|
|
with pytest.raises(ValueError, match="auth_type must be one of none/simple/basic/kerberos"):
|
|
connections.save_connection(
|
|
name="bad",
|
|
master="yarn",
|
|
auth_type="oauth",
|
|
)
|
|
|
|
|
|
def test_get_connection_unknown_raises(_fresh_store):
|
|
with pytest.raises(KeyError):
|
|
connections.get_connection("missing")
|
|
|
|
|
|
# --- delete_connection ---
|
|
|
|
def test_delete_connection_returns_status(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
assert connections.delete_connection("prod") == {"name": "prod", "status": "DELETED"}
|
|
assert _fresh_store.get("prod") is None
|
|
|
|
|
|
def test_delete_connection_unknown_raises(_fresh_store):
|
|
with pytest.raises(KeyError):
|
|
connections.delete_connection("missing")
|
|
def test_update_connection_changes_specified_field(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
out = connections.update_connection(name="prod", master="spark://new:7077")
|
|
assert out["master"] == "spark://new:7077"
|
|
assert _fresh_store.get("prod").master == "spark://new:7077"
|
|
|
|
|
|
def test_update_connection_keeps_omitted_fields(_fresh_store):
|
|
connections.save_connection(
|
|
name="prod",
|
|
master="yarn",
|
|
deploy_mode="client",
|
|
yarn_rm_url="http://rm:8088",
|
|
)
|
|
out = connections.update_connection(name="prod", deploy_mode="cluster")
|
|
assert out["deploy_mode"] == "cluster"
|
|
assert out["master"] == "yarn"
|
|
assert out["yarn_rm_url"] == "http://rm:8088"
|
|
|
|
|
|
def test_update_connection_with_no_fields_is_noop(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn", deploy_mode="client")
|
|
out = connections.update_connection(name="prod")
|
|
assert out["master"] == "yarn"
|
|
assert out["deploy_mode"] == "client"
|
|
|
|
|
|
def test_update_connection_changes_url_allowlist(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
out = connections.update_connection(name="prod", url_allowlist=["ccam*"])
|
|
assert out["url_allowlist"] == ["ccam*"]
|
|
|
|
|
|
def test_update_connection_replaces_not_merges_dict(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn", spark_conf={"a": "1"})
|
|
out = connections.update_connection(name="prod", spark_conf={"b": "2"})
|
|
assert out["spark_conf"] == {"b": "2"}
|
|
|
|
|
|
def test_update_connection_replaces_not_merges_url_allowlist(_fresh_store):
|
|
connections.save_connection(
|
|
name="prod",
|
|
master="yarn",
|
|
url_allowlist=["ccam*"],
|
|
)
|
|
out = connections.update_connection(name="prod", url_allowlist=["nm*"])
|
|
assert out["url_allowlist"] == ["nm*"]
|
|
|
|
|
|
def test_update_connection_raises_for_unknown_name(_fresh_store):
|
|
with pytest.raises(KeyError, match="Connection not found"):
|
|
connections.update_connection(name="missing", master="yarn")
|
|
|
|
|
|
def test_update_connection_validates_patched_connection(_fresh_store):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
with pytest.raises(ValueError, match="master must be"):
|
|
connections.update_connection(name="prod", master="http://bad")
|
|
|
|
|
|
def test_update_connection_persists_to_disk(_fresh_store, tmp_path):
|
|
connections.save_connection(name="prod", master="yarn")
|
|
connections.update_connection(name="prod", master="spark://new:7077")
|
|
raw = json.loads((tmp_path / "connections.json").read_text())
|
|
assert raw["prod"]["master"] == "spark://new:7077"
|