feat(spec-05-auth-fallback-chain): worker (eng_flash_high) implementation
This commit is contained in:
1 parent
d96d8fb1fa
commit
89ca1ec621
3 files changed
+251
-38
No files matched your search
+108
-27
@@ -3,9 +3,13 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import ast
|
import ast
|
||||||
|
import importlib
|
||||||
|
import importlib.util
|
||||||
import json
|
import json
|
||||||
import math
|
import math
|
||||||
import re
|
import re
|
||||||
|
import shlex
|
||||||
|
import sys
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
@@ -14,9 +18,28 @@ from collections.abc import Callable, Iterable
|
|||||||
from contextlib import suppress
|
from contextlib import suppress
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
|
from pathlib import Path
|
||||||
from typing import Any, NoReturn
|
from typing import Any, NoReturn
|
||||||
|
|
||||||
from connpy.services.exceptions import ConnpyError
|
|
||||||
|
def _load_connpy_error() -> type[Exception]:
|
||||||
|
mod_name = "connpy.services.exceptions"
|
||||||
|
existing = sys.modules.get(mod_name)
|
||||||
|
if existing is not None and hasattr(existing, "ConnpyError"):
|
||||||
|
return existing.ConnpyError
|
||||||
|
if "connpy.services" not in sys.modules:
|
||||||
|
exc_path = Path(__file__).resolve().parent / "services" / "exceptions.py"
|
||||||
|
spec = importlib.util.spec_from_file_location(mod_name, exc_path)
|
||||||
|
if spec is not None and spec.loader is not None:
|
||||||
|
mod = importlib.util.module_from_spec(spec)
|
||||||
|
sys.modules[mod_name] = mod
|
||||||
|
spec.loader.exec_module(mod)
|
||||||
|
return mod.ConnpyError
|
||||||
|
mod = importlib.import_module(mod_name)
|
||||||
|
return mod.ConnpyError
|
||||||
|
|
||||||
|
|
||||||
|
ConnpyError = _load_connpy_error()
|
||||||
|
|
||||||
MAX_FALLBACK_ENTRIES = 5
|
MAX_FALLBACK_ENTRIES = 5
|
||||||
MAX_PROFILE_DEPTH = 5
|
MAX_PROFILE_DEPTH = 5
|
||||||
@@ -57,7 +80,7 @@ _ANSI_CSI_RE = re.compile(r"\x1b\[[0-9;?]*[ -/]*[@-~]|\x1b[@-Z\\-_]")
|
|||||||
_PROFILE_REF_BODY_RE = re.compile(r"[A-Za-z0-9_.$:/-]+", re.ASCII)
|
_PROFILE_REF_BODY_RE = re.compile(r"[A-Za-z0-9_.$:/-]+", re.ASCII)
|
||||||
_RSA_BLOB_RE = re.compile(r"""^b(["']).+\1$""", re.DOTALL)
|
_RSA_BLOB_RE = re.compile(r"""^b(["']).+\1$""", re.DOTALL)
|
||||||
_INSECURE_HOSTKEY_RE = re.compile(
|
_INSECURE_HOSTKEY_RE = re.compile(
|
||||||
r"(?:^|\s)(?:-o\s*)?stricthostkeychecking\s*=\s*no(?:\s|$)",
|
r"(?:^|\s)(?:-o\s*)?(?:stricthostkeychecking\s*=\s*(?:no|off)|userknownhostsfile\s*=\s*/dev/null)(?=\s|$)",
|
||||||
re.IGNORECASE,
|
re.IGNORECASE,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -204,14 +227,8 @@ def clear_exception_frames(exc: BaseException | None) -> None:
|
|||||||
|
|
||||||
tb = getattr(cur, "__traceback__", None)
|
tb = getattr(cur, "__traceback__", None)
|
||||||
if tb is not None:
|
if tb is not None:
|
||||||
try:
|
with suppress(RuntimeError):
|
||||||
traceback.clear_frames(tb)
|
traceback.clear_frames(tb)
|
||||||
except RuntimeError:
|
|
||||||
node = tb
|
|
||||||
while node is not None:
|
|
||||||
with suppress(RuntimeError, AttributeError):
|
|
||||||
node.tb_frame.clear()
|
|
||||||
node = node.tb_next
|
|
||||||
|
|
||||||
with suppress(AttributeError, TypeError):
|
with suppress(AttributeError, TypeError):
|
||||||
cur.__traceback__ = None
|
cur.__traceback__ = None
|
||||||
@@ -244,6 +261,7 @@ def redact_known_secrets(
|
|||||||
def sanitize_log_message(message: str, *, secrets: Iterable[str] = ()) -> str:
|
def sanitize_log_message(message: str, *, secrets: Iterable[str] = ()) -> str:
|
||||||
"""Strip ANSI sequences, control chars, and known secrets from a log line."""
|
"""Strip ANSI sequences, control chars, and known secrets from a log line."""
|
||||||
text = str(message) if message is not None else ""
|
text = str(message) if message is not None else ""
|
||||||
|
text = redact_known_secrets(text, secrets=secrets, min_len=1)
|
||||||
text = _ANSI_OSC_RE.sub("", text)
|
text = _ANSI_OSC_RE.sub("", text)
|
||||||
text = _ANSI_CSI_RE.sub("", text)
|
text = _ANSI_CSI_RE.sub("", text)
|
||||||
text = _CONTROL_CHAR_RE.sub("", text)
|
text = _CONTROL_CHAR_RE.sub("", text)
|
||||||
@@ -833,17 +851,7 @@ def validate_fallback_entries(
|
|||||||
if not stripped:
|
if not stripped:
|
||||||
return []
|
return []
|
||||||
if stripped.startswith(("[", "{")):
|
if stripped.startswith(("[", "{")):
|
||||||
if (
|
|
||||||
len(stripped) > MAX_JSON_INPUT_BYTES
|
|
||||||
or len(stripped.encode("utf-8", errors="replace")) > MAX_JSON_INPUT_BYTES
|
|
||||||
):
|
|
||||||
raise ValueError(
|
|
||||||
f"JSON input exceeds maximum size of {MAX_JSON_INPUT_BYTES} bytes"
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
parsed = validate_json_depth_and_size(stripped)
|
parsed = validate_json_depth_and_size(stripped)
|
||||||
except json.JSONDecodeError:
|
|
||||||
return [stripped]
|
|
||||||
else:
|
else:
|
||||||
if stripped.startswith("compose:"):
|
if stripped.startswith("compose:"):
|
||||||
validate_compose_syntax(stripped)
|
validate_compose_syntax(stripped)
|
||||||
@@ -999,13 +1007,13 @@ def _resolve_fallback_entries_internal(
|
|||||||
)
|
)
|
||||||
own_user = str(u) if u not in (None, "") else ""
|
own_user = str(u) if u not in (None, "") else ""
|
||||||
own_pw: Any = p if p not in (None, "", []) else ""
|
own_pw: Any = p if p not in (None, "", []) else ""
|
||||||
prof_fb = prof_obj.get("fallback")
|
|
||||||
if prof_fb not in (None, "", []):
|
|
||||||
has_own = (
|
has_own = (
|
||||||
bool(own_user)
|
bool(own_user)
|
||||||
or (isinstance(own_pw, list) and bool(own_pw))
|
or (isinstance(own_pw, list) and bool(own_pw))
|
||||||
or (isinstance(own_pw, str) and own_pw != "")
|
or (isinstance(own_pw, str) and own_pw != "")
|
||||||
)
|
)
|
||||||
|
prof_fb = prof_obj.get("fallback")
|
||||||
|
if prof_fb not in (None, "", []):
|
||||||
if has_own:
|
if has_own:
|
||||||
if len(resolved) >= max_entries:
|
if len(resolved) >= max_entries:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
@@ -1019,6 +1027,10 @@ def _resolve_fallback_entries_internal(
|
|||||||
_depth=_depth + 1,
|
_depth=_depth + 1,
|
||||||
_visited=_visited | {ref_name},
|
_visited=_visited | {ref_name},
|
||||||
)
|
)
|
||||||
|
if not has_own and not sub_entries:
|
||||||
|
raise ValueError(
|
||||||
|
f"Referenced fallback profile {ref_name!r} has no credentials"
|
||||||
|
)
|
||||||
for sub in sub_entries:
|
for sub in sub_entries:
|
||||||
if len(resolved) >= max_entries:
|
if len(resolved) >= max_entries:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
@@ -1026,6 +1038,10 @@ def _resolve_fallback_entries_internal(
|
|||||||
)
|
)
|
||||||
resolved.append(sub)
|
resolved.append(sub)
|
||||||
else:
|
else:
|
||||||
|
if not has_own:
|
||||||
|
raise ValueError(
|
||||||
|
f"Referenced fallback profile {ref_name!r} has no credentials"
|
||||||
|
)
|
||||||
if len(resolved) >= max_entries:
|
if len(resolved) >= max_entries:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"Fallback exceeds maximum of {max_entries} entries"
|
f"Fallback exceeds maximum of {max_entries} entries"
|
||||||
@@ -1213,7 +1229,7 @@ def host_exact_re(host: str) -> re.Pattern[str]:
|
|||||||
"""Compile an exact host boundary regex with zero FQDN subdomain wildcard risk."""
|
"""Compile an exact host boundary regex with zero FQDN subdomain wildcard risk."""
|
||||||
escaped = re.escape(str(host))
|
escaped = re.escape(str(host))
|
||||||
return re.compile(
|
return re.compile(
|
||||||
rf"(?<![A-Za-z0-9._-]){escaped}(?![A-Za-z0-9._-])(?=$|[\s:\]'\"])",
|
rf"(?<![A-Za-z0-9._-]){escaped}(?![A-Za-z0-9._-])(?=$|[\s:\]'\"#>$),])",
|
||||||
re.IGNORECASE | re.ASCII,
|
re.IGNORECASE | re.ASCII,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1231,12 +1247,58 @@ def normalize_prompt_line(before_bytes: bytes, after_bytes: bytes) -> str:
|
|||||||
return _CONTROL_CHAR_RE.sub("", lines[-1]).strip()
|
return _CONTROL_CHAR_RE.sub("", lines[-1]).strip()
|
||||||
|
|
||||||
|
|
||||||
|
def _is_insecure_ssh_opt_spec(spec: str) -> bool:
|
||||||
|
norm = re.sub(r"\s+", " ", spec.strip()).lower()
|
||||||
|
if "=" in norm:
|
||||||
|
key, val = norm.split("=", 1)
|
||||||
|
else:
|
||||||
|
parts = norm.split(None, 1)
|
||||||
|
if len(parts) != 2:
|
||||||
|
return False
|
||||||
|
key, val = parts[0], parts[1]
|
||||||
|
key = key.strip().strip("\"'")
|
||||||
|
val = val.strip().strip("\"'")
|
||||||
|
return (key == "stricthostkeychecking" and val in ("no", "off")) or (
|
||||||
|
key == "userknownhostsfile" and val == "/dev/null"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _has_insecure_ssh_options(raw_opts: str) -> bool:
|
||||||
|
if _INSECURE_HOSTKEY_RE.search(raw_opts):
|
||||||
|
return True
|
||||||
|
try:
|
||||||
|
tokens = shlex.split(raw_opts)
|
||||||
|
except ValueError:
|
||||||
|
tokens = raw_opts.split()
|
||||||
|
|
||||||
|
n = len(tokens)
|
||||||
|
for i, tok in enumerate(tokens):
|
||||||
|
if tok.lower() == "-o":
|
||||||
|
if i + 1 < n and _is_insecure_ssh_opt_spec(tokens[i + 1]):
|
||||||
|
return True
|
||||||
|
if i + 2 < n and _is_insecure_ssh_opt_spec(f"{tokens[i + 1]} {tokens[i + 2]}"):
|
||||||
|
return True
|
||||||
|
continue
|
||||||
|
if tok[:2].lower() == "-o" and len(tok) > 2:
|
||||||
|
opt_body = tok[2:]
|
||||||
|
if _is_insecure_ssh_opt_spec(opt_body):
|
||||||
|
return True
|
||||||
|
if i + 1 < n and _is_insecure_ssh_opt_spec(f"{opt_body} {tokens[i + 1]}"):
|
||||||
|
return True
|
||||||
|
continue
|
||||||
|
if _is_insecure_ssh_opt_spec(tok):
|
||||||
|
return True
|
||||||
|
if i + 1 < n and _is_insecure_ssh_opt_spec(f"{tok} {tokens[i + 1]}"):
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def has_insecure_hostkey_checking(
|
def has_insecure_hostkey_checking(
|
||||||
options: str = "",
|
options: str = "",
|
||||||
tags: Any = None,
|
tags: Any = None,
|
||||||
hop_metas: Iterable[dict[str, Any]] = (),
|
hop_metas: Iterable[dict[str, Any]] = (),
|
||||||
) -> bool:
|
) -> bool:
|
||||||
"""Return True if StrictHostKeyChecking=no is present on target, mosh_ssh_options, or hops."""
|
"""Return True if StrictHostKeyChecking=no/off or UserKnownHostsFile=/dev/null is configured."""
|
||||||
candidates: list[str] = []
|
candidates: list[str] = []
|
||||||
if options:
|
if options:
|
||||||
candidates.append(str(options))
|
candidates.append(str(options))
|
||||||
@@ -1256,7 +1318,7 @@ def has_insecure_hostkey_checking(
|
|||||||
v = h_tags.get(k)
|
v = h_tags.get(k)
|
||||||
if v:
|
if v:
|
||||||
candidates.append(str(v))
|
candidates.append(str(v))
|
||||||
return any(_INSECURE_HOSTKEY_RE.search(c) for c in candidates)
|
return any(_has_insecure_ssh_options(c) for c in candidates)
|
||||||
|
|
||||||
|
|
||||||
class AuthAttemptTracker:
|
class AuthAttemptTracker:
|
||||||
@@ -1283,9 +1345,28 @@ class AuthAttemptTracker:
|
|||||||
raise ValueError(f"Invalid max_entries: expected >= 1, got {max_entries!r}")
|
raise ValueError(f"Invalid max_entries: expected >= 1, got {max_entries!r}")
|
||||||
self._ttl_seconds = ttl_val
|
self._ttl_seconds = ttl_val
|
||||||
self._max_entries = max_entries
|
self._max_entries = max_entries
|
||||||
self._default_max_host_attempts = int(default_max_host_attempts)
|
self._default_max_host_attempts = validate_strict_int_range(
|
||||||
self._default_max_hop_attempts = int(default_max_hop_attempts)
|
default_max_host_attempts,
|
||||||
self._default_max_global_user_attempts = default_max_global_user_attempts
|
"default_max_host_attempts",
|
||||||
|
MIN_TOTAL_AUTH_ATTEMPTS,
|
||||||
|
MAX_TOTAL_AUTH_ATTEMPTS_CAP,
|
||||||
|
)
|
||||||
|
self._default_max_hop_attempts = validate_strict_int_range(
|
||||||
|
default_max_hop_attempts,
|
||||||
|
"default_max_hop_attempts",
|
||||||
|
MIN_HOP_HOST_ATTEMPTS,
|
||||||
|
MAX_HOP_HOST_ATTEMPTS_CAP,
|
||||||
|
)
|
||||||
|
self._default_max_global_user_attempts: int | None = (
|
||||||
|
validate_strict_int_range(
|
||||||
|
default_max_global_user_attempts,
|
||||||
|
"default_max_global_user_attempts",
|
||||||
|
1,
|
||||||
|
1000,
|
||||||
|
)
|
||||||
|
if default_max_global_user_attempts is not None
|
||||||
|
else None
|
||||||
|
)
|
||||||
self._clock = clock
|
self._clock = clock
|
||||||
self._lock = threading.Lock()
|
self._lock = threading.Lock()
|
||||||
self._unblocked: OrderedDict[Any, _BudgetEntry] = OrderedDict()
|
self._unblocked: OrderedDict[Any, _BudgetEntry] = OrderedDict()
|
||||||
|
|||||||
+20
-8
@@ -3658,11 +3658,8 @@ class node:
|
|||||||
next_action = "next_candidate"
|
next_action = "next_candidate"
|
||||||
break
|
break
|
||||||
|
|
||||||
if (
|
if unattended and not transport_error_seen:
|
||||||
unattended
|
if st["target_creds_sent"]:
|
||||||
and not transport_error_seen
|
|
||||||
and st["target_creds_sent"]
|
|
||||||
):
|
|
||||||
if (int(st["cand_idx"]) + 1) < len(runtime_candidates):
|
if (int(st["cand_idx"]) + 1) < len(runtime_candidates):
|
||||||
eof_adv = int(st["eof_fallback_advances"])
|
eof_adv = int(st["eof_fallback_advances"])
|
||||||
if eof_adv < MAX_EOF_FALLBACK_ADVANCES:
|
if eof_adv < MAX_EOF_FALLBACK_ADVANCES:
|
||||||
@@ -3671,11 +3668,26 @@ class node:
|
|||||||
next_action = "next_candidate"
|
next_action = "next_candidate"
|
||||||
break
|
break
|
||||||
return str(
|
return str(
|
||||||
sanitize_exception(None, code="EOF_BUDGET_EXHAUSTED", secrets=raw_secrets)
|
sanitize_exception(
|
||||||
|
None,
|
||||||
|
code="EOF_BUDGET_EXHAUSTED",
|
||||||
|
secrets=raw_secrets,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
if int(st["eof_fallback_advances"]) > 0:
|
|
||||||
return str(
|
return str(
|
||||||
sanitize_exception(None, code="AUTH_FAILED", secrets=raw_secrets)
|
sanitize_exception(
|
||||||
|
None,
|
||||||
|
code="AUTH_FAILED",
|
||||||
|
secrets=raw_secrets,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if effective_protocol != "local":
|
||||||
|
return str(
|
||||||
|
sanitize_exception(
|
||||||
|
None,
|
||||||
|
code="TRANSPORT_ERROR",
|
||||||
|
secrets=raw_secrets,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import os
|
|||||||
import pickle
|
import pickle
|
||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import textwrap
|
import textwrap
|
||||||
import threading
|
import threading
|
||||||
@@ -1605,7 +1606,10 @@ def test_signoff_fallback_inheritance_fail_closed_json_masking_and_atomic_budget
|
|||||||
assert dec_err_info.value.__suppress_context__ is True
|
assert dec_err_info.value.__suppress_context__ is True
|
||||||
assert "InnerKeySecret" not in str(dec_err_info.value)
|
assert "InnerKeySecret" not in str(dec_err_info.value)
|
||||||
|
|
||||||
# 4. RecursionError protection on deep JSON & literal passwords starting with '[' or '{'
|
# Double-pass log redaction (both before and after control-char/ANSI stripping)
|
||||||
|
assert sanitize_log_message("pw=\x07Sec!", secrets=["\x07Sec"]) == "pw=***!"
|
||||||
|
|
||||||
|
# 4. RecursionError protection & fail-closed malformed JSON in top-level fallback
|
||||||
deep_json = "[" * 1500 + "1" + "]" * 1500
|
deep_json = "[" * 1500 + "1" + "]" * 1500
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
validate_json_depth_and_size(deep_json)
|
validate_json_depth_and_size(deep_json)
|
||||||
@@ -1613,8 +1617,13 @@ def test_signoff_fallback_inheritance_fail_closed_json_masking_and_atomic_budget
|
|||||||
deep_ref_json = "[" * 1500 + '"@tacacs"' + "]" * 1500
|
deep_ref_json = "[" * 1500 + '"@tacacs"' + "]" * 1500
|
||||||
assert extract_profile_refs_from_value(deep_ref_json) == set()
|
assert extract_profile_refs_from_value(deep_ref_json) == set()
|
||||||
|
|
||||||
assert validate_fallback_entries("{Admin}123") == ["{Admin}123"]
|
with pytest.raises(ValueError):
|
||||||
assert validate_fallback_entries("[Pa$$") == ["[Pa$$"]
|
validate_fallback_entries('[{"user":"a","password":"s3cr3t"')
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
validate_fallback_entries("{Admin}123")
|
||||||
|
assert validate_fallback_entries([{"user": "u", "password": "{Admin}123"}]) == [
|
||||||
|
{"user": "u", "password": "{Admin}123"}
|
||||||
|
]
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
validate_fallback_entries("[[[[[1]]]]]")
|
validate_fallback_entries("[[[[[1]]]]]")
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
@@ -1679,3 +1688,114 @@ def test_signoff_fallback_inheritance_fail_closed_json_masking_and_atomic_budget
|
|||||||
res_locked = n_locked._connect(unattended=True, attempt_tracker=t_atomic)
|
res_locked = n_locked._connect(unattended=True, attempt_tracker=t_atomic)
|
||||||
assert "[HOST_BUDGET_EXHAUSTED]" in str(res_locked)
|
assert "[HOST_BUDGET_EXHAUSTED]" in str(res_locked)
|
||||||
assert t_atomic.remaining_user("shared_u", limit=1) == 1
|
assert t_atomic.remaining_user("shared_u", limit=1) == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_signoff_ronda2_eof_empty_profiles_host_re_shlex_and_lazy_import() -> None:
|
||||||
|
# (a) Single-candidate EOF after sending password -> AUTH_FAILED; premature EOF -> TRANSPORT_ERROR
|
||||||
|
n_single = NodeClass(
|
||||||
|
"r_eof_single",
|
||||||
|
host="10.0.0.80",
|
||||||
|
user="u",
|
||||||
|
password="p1",
|
||||||
|
)
|
||||||
|
|
||||||
|
def _spawn_eof_after_pw(*_a, **_kw):
|
||||||
|
step = {"i": 0}
|
||||||
|
ch = None
|
||||||
|
|
||||||
|
def _exp(_p, timeout=None):
|
||||||
|
i = step["i"]
|
||||||
|
step["i"] += 1
|
||||||
|
if i == 0:
|
||||||
|
ch.after = b"Password:"
|
||||||
|
return 8
|
||||||
|
ch.before = b""
|
||||||
|
ch.after = b""
|
||||||
|
return 11
|
||||||
|
|
||||||
|
ch = _make_mock_child(expect_fn=_exp)
|
||||||
|
return ch
|
||||||
|
|
||||||
|
with patch("connpy.core.pexpect.spawn", side_effect=_spawn_eof_after_pw):
|
||||||
|
res_after = n_single._connect(unattended=True)
|
||||||
|
assert res_after is not True
|
||||||
|
assert "[AUTH_FAILED]" in str(res_after)
|
||||||
|
|
||||||
|
def _spawn_eof_before_pw(*_a, **_kw):
|
||||||
|
ch = _make_mock_child(
|
||||||
|
expect_fn=lambda _p, timeout=None: (
|
||||||
|
setattr(ch, "before", b""),
|
||||||
|
setattr(ch, "after", b""),
|
||||||
|
11,
|
||||||
|
)[-1]
|
||||||
|
)
|
||||||
|
return ch
|
||||||
|
|
||||||
|
with patch("connpy.core.pexpect.spawn", side_effect=_spawn_eof_before_pw):
|
||||||
|
res_before = n_single._connect(unattended=True)
|
||||||
|
assert res_before is not True
|
||||||
|
assert "[TRANSPORT_ERROR]" in str(res_before)
|
||||||
|
|
||||||
|
# (b) Empty referenced fallback profiles must fail closed
|
||||||
|
with pytest.raises(ValueError, match="no credentials"):
|
||||||
|
resolve_fallback_entries(["@empty_prof"], {"empty_prof": {"user": "", "password": ""}})
|
||||||
|
with pytest.raises(ValueError, match="no credentials"):
|
||||||
|
resolve_fallback_entries(
|
||||||
|
["@empty_sub"],
|
||||||
|
{"empty_sub": {"user": "", "password": "", "fallback": "[]"}},
|
||||||
|
)
|
||||||
|
|
||||||
|
# (c) host_exact_re boundary coverage
|
||||||
|
host_re = host_exact_re("host1")
|
||||||
|
for matching_prompt in (
|
||||||
|
"host1#",
|
||||||
|
"user@host1>",
|
||||||
|
"user@host1$",
|
||||||
|
"(user@host1) Password:",
|
||||||
|
"host1, ",
|
||||||
|
):
|
||||||
|
assert host_re.search(matching_prompt) is not None
|
||||||
|
for non_matching_prompt in ("host10#", "host1.attacker.com#"):
|
||||||
|
assert host_re.search(non_matching_prompt) is None
|
||||||
|
|
||||||
|
# (d) shlex-based insecure hostkey detection
|
||||||
|
for insecure_opt in (
|
||||||
|
'-o "StrictHostKeyChecking=no"',
|
||||||
|
"-o StrictHostKeyChecking no",
|
||||||
|
"-o StrictHostKeyChecking=off",
|
||||||
|
"-oStrictHostKeyChecking=no",
|
||||||
|
"-o UserKnownHostsFile=/dev/null",
|
||||||
|
"-oUserKnownHostsFile=/dev/null",
|
||||||
|
):
|
||||||
|
assert has_insecure_hostkey_checking(insecure_opt) is True
|
||||||
|
assert has_insecure_hostkey_checking("-o StrictHostKeyChecking=yes") is False
|
||||||
|
|
||||||
|
# (e) Isolated import of connpy.auth_utils + AuthAttemptTracker strict limit validation
|
||||||
|
repo_root = str(Path(__file__).resolve().parents[2])
|
||||||
|
subprocess.run(
|
||||||
|
[sys.executable, "-c", "import connpy.auth_utils"],
|
||||||
|
check=True,
|
||||||
|
cwd=repo_root,
|
||||||
|
)
|
||||||
|
subprocess.run(
|
||||||
|
[
|
||||||
|
sys.executable,
|
||||||
|
"-c",
|
||||||
|
(
|
||||||
|
"import sys, connpy.auth_utils as au; "
|
||||||
|
"assert 'connpy.services' not in sys.modules; "
|
||||||
|
"from connpy.services.exceptions import ConnpyError; "
|
||||||
|
"assert issubclass(au.SanitizedAuthError, ConnpyError)"
|
||||||
|
),
|
||||||
|
],
|
||||||
|
check=True,
|
||||||
|
cwd=repo_root,
|
||||||
|
)
|
||||||
|
for bad_limit in (True, False, 0, -1, 11, "2"):
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
AuthAttemptTracker(default_max_host_attempts=bad_limit)
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
AuthAttemptTracker(default_max_hop_attempts=bad_limit)
|
||||||
|
for bad_user_limit in (True, False, 0, -1, 1001, "2"):
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
AuthAttemptTracker(default_max_global_user_attempts=bad_user_limit)
|
||||||
Reference in new issue
Block a user