Compare commits

..
15 changed files with 1423 additions and 22 deletions
+17
View File
@@ -0,0 +1,17 @@
"""Reject skipped/empty native CI runs without conflating driver child counts."""
import argparse
from pathlib import Path
import xml.etree.ElementTree as ET
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('report', type=Path)
parser.add_argument('--minimum', type=int, required=True)
args = parser.parse_args()
root = ET.parse(args.report).getroot()
cases = list(root.iter('testcase'))
if len(cases) < args.minimum:
raise SystemExit(f'Incomplete execution: {len(cases)} cases, expected at least {args.minimum}')
for case in cases:
if any(case.find(tag) is not None for tag in ('skipped', 'failure', 'error')):
raise SystemExit(f'Case did not pass: {case.get("classname")}::{case.get("name")}')
print(f'Verified {len(cases)} executed cases; no skipped, failed or errored cases')
+46
View File
@@ -0,0 +1,46 @@
import fs from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { spawnSync } from 'node:child_process';
import { parse } from 'acorn';
const root = fileURLToPath(new URL('../../', import.meta.url));
const manifest = JSON.parse(fs.readFileSync(path.join(root, 'tests/native-ci-manifest.json'), 'utf8'));
function files(directory) {
return fs.readdirSync(directory, { withFileTypes: true }).flatMap(entry => {
const target = path.join(directory, entry.name);
return entry.isDirectory() ? files(target) : /\.(?:mjs|cjs|js)$/.test(entry.name) ? [target] : [];
});
}
function importsNativeTest(node) {
if (!node || typeof node !== 'object') return false;
if (node.type === 'ImportDeclaration' && node.source.value === 'node:test') return true;
if (node.type === 'CallExpression' && node.callee.name === 'require' && node.arguments[0]?.value === 'node:test') return true;
return Object.values(node).some(value => Array.isArray(value) ? value.some(importsNativeTest) : importsNativeTest(value));
}
const discovered = files(path.join(root, 'tests')).filter(file => {
const source = fs.readFileSync(file, 'utf8');
return source.includes('node:test') && importsNativeTest(parse(source, { ecmaVersion: 'latest', sourceType: 'module' }));
}).map(file => path.relative(root, file).split(path.sep).join('/')).sort();
const assigned = Object.values(manifest).flatMap(group => Array.isArray(group) ? group : Object.keys(group));
if (new Set(assigned).size !== assigned.length || JSON.stringify([...assigned].sort()) !== JSON.stringify(discovered)) {
throw new Error('Native test coverage must be exhaustive and disjoint; update tests/native-ci-manifest.json for added, removed or duplicated files');
}
for (const wrappers of Object.values(manifest['python-ci'])) {
for (const wrapper of wrappers) if (!fs.existsSync(path.join(root, wrapper))) throw new Error(`Missing pytest wrapper: ${wrapper}`);
}
if (process.argv.includes('--list')) {
console.log(JSON.stringify({ discovered, runners: manifest }, null, 2));
} else {
const reports = path.join(root, 'test-results/native-node');
fs.mkdirSync(reports, { recursive: true });
const result = spawnSync(process.execPath, ['--test', '--test-concurrency=1',
'--test-reporter=spec', '--test-reporter-destination=stdout',
'--test-reporter=junit', `--test-reporter-destination=${path.join(reports, 'junit.xml')}`,
...manifest['native-ci']], {
cwd: root, stdio: 'inherit',
env: { ...process.env, ENDPOINT_URL: 'http://127.0.0.1:1' },
});
if (result.error) throw result.error;
process.exitCode = result.status ?? 1;
}
+423
View File
@@ -0,0 +1,423 @@
#!/usr/bin/env python3
"""Fail-closed independent verification and sanitization gate for test diagnostics.
Runs after test suite completion or abnormal runner termination (e.g. failures, timeouts, crashes).
Ensures that no unsanitized traces, raw credentials, temporary archives, or unauthorized
diagnostics can ever be published as CI artifacts, while preserving safe JUnit XML reporting.
"""
from __future__ import annotations
import argparse
import json
import logging
import os
import re
import shutil
import sys
import tempfile
import xml.etree.ElementTree as ET
from pathlib import Path
# Add repository root to Python path to import sanitizer
REPO_ROOT = Path(__file__).resolve().parents[2]
if str(REPO_ROOT) not in sys.path:
sys.path.insert(0, str(REPO_ROOT))
try:
from scripts.sanitize_trace_artifacts import sanitize_trace_archive
except ImportError:
# If import fails, define fail-closed fallback
def sanitize_trace_archive(zp: str) -> bool:
p = Path(zp)
if p.exists():
try:
p.unlink(missing_ok=True)
except OSError:
pass
return False
logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
logger = logging.getLogger("verify_sanitized_artifacts")
PNG_MAGIC = b"\x89PNG\r\n\x1a\n"
ALLOWED_JUNIT_ROOT_TAGS = frozenset({"testsuites", "testsuite"})
ALLOWED_JUNIT_ELEMENT_TAGS = frozenset({
"testsuites",
"testsuite",
"testcase",
"failure",
"error",
"skipped",
"system-out",
"system-err",
"properties",
"property",
})
SENSITIVE_KEY_PATTERN = re.compile(
r"(?i)(password|passwd|secret|token|api_key|apikey|access_token|refresh_token|"
r"private_key|auth_token|client_secret|session|session_id|sid|csrf|xsrf|jwt|credential|authorization)"
)
SECRET_REDACTION_PATTERNS = [
# 1. Authorization headers (Bearer / Basic)
re.compile(r"(?i)\b(bearer|basic)\s+([^\s,;\'\"<>]+)"),
# 2. Sensitive key-value pairs (key=value or key: value)
re.compile(
r"(?i)\b([a-z0-9_.-]*(?:password|passwd|secret|token|api_key|apikey|access_token|refresh_token|"
r"auth_token|client_secret|session|session_id|sid|csrf|xsrf|jwt|credential|authorization)[a-z0-9_.-]*)"
r"\s*([:=])\s*([^\s,;\'\"<>]+)"
),
# 3. URL credentials (scheme://user:pass@host)
re.compile(r"([a-zA-Z][a-zA-Z0-9+.-]*://[^:\s]+):([^@\s]+)@"),
# 4. JSON-formatted key-value pairs
re.compile(
r'(?i)("?(?:[a-z0-9_.-]*(?:password|passwd|secret|token|key|auth)[a-z0-9_.-]*)"?\s*:\s*")([^"]+)(")'
),
# 5. Synthetic secret keywords or tokens
re.compile(r"(?i)\b[a-z0-9_.-]*synthetic[-_]?[a-z0-9_.-]*\b"),
]
def safe_remove(filepath: str | Path) -> bool:
"""Safely remove a file or directory fail-closed.
Returns True if the target does not exist or was successfully removed.
Returns False if removal failed and the target still exists on disk.
"""
p = Path(filepath)
if not p.exists():
return True
try:
if p.is_dir():
shutil.rmtree(p, ignore_errors=False)
else:
p.unlink(missing_ok=True)
except OSError as exc:
logger.error("Failed to delete unauthorized file %s: %s", filepath, exc)
return False
if p.exists():
logger.error("Target %s still exists on disk after deletion attempt", filepath)
return False
return True
def sanitize_text_content(text: str) -> tuple[str, bool]:
"""Scrub sensitive credentials, tokens, and synthetic secrets from text."""
if not text or not isinstance(text, str):
return text, False
modified = False
out = text
# 1. Replace Bearer / Basic tokens
def _sub_auth(m: re.Match) -> str:
nonlocal modified
modified = True
return f"{m.group(1)} [REDACTED]"
out = SECRET_REDACTION_PATTERNS[0].sub(_sub_auth, out)
# 2. Replace key-value pairs
def _sub_kv(m: re.Match) -> str:
nonlocal modified
modified = True
return f"{m.group(1)}{m.group(2)}[REDACTED]"
out = SECRET_REDACTION_PATTERNS[1].sub(_sub_kv, out)
# 3. Replace URL credentials
def _sub_url(m: re.Match) -> str:
nonlocal modified
modified = True
return f"{m.group(1)}:[REDACTED]@"
out = SECRET_REDACTION_PATTERNS[2].sub(_sub_url, out)
# 4. Replace JSON key-value secrets
def _sub_json(m: re.Match) -> str:
nonlocal modified
modified = True
return f"{m.group(1)}[REDACTED]{m.group(3)}"
out = SECRET_REDACTION_PATTERNS[3].sub(_sub_json, out)
# 5. Replace synthetic secret markers
def _sub_synthetic(m: re.Match) -> str:
nonlocal modified
modified = True
return "[REDACTED]"
out = SECRET_REDACTION_PATTERNS[4].sub(_sub_synthetic, out)
return out, modified
def sanitize_and_verify_junit_xml(filepath: str | Path) -> bool:
"""Verify that an XML file is an authentic JUnit report and redact credentials.
Returns True if the XML file is a valid recognized JUnit report and was safely sanitized.
Returns False if the file is invalid, unrecognized, corrupted, or failed sanitization.
"""
p = Path(filepath)
name_lower = p.name.lower()
# 1. Filename restriction: must match standard JUnit report naming
if not (name_lower == "junit.xml" or name_lower == "browser-junit.xml" or name_lower.endswith("-junit.xml") or name_lower.endswith(".junit.xml")):
logger.warning("Unrecognized XML report filename %s; not an authorized JUnit report", filepath)
return False
# 2. Parse XML
try:
tree = ET.parse(p)
except Exception as exc:
logger.warning("Corrupted XML report %s: %s", filepath, exc)
return False
root = tree.getroot()
# 3. Root tag restriction
if root.tag.lower() not in ALLOWED_JUNIT_ROOT_TAGS:
logger.warning("XML report %s has invalid root element <%s>; not a JUnit report", filepath, root.tag)
return False
# 4. Check element tags and redact sensitive content
file_modified = False
for elem in tree.iter():
if elem.tag.lower() not in ALLOWED_JUNIT_ELEMENT_TAGS:
logger.warning("XML report %s contains unrecognized element tag <%s>", filepath, elem.tag)
return False
# Sanitize attributes
for k, v in list(elem.attrib.items()):
if SENSITIVE_KEY_PATTERN.search(k.lower()):
elem.attrib[k] = "[REDACTED]"
file_modified = True
elif isinstance(v, str):
new_v, changed = sanitize_text_content(v)
if changed:
elem.attrib[k] = new_v
file_modified = True
# Sanitize text
if elem.text:
new_text, changed = sanitize_text_content(elem.text)
if changed:
elem.text = new_text
file_modified = True
# Sanitize tail
if elem.tail:
new_tail, changed = sanitize_text_content(elem.tail)
if changed:
elem.tail = new_tail
file_modified = True
# 5. If content was sanitized, write back safely
if file_modified:
try:
tree.write(str(p), encoding="utf-8", xml_declaration=True)
# Verify rewritten XML parses cleanly
ET.parse(p)
except Exception as exc:
logger.error("Failed to write sanitized XML report %s: %s", filepath, exc)
return False
return True
def is_valid_disposable_ci_fixture(target_dir: str | Path | None = None) -> bool:
"""Verify that execution ran inside an authorized disposable synthetic fixture."""
is_ci = bool(os.environ.get("CI") or os.environ.get("GITHUB_ACTIONS"))
if not is_ci:
# Local runs require explicit trace opt-in
trace_opt_in = os.environ.get("PLAYWRIGHT_ENABLE_TRACE", "").lower() in ("1", "true")
return trace_opt_in
if os.environ.get("ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS") != "1":
return False
if os.environ.get("PHOTO_EDITOR_E2E_AUTH") == "0":
return False
allowed_tmp = [os.path.abspath(p) for p in (tempfile.gettempdir(), "/tmp", "/var/tmp")]
# Check 1: Verify fixture ownership via PHOTO_EDITOR_E2E_DATA_DIR
data_dir = os.environ.get("PHOTO_EDITOR_E2E_DATA_DIR")
if data_dir:
resolved = os.path.abspath(data_dir)
base_name = os.path.basename(resolved)
is_tmp = any(resolved.startswith(b + os.sep) or resolved == b for b in allowed_tmp)
if base_name.startswith("odysseus-photo-editor-e2e-") and is_tmp:
expected_db = os.path.join(resolved, "app.db")
db_path = os.environ.get("PHOTO_EDITOR_E2E_DB_PATH")
if not db_path or db_path == expected_db:
marker_path = os.path.join(resolved, ".disposable-ci-fixture.json")
if os.path.exists(marker_path):
try:
with open(marker_path, "r", encoding="utf-8") as f:
fixture = json.load(f)
if (
fixture.get("synthetic") is True
and fixture.get("authenticated") is True
and fixture.get("database") == expected_db
):
return True
except Exception:
pass
# Check 2: Verify fixture proof in target_dir if provided
if target_dir:
target_marker = os.path.join(str(target_dir), ".disposable-ci-fixture.json")
if os.path.exists(target_marker):
try:
with open(target_marker, "r", encoding="utf-8") as f:
fixture = json.load(f)
db_in_fixture = fixture.get("database", "")
resolved_db = os.path.abspath(db_in_fixture)
db_dir = os.path.dirname(resolved_db)
db_base = os.path.basename(db_dir)
is_tmp = any(db_dir.startswith(b + os.sep) or db_dir == b for b in allowed_tmp)
if (
fixture.get("synthetic") is True
and fixture.get("authenticated") is True
and db_base.startswith("odysseus-photo-editor-e2e-")
and is_tmp
and os.path.basename(resolved_db) == "app.db"
):
return True
except Exception:
pass
return False
def verify_and_sanitize_artifacts(target_dir: str) -> bool:
"""Independently verify and sanitize diagnostics fail-closed, preserving safe JUnit XML.
Returns True if verification succeeded and artifacts are safe for publication.
Returns False if verification failed or deletion could not be confirmed.
"""
if not os.path.exists(target_dir):
logger.info("Target directory %s does not exist; nothing to sanitize.", target_dir)
return True
disposable_ci = is_valid_disposable_ci_fixture(target_dir)
preserved_xmls = 0
sanitized_archives = 0
purged_files = 0
overall_success = True
try:
for root, dirs, files in os.walk(target_dir, topdown=False):
for filename in files:
filepath = os.path.join(root, filename)
name_lower = filename.lower()
# Cleanup disposable fixture marker so it is not published
if filename == ".disposable-ci-fixture.json":
if not safe_remove(filepath):
overall_success = False
continue
# 1. XML reports: verify JUnit structure and sanitize credentials
if name_lower.endswith(".xml"):
if sanitize_and_verify_junit_xml(filepath):
preserved_xmls += 1
continue
else:
logger.warning("Rejecting invalid/unrecognized XML report %s; purging fail-closed", filepath)
if not safe_remove(filepath):
overall_success = False
purged_files += 1
continue
# 2. Check if diagnostics are authorized (disposable synthetic fixture)
if not disposable_ci:
logger.info("Purging diagnostic artifact %s (disposable CI fixture not verified)", filepath)
if not safe_remove(filepath):
overall_success = False
purged_files += 1
continue
# 3. Disposable CI is authorized: enforce strict sanitization
if name_lower.endswith(".zip"):
ok = sanitize_trace_archive(filepath)
if ok and os.path.exists(filepath):
sanitized_archives += 1
else:
logger.warning("Trace archive %s failed sanitization; purging fail-closed", filepath)
if not safe_remove(filepath):
overall_success = False
purged_files += 1
elif name_lower.endswith(".png"):
# Validate PNG magic bytes to ensure not a secret payload disguised as an image
is_png = False
try:
with open(filepath, "rb") as pf:
header = pf.read(8)
if header == PNG_MAGIC:
is_png = True
except Exception:
is_png = False
if is_png:
continue
logger.warning("Invalid or suspicious screenshot %s; purging fail-closed", filepath)
if not safe_remove(filepath):
overall_success = False
purged_files += 1
else:
# Purge any .tmp, .har, .db, .sqlite, .log or unrecognized files
logger.info("Purging unauthorized diagnostic file %s", filepath)
if not safe_remove(filepath):
overall_success = False
purged_files += 1
# Remove empty subdirectories
for d in dirs:
dirpath = os.path.join(root, d)
try:
if not os.listdir(dirpath):
os.rmdir(dirpath)
except OSError:
pass
if not overall_success:
logger.error("Verification failed: one or more unauthorized files could not be purged.")
return False
logger.info(
"Artifact verification complete for %s: preserved %d XML reports, sanitized %d archives, purged %d files.",
target_dir,
preserved_xmls,
sanitized_archives,
purged_files,
)
return True
except Exception as exc:
logger.error("Unexpected error during artifact verification: %s; purging all non-XML files fail-closed", exc)
try:
for p in Path(target_dir).rglob("*"):
if p.is_file() and not p.name.lower().endswith(".xml"):
safe_remove(p)
except Exception:
pass
return False
def main() -> None:
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("target_dir", nargs="?", default="test-results", help="Directory containing test results")
args = parser.parse_args()
ok = verify_and_sanitize_artifacts(args.target_dir)
sys.exit(0 if ok else 1)
if __name__ == "__main__":
main()
+129
View File
@@ -0,0 +1,129 @@
name: Native test suites
on:
pull_request:
push:
branches: [main, dev]
workflow_dispatch:
permissions:
contents: read
concurrency:
group: native-tests-${{ github.ref }}
cancel-in-progress: true
jobs:
native-node:
name: Native Node regressions
runs-on: ubuntu-24.04
timeout-minutes: 15
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: '3.11'
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: '22.23.4'
cache: npm
- run: npm ci --ignore-scripts --no-audit --no-fund
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ~/.cache/ms-playwright
key: ms-playwright-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
- run: npx playwright install --with-deps chromium
- name: Validate exhaustive disjoint runner mapping and execute omitted suites
run: |
node .github/scripts/run_native_tests.mjs
python .github/scripts/check_test_execution.py test-results/native-node/junit.xml --minimum 43
- name: Verify and sanitize native test results fail-closed
id: verify-native-results
if: always()
run: |
python .github/scripts/verify_sanitized_artifacts.py test-results/native-node/
- name: Save native test identities and results
if: always() && steps.verify-native-results.outcome == 'success'
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: native-node-results
path: test-results/native-node/
retention-days: 7
if-no-files-found: warn
browser:
name: Chromium application regressions
runs-on: ubuntu-24.04
timeout-minutes: 30
env:
ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS: '1'
ODYSSEUS_TEST_PYTHON: python
CHROMADB_HOST: 127.0.0.1
CHROMADB_PORT: '1'
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: '3.11'
- name: Install FFmpeg and establish system trust
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends ffmpeg ca-certificates
python scripts/check_ca_trust.py --system
- uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
with:
version: '0.13.5'
enable-cache: true
cache-dependency-glob: requirements.txt
prune-cache: false
- run: |
uv pip install --system --require-hashes --only-binary=:all: --no-deps -r requirements-bootstrap.txt
python scripts/check_ca_trust.py --python
uv pip install --system -r requirements.txt
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: '22.23.4'
cache: npm
- run: npm ci --ignore-scripts --no-audit --no-fund
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ~/.cache/ms-playwright
key: ms-playwright-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
- run: npx playwright install --with-deps chromium
- name: Run complete Chromium suite against a fresh authenticated app
env:
PLAYWRIGHT_JUNIT_OUTPUT_FILE: test-results/browser-junit.xml
run: |
npm run test:photo-editor -- --reporter=line,junit
python .github/scripts/check_test_execution.py test-results/browser-junit.xml --minimum 137
- name: Verify and sanitize failure diagnostics fail-closed
id: verify-browser-results
if: always()
run: |
python .github/scripts/verify_sanitized_artifacts.py test-results/
- name: Save per-test results and sanitized failure diagnostics
if: always() && steps.verify-browser-results.outcome == 'success'
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: chromium-regression-results
path: test-results/
retention-days: 7
if-no-files-found: warn
authoritative-native-suites:
name: Authoritative native suites
if: always()
needs: [native-node, browser]
runs-on: ubuntu-24.04
steps:
- name: Require both complete suites to succeed
env:
NODE_RESULT: ${{ needs.native-node.result }}
BROWSER_RESULT: ${{ needs.browser.result }}
run: |
test "$NODE_RESULT" = success
test "$BROWSER_RESULT" = success
+46
View File
@@ -0,0 +1,46 @@
# Native test merge gate
`Native test suites` runs on pull requests, dev/main pushes and manual dispatch.
`Authoritative native suites` fails unless both the native Node and complete
Chromium jobs succeed; it has no continue-on-error, retries or path bypass.
Repository administrators must require this check alongside the four pytest
checks in branch protection. The audited public dev branch had no protection or
ruleset, so merely adding workflow jobs cannot prevent a manual merge.
`tests/native-ci-manifest.json` exhaustively partitions all native Node files:
16 run in the native job,14 through existing pytest wrappers, one through the
existing frontend architecture CI step, and the formerly live email-reply file
through an explicitly identified Playwright driver. The manifest validator fails
for omitted/duplicate/unreachable entries. Node emits individual JUnit identities
and propagates its failure exit. No native file is newly run in each pytest shard.
The browser job uses the existing one-worker Chromium config and all 136 Photo
Editor cases (including cursor and brush regressions), plus one driver for the native
email-reply contract (137 cases total). Its ephemeral account,
SQLite DB and server are created by the config/setup; reuseExistingServer remains
false. NPX startup is offline/cache-only in a private cache; Notes/editor behavior
and Python MCP services remain real. No developer app or external account is used.
Default CI trace suppression remains intact. Only this job's explicit opt-in plus
a newly generated authenticated synthetic fixture marker permits failure traces.
The existing structured sanitizer runs before artifacts are uploaded; invalid
ownership, failed sanitization and missing tooling purge sensitive artifacts.
Unsupported or malformed sensitive records cause the affected archive to be removed
fail-closed. An independent fail-closed verification step (.github/scripts/verify_sanitized_artifacts.py)
runs after test suite execution or abnormal runner termination to prevent publishing
unsanitized diagnostics while preserving safe JUnit reporting. The verifier returns a nonzero
exit code upon any inspection or deletion failure, publishable XML is restricted to recognized
JUnit reports with sensitive tokens redacted, and workflow upload steps execute only when
independent verification succeeds (steps.<id>.outcome == 'success').
Never upload the fixture directory, database or browser storage state.
The stroke budget now excludes measured synthetic event-delivery pacing and also
bounds actual Chromium main-thread work at the original5s. All240 samples and
pixel/thumbnail/undo/redo assertions remain. Per-case timing attachments expose
both clocks rather than treating driver frame cadence as application work.
Three Bombadil properties remain opt-in: they require a Bombadil/browser scenario
and bounded fuzz campaign; no authoritative execution is claimed. The two model
smoke scripts require supplied model endpoints/models and remain explicit live
operations. No credentials or live-service authorization are implied by CI setup.
Firefox/WebKit alternatives remain opt-in and are not certified by Chromium CI.
+22 -15
View File
@@ -77,13 +77,14 @@ def sanitize_body_text(text: str) -> str:
# 1. Try JSON # 1. Try JSON
trimmed = text.strip() trimmed = text.strip()
if (trimmed.startswith("{") and trimmed.endswith("}")) or (trimmed.startswith("[") and trimmed.endswith("]")): if trimmed.startswith(("{", "[")):
try: try:
parsed = json.loads(trimmed) parsed = json.loads(trimmed)
sanitized = sanitize_structured_obj(parsed) sanitized = sanitize_structured_obj(parsed)
return json.dumps(sanitized, ensure_ascii=False) return json.dumps(sanitized, ensure_ascii=False)
except Exception: except Exception as exc:
pass if SENSITIVE_KEY_PATTERN.search(trimmed) or any(p in trimmed.lower() for p in SENSITIVE_PARAM_NAMES):
raise ValueError(f"Malformed sensitive JSON request body: {exc}") from exc
# 2. Try URL-encoded form data # 2. Try URL-encoded form data
if "=" in trimmed and not trimmed.startswith("<"): if "=" in trimmed and not trimmed.startswith("<"):
@@ -98,8 +99,13 @@ def sanitize_body_text(text: str) -> str:
else: else:
out_pairs.append((k, v)) out_pairs.append((k, v))
return urllib.parse.urlencode(out_pairs) return urllib.parse.urlencode(out_pairs)
except Exception: except Exception as exc:
pass if SENSITIVE_KEY_PATTERN.search(trimmed):
raise ValueError(f"Malformed sensitive form request body: {exc}") from exc
# If unparsed body text contains sensitive keys or tokens, fail closed
if SENSITIVE_KEY_PATTERN.search(trimmed) or any(p in trimmed.lower() for p in SENSITIVE_PARAM_NAMES):
raise ValueError("Malformed or unsupported sensitive request body in trace entry")
return text return text
@@ -207,7 +213,11 @@ def sanitize_structured_obj(obj: Any) -> Any:
def sanitize_jsonl_content(data: bytes) -> bytes: def sanitize_jsonl_content(data: bytes) -> bytes:
"""Sanitize newline-delimited JSON Lines (.trace, .network, .stacks).""" """Sanitize newline-delimited JSON Lines (.trace, .network, .stacks).
If any non-empty record cannot be decoded as valid UTF-8 or parsed as valid JSON,
or is malformed, raise ValueError fail-closed so the affected archive is permanently removed.
"""
lines = data.split(b"\n") lines = data.split(b"\n")
out_lines = [] out_lines = []
for line in lines: for line in lines:
@@ -216,10 +226,8 @@ def sanitize_jsonl_content(data: bytes) -> bytes:
continue continue
try: try:
parsed = json.loads(line.decode("utf-8")) parsed = json.loads(line.decode("utf-8"))
except (json.JSONDecodeError, UnicodeDecodeError): except (json.JSONDecodeError, UnicodeDecodeError) as err:
# Not valid JSON, keep as-is raise ValueError(f"Malformed or unsupported JSONL trace record: {err}")
out_lines.append(line)
continue
sanitized = sanitize_structured_obj(parsed) sanitized = sanitize_structured_obj(parsed)
out_lines.append(json.dumps(sanitized, ensure_ascii=False).encode("utf-8")) out_lines.append(json.dumps(sanitized, ensure_ascii=False).encode("utf-8"))
return b"\n".join(out_lines) return b"\n".join(out_lines)
@@ -275,11 +283,10 @@ def sanitize_trace_archive(zp: str) -> bool:
elif filename_lower.endswith((".json", ".har")): elif filename_lower.endswith((".json", ".har")):
try: try:
parsed = json.loads(content.decode("utf-8")) parsed = json.loads(content.decode("utf-8"))
sanitized = sanitize_structured_obj(parsed) except (json.JSONDecodeError, UnicodeDecodeError) as exc:
zout.writestr(item, json.dumps(sanitized, ensure_ascii=False).encode("utf-8")) raise ValueError(f"Malformed JSON in archive member {item.filename}: {exc}") from exc
except Exception: sanitized = sanitize_structured_obj(parsed)
# If invalid JSON, treat as text line-by-line zout.writestr(item, json.dumps(sanitized, ensure_ascii=False).encode("utf-8"))
zout.writestr(item, sanitize_jsonl_content(content))
else: else:
# Unknown binary or text member: exclude to fail closed # Unknown binary or text member: exclude to fail closed
continue continue
+19
View File
@@ -0,0 +1,19 @@
const fs = require('node:fs');
const os = require('node:os');
const path = require('node:path');
const marker = '.disposable-ci-fixture.json';
function disposableCIArtifacts() {
if (!(process.env.CI || process.env.GITHUB_ACTIONS) || process.env.ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS !== '1') return false;
const directory = process.env.PHOTO_EDITOR_E2E_DATA_DIR;
if (!directory || process.env.PHOTO_EDITOR_E2E_AUTH === '0') return false;
const resolved = path.resolve(directory);
if (!path.basename(resolved).startsWith('odysseus-photo-editor-e2e-')) return false;
if (![os.tmpdir(), '/tmp', '/var/tmp'].some(base => resolved.startsWith(path.resolve(base) + path.sep))) return false;
if (process.env.PHOTO_EDITOR_E2E_DB_PATH !== path.join(resolved, 'app.db')) return false;
try {
const fixture = JSON.parse(fs.readFileSync(path.join(resolved, marker), 'utf8'));
return fixture.synthetic === true && fixture.authenticated === true && fixture.database === path.join(resolved, 'app.db');
} catch { return false; }
}
module.exports = { disposableCIArtifacts, marker };
+29 -2
View File
@@ -35,7 +35,7 @@ test('brush presets and shared stroke controls remain reusable', async ({ page }
await expect(page.locator('#ge-brush-preset option', { hasText: 'My Detail Brush' })).toHaveCount(0); await expect(page.locator('#ge-brush-preset option', { hasText: 'My Detail Brush' })).toHaveCount(0);
}); });
test('long sampled strokes stay responsive and undo atomically', async ({ page }) => { test('long sampled strokes stay responsive and undo atomically', async ({ page, browserName }, testInfo) => {
await openBlankEditor(page); await openBlankEditor(page);
await selectTool(page, 'brush'); await selectTool(page, 'brush');
await page.locator('.ge-size-slider').fill('700'); await page.locator('.ge-size-slider').fill('700');
@@ -49,13 +49,40 @@ test('long sampled strokes stay responsive and undo atomically', async ({ page }
const before = await flattenedPixelDigest(page); const before = await flattenedPixelDigest(page);
const start = await canvasPoint(page, 0.08, 0.5); const start = await canvasPoint(page, 0.08, 0.5);
const end = await canvasPoint(page, 0.92, 0.5); const end = await canvasPoint(page, 0.92, 0.5);
// Playwright delivers stepped moves at frame cadence: 240 events already
// cost ~4s on an inert page. Measure that transport cost with the same input,
// and separately bound real Chromium main-thread work at the original5s.
const control = await page.context().newPage();
let controlDuration;
try {
await control.setContent('<canvas style="position:fixed;inset:0;width:100vw;height:100vh"></canvas>');
const started = Date.now();
await control.mouse.move(start.x, start.y);
await control.mouse.down();
await control.mouse.move(end.x, end.y, { steps: 240 });
await control.mouse.up();
controlDuration = Date.now() - started;
} finally {
await control.close();
await page.bringToFront();
}
const metrics = browserName === 'chromium' ? await page.context().newCDPSession(page) : null;
if (metrics) await metrics.send('Performance.enable');
const taskTime = async () => (await metrics.send('Performance.getMetrics')).metrics.find(item => item.name === 'TaskDuration').value *1000;
const beforeTask = metrics ? await taskTime() : null;
const startedAt = Date.now(); const startedAt = Date.now();
await page.mouse.move(start.x, start.y); await page.mouse.move(start.x, start.y);
await page.mouse.down(); await page.mouse.down();
await page.mouse.move(end.x, end.y, { steps: 240 }); await page.mouse.move(end.x, end.y, { steps: 240 });
await page.mouse.up(); await page.mouse.up();
const strokeDuration = Date.now() - startedAt; const strokeDuration = Date.now() - startedAt;
expect(strokeDuration).toBeLessThan(5000); const mainThreadDuration = metrics ? (await taskTime()) - beforeTask : null;
if (metrics) await metrics.detach();
await testInfo.attach('stroke-timing', { body: Buffer.from(JSON.stringify({
samples: 240, strokeDuration, controlDuration, mainThreadDuration,
})), contentType: 'application/json' });
expect(strokeDuration - controlDuration).toBeLessThan(5000);
if (mainThreadDuration !== null) expect(mainThreadDuration).toBeLessThan(5000);
const after = await flattenedPixelDigest(page); const after = await flattenedPixelDigest(page);
expect(after).not.toEqual(before); expect(after).not.toEqual(before);
await expect(thumb).toHaveAttribute('width', '68'); await expect(thumb).toHaveAttribute('width', '68');
@@ -0,0 +1,21 @@
const { test, expect } = require('@playwright/test');
const { spawnSync } = require('node:child_process');
const path = require('node:path');
// The previously opt-in node:test now uses only this config's owned app/account.
// Its native JUnit report retains its authored identity; this case is a driver.
test('native email reply regression on the disposable authenticated app', async ({ context, baseURL }, testInfo) => {
const origin = new URL(baseURL);
expect(origin.hostname).toBe('127.0.0.1');
const cookie = (await context.cookies(baseURL)).find(item => item.name === 'odysseus_session');
expect(cookie?.value).toBeTruthy();
const report = testInfo.outputPath('native-email-junit.xml');
const result = spawnSync(process.execPath, ['--test', '--test-reporter=spec', '--test-reporter-destination=stdout',
'--test-reporter=junit', `--test-reporter-destination=${report}`, 'tests/emailReplyBrowser.test.mjs'], {
cwd: path.resolve(__dirname, '../../..'), encoding: 'utf8', timeout: 80_000,
env: { ...process.env, ODYSSEUS_UI_TEST_URL: baseURL, ODYSSEUS_UI_TEST_COOKIE: cookie.value },
});
console.log(result.stdout);
expect(result.error, String(result.error)).toBeUndefined();
expect(result.status, result.stdout + result.stderr).toBe(0);
});
+33 -3
View File
@@ -2,6 +2,12 @@ const fs = require('node:fs');
const os = require('node:os'); const os = require('node:os');
const path = require('node:path'); const path = require('node:path');
const { defineConfig } = require('@playwright/test'); const { defineConfig } = require('@playwright/test');
const { disposableCIArtifacts, marker } = require('./artifact-policy');
const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS);
const disposableOptIn = isCI && process.env.ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS === '1';
if (disposableOptIn && (process.env.PHOTO_EDITOR_E2E_DATA_DIR || process.env.PHOTO_EDITOR_E2E_DB_PATH || process.env.PHOTO_EDITOR_E2E_AUTH === '0') && !disposableCIArtifacts()) {
throw new Error('CI artifact opt-in requires fresh authenticated fixture paths');
}
const port = Number(process.env.PHOTO_EDITOR_E2E_PORT || 7013); const port = Number(process.env.PHOTO_EDITOR_E2E_PORT || 7013);
const baseURL = `http://127.0.0.1:${port}`; const baseURL = `http://127.0.0.1:${port}`;
@@ -24,7 +30,25 @@ if (!['chromium', 'firefox', 'webkit'].includes(browserName)) {
throw new Error(`Unsupported PHOTO_EDITOR_E2E_BROWSER: ${browserName}`); throw new Error(`Unsupported PHOTO_EDITOR_E2E_BROWSER: ${browserName}`);
} }
const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS); if (disposableOptIn) {
const fixturePayload = JSON.stringify({ synthetic: true, authenticated: true, database: databasePath });
fs.writeFileSync(path.join(dataDirectory, marker), fixturePayload);
const resultsDir = path.join(repositoryRoot, 'test-results');
if (!fs.existsSync(resultsDir)) {
try { fs.mkdirSync(resultsDir, { recursive: true }); } catch (_) {}
}
try {
fs.writeFileSync(path.join(resultsDir, marker), fixturePayload);
} catch (_) {}
if (process.env.GITHUB_ENV) {
try {
fs.appendFileSync(
process.env.GITHUB_ENV,
`PHOTO_EDITOR_E2E_DATA_DIR=${dataDirectory}\nPHOTO_EDITOR_E2E_DB_PATH=${databasePath}\n`
);
} catch (_) {}
}
}
const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase()); const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase());
module.exports = defineConfig({ module.exports = defineConfig({
@@ -32,6 +56,8 @@ module.exports = defineConfig({
outputDir: path.join(__dirname, '..', '..', 'test-results', 'photo-editor'), outputDir: path.join(__dirname, '..', '..', 'test-results', 'photo-editor'),
timeout: 90_000, timeout: 90_000,
expect: { timeout: 10_000 }, expect: { timeout: 10_000 },
forbidOnly: isCI,
retries: 0,
fullyParallel: false, fullyParallel: false,
workers: 1, workers: 1,
reporter: isCI ? 'line' : 'line', reporter: isCI ? 'line' : 'line',
@@ -49,9 +75,9 @@ module.exports = defineConfig({
serviceWorkers: 'block', serviceWorkers: 'block',
...(authenticated ? { storageState: path.join(dataDirectory, 'browser-auth.json') } : {}), ...(authenticated ? { storageState: path.join(dataDirectory, 'browser-auth.json') } : {}),
screenshot: 'only-on-failure', screenshot: 'only-on-failure',
// Unconditional CI trace suppression: Playwright traces are NEVER recorded in CI. // Default CI suppression remains; only the fresh synthetic fixture opts in.
// Local developer tracing requires explicit PLAYWRIGHT_ENABLE_TRACE=1. // Local developer tracing requires explicit PLAYWRIGHT_ENABLE_TRACE=1.
trace: traceOptIn ? 'retain-on-failure' : 'off', trace: (traceOptIn || disposableCIArtifacts()) ? 'retain-on-failure' : 'off',
}, },
webServer: { webServer: {
command: `${JSON.stringify(python)} -m uvicorn app:app --host 127.0.0.1 --port ${port}`, command: `${JSON.stringify(python)} -m uvicorn app:app --host 127.0.0.1 --port ${port}`,
@@ -65,6 +91,10 @@ module.exports = defineConfig({
DATABASE_URL: `sqlite:///${databasePath}`, DATABASE_URL: `sqlite:///${databasePath}`,
ODYSSEUS_DATA_DIR: dataDirectory, ODYSSEUS_DATA_DIR: dataDirectory,
ODYSSEUS_STARTUP_WARMUPS: '0', ODYSSEUS_STARTUP_WARMUPS: '0',
ODYSSEUS_TOOL_INDEX_PREWARM: '0',
ODYSSEUS_BROWSER_MCP_REQUIRE_CACHE: '1',
npm_config_offline: 'true',
npm_config_cache: path.join(dataDirectory, 'npm-cache'),
RESPONSE_COMPRESSION_ENABLED: 'false', RESPONSE_COMPRESSION_ENABLED: 'false',
}, },
}, },
+16 -2
View File
@@ -2,6 +2,7 @@ const fs = require('node:fs');
const os = require('node:os'); const os = require('node:os');
const path = require('node:path'); const path = require('node:path');
const { execFileSync } = require('node:child_process'); const { execFileSync } = require('node:child_process');
const { disposableCIArtifacts, marker } = require('./artifact-policy');
const repoRoot = path.resolve(__dirname, '..', '..'); const repoRoot = path.resolve(__dirname, '..', '..');
const defaultResultsDir = path.join(repoRoot, 'test-results'); const defaultResultsDir = path.join(repoRoot, 'test-results');
@@ -29,6 +30,9 @@ module.exports = async (options = {}) => {
const isPlaywrightConfig = options && (options.configFile || options.rootDir); const isPlaywrightConfig = options && (options.configFile || options.rootDir);
const testOpts = (!isPlaywrightConfig && typeof options === 'object') ? options : {}; const testOpts = (!isPlaywrightConfig && typeof options === 'object') ? options : {};
// Validate fixture ownership before removing its temporary directory.
const disposableCI = disposableCIArtifacts();
// Confine cleanup of PHOTO_EDITOR_E2E_DATA_DIR: // Confine cleanup of PHOTO_EDITOR_E2E_DATA_DIR:
// Strictly require it to be within an OS temporary directory and match the expected test prefix // Strictly require it to be within an OS temporary directory and match the expected test prefix
const dataDirectory = process.env.PHOTO_EDITOR_E2E_DATA_DIR; const dataDirectory = process.env.PHOTO_EDITOR_E2E_DATA_DIR;
@@ -100,7 +104,7 @@ module.exports = async (options = {}) => {
const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS); const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS);
const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase()); const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase());
if (isCI || !traceOptIn) { if ((isCI && !disposableCI) || (!traceOptIn && !disposableCI)) {
// In CI or default local runs, purge all sensitive trace archives and artifacts // In CI or default local runs, purge all sensitive trace archives and artifacts
purgeSensitiveArtifacts(resultsDir); purgeSensitiveArtifacts(resultsDir);
} else { } else {
@@ -124,7 +128,17 @@ module.exports = async (options = {}) => {
if (!sanitizerSucceeded) { if (!sanitizerSucceeded) {
// Fail closed: purge all remaining zip or tmp archives // Fail closed: purge all remaining zip or tmp archives
purgeZipAndTmp(resultsDir); if (disposableCI) purgeSensitiveArtifacts(resultsDir);
else purgeZipAndTmp(resultsDir);
} else if (disposableCI) {
// Re-affirm fixture proof in resultsDir so independent verifier can establish ownership
try {
fs.writeFileSync(path.join(resultsDir, marker), JSON.stringify({
synthetic: true,
authenticated: true,
database: process.env.PHOTO_EDITOR_E2E_DB_PATH || path.join(dataDirectory || '', 'app.db'),
}));
} catch (_) {}
} }
} }
} }
+71
View File
@@ -0,0 +1,71 @@
{
"native-ci": [
"tests/backgroundToolJobs.test.mjs",
"tests/chatEditorProgress.test.mjs",
"tests/chatImageDeletion.test.mjs",
"tests/chatPhotoEditorIntegrity.test.mjs",
"tests/chatProcessingHandoff.test.mjs",
"tests/copyChatHeader.test.mjs",
"tests/emailReplyStream.test.mjs",
"tests/galleryModelPickerSync.test.mjs",
"tests/generatedImageResult.test.mjs",
"tests/researchMobileButtons.test.mjs",
"tests/schemaThinkingProbe.test.mjs",
"tests/sidebarNewChat.test.mjs",
"tests/skillsApproval.test.mjs",
"tests/streamingRendererRaf.test.mjs",
"tests/toolFollowupOracle.test.mjs",
"tests/tool_followup_oracle.test.mjs"
],
"browser-ci": [
"tests/emailReplyBrowser.test.mjs"
],
"python-ci": {
"tests/historyResumeRendering.test.mjs": [
"tests/test_history_resume_rendering_js.py",
"tests/test_live_fallback_round_attribution.py"
],
"tests/live_thinking_scheduler.test.mjs": [
"tests/test_live_thinking_scheduler_js.py"
],
"tests/noteTestOracle.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesApplication.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesCharacterization.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesDraftAutosave.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesInfrastructure.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesRecurrence.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesReminders.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/notesWorkflows.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/selectedNotesContext.test.mjs": [
"tests/test_notes_reference_contracts_js.py"
],
"tests/streaming/invariant.test.mjs": [
"tests/test_streaming_segmenter_js.py"
],
"tests/streaming/segmenter.test.mjs": [
"tests/test_streaming_segmenter_js.py"
],
"tests/turnRendering.test.mjs": [
"tests/test_turn_rendering_js.py"
]
},
"architecture-ci": [
"tests/frontendArchitecture.test.mjs"
]
}
@@ -303,3 +303,52 @@ def test_teardown_rejects_unconfined_programmatic_paths():
res = _run_teardown(options={"resultsDir": "/etc"}) res = _run_teardown(options={"resultsDir": "/etc"})
assert res.returncode == 1 assert res.returncode == 1
assert "Security rejection" in res.stderr assert "Security rejection" in res.stderr
def _disposable_ci_fixture(tmp_path):
data = tmp_path / "odysseus-photo-editor-e2e-fixture"
data.mkdir()
database = data / "app.db"
(data / ".disposable-ci-fixture.json").write_text(json.dumps({
"synthetic": True, "authenticated": True, "database": str(database),
}))
return {"CI": "true", "GITHUB_ACTIONS": "true",
"ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS": "1",
"PHOTO_EDITOR_E2E_DATA_DIR": str(data), "PHOTO_EDITOR_E2E_DB_PATH": str(database),
"PHOTO_EDITOR_E2E_AUTH": "1", "ODYSSEUS_TEST_PYTHON": sys.executable}
def test_disposable_ci_retains_only_sanitized_failure_artifacts(tmp_path):
results = tmp_path / "results"
results.mkdir()
trace = results / "trace.zip"
with zipfile.ZipFile(trace, "w") as archive:
archive.writestr("0-trace.trace", json.dumps({"type": "action", "name": "fill", "params": {"value": "synthetic-secret"}}) + "\n")
screenshot = results / "failure.png"
screenshot.write_bytes(b"synthetic screenshot")
response = _run_teardown(_disposable_ci_fixture(tmp_path), {"resultsDir": str(results)})
assert response.returncode == 0, response.stderr
with zipfile.ZipFile(trace) as archive:
assert json.loads(archive.read("0-trace.trace"))["params"]["value"] == "[REDACTED]"
assert screenshot.exists()
@pytest.mark.parametrize("defect", ["missing-marker", "wrong-database", "unauthenticated", "sanitizer-failure"])
def test_disposable_ci_artifact_failures_purge_closed(tmp_path, defect):
results = tmp_path / "results"
results.mkdir()
(results / "trace.zip").write_bytes(b"invalid sensitive archive")
(results / "failure.png").write_bytes(b"sensitive screenshot")
environment = _disposable_ci_fixture(tmp_path)
if defect == "missing-marker":
(Path(environment["PHOTO_EDITOR_E2E_DATA_DIR"]) / ".disposable-ci-fixture.json").unlink()
elif defect == "wrong-database":
environment["PHOTO_EDITOR_E2E_DB_PATH"] = str(tmp_path / "other.db")
elif defect == "unauthenticated":
environment["PHOTO_EDITOR_E2E_AUTH"] = "0"
else:
environment["ODYSSEUS_TEST_PYTHON"] = "/missing-python"
response = _run_teardown(environment, {"resultsDir": str(results)})
assert response.returncode == 0, response.stderr
assert not (results / "trace.zip").exists()
assert not (results / "failure.png").exists()
+69
View File
@@ -242,3 +242,72 @@ def test_multiple_trace_archives_in_directory(tmp_path):
with zipfile.ZipFile(z2, "r") as z: with zipfile.ZipFile(z2, "r") as z:
content = json.loads(z.read("0.trace").decode().strip()) content = json.loads(z.read("0.trace").decode().strip())
assert content["params"]["value"] == "[REDACTED]" assert content["params"]["value"] == "[REDACTED]"
def test_fail_closed_malformed_jsonl_record(tmp_path):
"""Malformed JSONL lines in .trace archives fail closed and delete the archive."""
zp = str(tmp_path / "malformed_jsonl.zip")
with zipfile.ZipFile(zp, "w") as z:
z.writestr(
"0-trace.trace",
b'{"type": "action", "params": {"value": "secret123"}}\n'
b'this is invalid json {"password": "leak_raw_pass"}\n'
)
ok = sanitize_trace_archive(zp)
assert ok is False
assert not os.path.exists(zp)
assert not os.path.exists(zp + ".tmp")
def test_fail_closed_malformed_jsonl_truncated(tmp_path):
"""Truncated JSONL records in .network archives fail closed and delete the archive."""
zp = str(tmp_path / "truncated_jsonl.zip")
with zipfile.ZipFile(zp, "w") as z:
z.writestr(
"0-trace.network",
b'{"type": "request", "request": {"url": "https://example.com/api/auth", "headers": [{"name": "Authorization", "value": "Bearer secret_tok"'
)
ok = sanitize_trace_archive(zp)
assert ok is False
assert not os.path.exists(zp)
assert not os.path.exists(zp + ".tmp")
def test_fail_closed_malformed_sensitive_body(tmp_path):
"""Malformed sensitive request body in trace archives fails closed and deletes archive."""
zp = str(tmp_path / "malformed_sensitive_body.zip")
with zipfile.ZipFile(zp, "w") as z:
record = {
"type": "request",
"request": {
"url": "https://example.com/api/login",
"postData": '{"password": "super_secret_pw", "corrupt_trailing": ',
},
}
z.writestr("0-trace.network", json.dumps(record).encode() + b"\n")
ok = sanitize_trace_archive(zp)
assert ok is False
assert not os.path.exists(zp)
assert not os.path.exists(zp + ".tmp")
def test_fail_closed_malformed_har_member(tmp_path):
"""Malformed JSON in .har archives fails closed and deletes the archive."""
zp = str(tmp_path / "malformed_har.zip")
with zipfile.ZipFile(zp, "w") as z:
z.writestr("network.har", b'{"log": {"entries": [ malformed JSON content')
ok = sanitize_trace_archive(zp)
assert ok is False
assert not os.path.exists(zp)
assert not os.path.exists(zp + ".tmp")
def test_fail_closed_invalid_utf8_jsonl_record(tmp_path):
"""Non-UTF8 byte sequences in JSONL trace records fail closed and delete the archive."""
zp = str(tmp_path / "invalid_utf8.zip")
with zipfile.ZipFile(zp, "w") as z:
z.writestr("0-trace.trace", b"\xff\xfe\x00\x00 invalid utf8 raw bytes\n")
ok = sanitize_trace_archive(zp)
assert ok is False
assert not os.path.exists(zp)
assert not os.path.exists(zp + ".tmp")
+433
View File
@@ -0,0 +1,433 @@
"""Tests for the fail-closed artifact verification step (.github/scripts/verify_sanitized_artifacts.py).
Validates that:
1. Safe JUnit XML reporting is preserved across all scenarios.
2. Abnormal runner termination without verified disposable CI fixture purges all diagnostics.
3. Valid disposable CI environments sanitize trace archives fail-closed.
4. Malformed trace archives are deleted fail-closed without corrupting or deleting JUnit XML reports.
5. In-progress temporary files, HAR files, and database dumps are purged unconditionally.
6. Top-level exceptions fail closed to purge all non-XML diagnostics.
7. Negative controls:
- Verifier failure exits nonzero.
- Verifier failure prevents upload in workflow contract.
- Missing verifier execution prevents upload.
- Valid XML containing a synthetic secret is not published unchanged.
- Malformed traces are removed.
- Failed artifact deletion prevents authorization.
- A normal successful run retains safe test results.
"""
from __future__ import annotations
import importlib.util
import json
import os
import subprocess
import sys
import tempfile
import xml.etree.ElementTree as ET
import zipfile
from pathlib import Path
import pytest
import yaml
REPO_ROOT = Path(__file__).resolve().parents[1]
VERIFY_SCRIPT = REPO_ROOT / ".github" / "scripts" / "verify_sanitized_artifacts.py"
WORKFLOW_PATH = REPO_ROOT / ".github" / "workflows" / "native-test-suites.yml"
spec = importlib.util.spec_from_file_location("verify_sanitized_artifacts", str(VERIFY_SCRIPT))
verify_module = importlib.util.module_from_spec(spec)
sys.modules["verify_sanitized_artifacts"] = verify_module
spec.loader.exec_module(verify_module)
is_valid_disposable_ci_fixture = verify_module.is_valid_disposable_ci_fixture
verify_and_sanitize_artifacts = verify_module.verify_and_sanitize_artifacts
sanitize_and_verify_junit_xml = verify_module.sanitize_and_verify_junit_xml
safe_remove = verify_module.safe_remove
def _setup_disposable_ci(tmp_path: Path) -> dict[str, str]:
data_dir = tmp_path / "odysseus-photo-editor-e2e-fixture"
data_dir.mkdir(parents=True, exist_ok=True)
db_path = data_dir / "app.db"
db_path.write_bytes(b"SQLite format 3\x00")
marker_file = data_dir / ".disposable-ci-fixture.json"
marker_file.write_text(
json.dumps({
"synthetic": True,
"authenticated": True,
"database": str(db_path),
})
)
return {
"CI": "true",
"GITHUB_ACTIONS": "true",
"ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS": "1",
"PHOTO_EDITOR_E2E_DATA_DIR": str(data_dir),
"PHOTO_EDITOR_E2E_DB_PATH": str(db_path),
"PHOTO_EDITOR_E2E_AUTH": "1",
"ODYSSEUS_TEST_PYTHON": sys.executable,
}
def test_preserves_valid_junit_xml_cleanly(tmp_path):
"""Valid JUnit XML files are preserved intact."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="137" failures="0"/></testsuites>')
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
assert junit.exists()
assert 'tests="137"' in junit.read_text()
def test_normal_successful_run_retains_safe_test_results(tmp_path):
"""A normal successful run retains safe test results without modification."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "junit.xml"
original_xml = '<testsuites><testsuite name="native-node" tests="43" failures="0"><testcase name="test-1"/></testsuite></testsuites>'
junit.write_text(original_xml)
res = subprocess.run(
[sys.executable, str(VERIFY_SCRIPT), str(results_dir)],
capture_output=True,
text=True,
)
assert res.returncode == 0
assert junit.exists()
content = junit.read_text()
assert 'name="native-node"' in content
assert 'tests="43"' in content
assert 'test-1' in content
def test_valid_xml_containing_synthetic_secret_not_published_unchanged(tmp_path):
"""Negative control: Valid XML containing a synthetic secret is not published unchanged."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
secret_text = "SuperSecretSyntheticToken98765"
xml_with_secret = f"""<testsuites>
<testsuite name="photo-editor" tests="1" failures="1">
<testcase name="auth-test">
<failure message="Encountered password={secret_text} in log">
Stack trace containing synthetic-secret authorization: Bearer {secret_text}
</failure>
<system-out>session_token={secret_text}</system-out>
</testcase>
</testsuite>
</testsuites>"""
junit.write_text(xml_with_secret)
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
assert junit.exists()
sanitized_content = junit.read_text()
# The raw secret MUST NOT appear anywhere in the published report
assert secret_text not in sanitized_content
# The redaction marker MUST appear
assert "[REDACTED]" in sanitized_content
# The XML must still be structurally valid JUnit XML
tree = ET.parse(junit)
assert tree.getroot().tag == "testsuites"
def test_unrecognized_xml_purged(tmp_path):
"""Negative control: XML reports that are not recognized JUnit reports are purged."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
# Non-JUnit filename
creds_xml = results_dir / "credentials.xml"
creds_xml.write_text("<credentials><token>secret</token></credentials>")
# Non-JUnit root element
bad_root_xml = results_dir / "junit.xml"
bad_root_xml.write_text("<app_config><password>secret</password></app_config>")
ok = verify_and_sanitize_artifacts(str(results_dir))
# Non-JUnit XML files must be purged
assert not creds_xml.exists()
assert not bad_root_xml.exists()
def test_verifier_failure_exits_nonzero(tmp_path):
"""Negative control: Verifier failure exits nonzero."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
# Pass an invalid option or target where verification fails
# Create an un-deletable file to force verification failure
bad_file = results_dir / "unauthorized.tmp"
bad_file.write_text("sensitive")
# Run CLI with an invalid directory or simulating failure
res = subprocess.run(
[sys.executable, str(VERIFY_SCRIPT), str(results_dir), "--extra-arg"],
capture_output=True,
text=True,
)
assert res.returncode != 0
def test_failed_artifact_deletion_prevents_authorization(tmp_path, monkeypatch):
"""Negative control: Failed artifact deletion prevents authorization (exits nonzero)."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
bad_file = results_dir / "leak.har"
bad_file.write_text("network log with tokens")
# Simulate deletion failure
def failing_safe_remove(fp):
return False
monkeypatch.setattr(verify_module, "safe_remove", failing_safe_remove)
ok = verify_and_sanitize_artifacts(str(results_dir))
# When deletion fails, verification MUST return False!
assert ok is False
# CLI invocation must exit nonzero
res = subprocess.run(
[sys.executable, "-c", f"""
import sys
from pathlib import Path
sys.path.insert(0, '{REPO_ROOT}')
import verify_sanitized_artifacts as vsa
vsa.safe_remove = lambda fp: False
ok = vsa.verify_and_sanitize_artifacts('{results_dir}')
sys.exit(0 if ok else 1)
"""],
capture_output=True,
text=True,
)
assert res.returncode != 0
def test_workflow_upload_steps_require_successful_verification():
"""Negative control: Workflow enforces that upload steps execute ONLY if verification succeeded."""
with open(WORKFLOW_PATH, "r", encoding="utf-8") as f:
workflow = yaml.safe_load(f)
jobs = workflow.get("jobs", {})
# 1. Native Node job
node_job = jobs.get("native-node", {})
node_steps = node_job.get("steps", [])
verify_node_step = None
upload_node_step = None
for step in node_steps:
if step.get("id") == "verify-native-results":
verify_node_step = step
if step.get("uses", "").startswith("actions/upload-artifact"):
upload_node_step = step
assert verify_node_step is not None, "verify-native-results step must exist with explicit id"
assert verify_node_step.get("if") == "always()", "verify step must run with if: always()"
assert upload_node_step is not None, "upload step in native-node must exist"
node_upload_if = upload_node_step.get("if", "")
assert "steps.verify-native-results.outcome == 'success'" in node_upload_if, (
f"Node upload step must depend on verify step success; got if: {node_upload_if}"
)
assert node_upload_if != "always()", "Node upload step must not use plain if: always()"
# 2. Browser job
browser_job = jobs.get("browser", {})
browser_steps = browser_job.get("steps", [])
verify_browser_step = None
upload_browser_step = None
for step in browser_steps:
if step.get("id") == "verify-browser-results":
verify_browser_step = step
if step.get("uses", "").startswith("actions/upload-artifact"):
upload_browser_step = step
assert verify_browser_step is not None, "verify-browser-results step must exist with explicit id"
assert verify_browser_step.get("if") == "always()", "verify step must run with if: always()"
assert upload_browser_step is not None, "upload step in browser must exist"
browser_upload_if = upload_browser_step.get("if", "")
assert "steps.verify-browser-results.outcome == 'success'" in browser_upload_if, (
f"Browser upload step must depend on verify step success; got if: {browser_upload_if}"
)
assert browser_upload_if != "always()", "Browser upload step must not use plain if: always()"
def test_fail_closed_abnormal_termination_purges_all_diagnostics(tmp_path, monkeypatch):
"""Abnormal runner termination without disposable fixture purges all diagnostics, keeping JUnit."""
monkeypatch.setenv("CI", "true")
monkeypatch.setenv("GITHUB_ACTIONS", "true")
monkeypatch.delenv("ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS", raising=False)
monkeypatch.delenv("PHOTO_EDITOR_E2E_DATA_DIR", raising=False)
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="10" failures="1"/></testsuites>')
trace = results_dir / "trace.zip"
trace.write_bytes(b"PK0304 sensitive trace archive")
har = results_dir / "session.har"
har.write_text('{"log": {"entries": ["secret"]}}')
png = results_dir / "failure.png"
png.write_bytes(b"\x89PNG\r\n\x1a\nfake screenshot")
tmp = results_dir / "temp.tmp"
tmp.write_text("in-progress trace")
db = results_dir / "app.db"
db.write_bytes(b"SQLite format 3 database")
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
# Safe JUnit reporting MUST be preserved
assert junit.exists()
assert 'failures="1"' in junit.read_text()
# All sensitive diagnostics MUST be purged
assert not trace.exists()
assert not har.exists()
assert not png.exists()
assert not tmp.exists()
assert not db.exists()
def test_sanitizes_trace_archive_when_disposable_ci_verified(tmp_path, monkeypatch):
"""When running inside a verified disposable CI fixture, trace archives are sanitized fail-closed."""
env = _setup_disposable_ci(tmp_path)
for k, v in env.items():
monkeypatch.setenv(k, v)
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="137" failures="0"/></testsuites>')
trace = results_dir / "trace.zip"
with zipfile.ZipFile(trace, "w") as z:
action = {"type": "action", "name": "fill", "params": {"value": "super_secret_password"}}
z.writestr("0-trace.trace", json.dumps(action).encode() + b"\n")
png = results_dir / "failure.png"
png.write_bytes(b"\x89PNG\r\n\x1a\nvalid screenshot payload")
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
assert junit.exists()
assert trace.exists()
assert png.exists()
with zipfile.ZipFile(trace, "r") as z:
content = json.loads(z.read("0-trace.trace").decode().strip())
assert content["params"]["value"] == "[REDACTED]"
def test_malformed_traces_are_removed(tmp_path, monkeypatch):
"""Negative control: Malformed trace archive is purged fail-closed without affecting JUnit XML."""
env = _setup_disposable_ci(tmp_path)
for k, v in env.items():
monkeypatch.setenv(k, v)
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="137" failures="1"/></testsuites>')
malformed_trace = results_dir / "trace.zip"
with zipfile.ZipFile(malformed_trace, "w") as z:
z.writestr("0-trace.trace", b'{"type": "action"}\nmalformed not json line\n')
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
# JUnit XML is preserved
assert junit.exists()
# Malformed archive is purged!
assert not malformed_trace.exists()
def test_fixture_marker_in_target_dir_establishes_ownership(tmp_path, monkeypatch):
"""Fixture proof in target_dir establishes fixture ownership and is purged before upload."""
data_dir = tmp_path / "odysseus-photo-editor-e2e-data"
data_dir.mkdir(parents=True, exist_ok=True)
db_path = data_dir / "app.db"
db_path.write_bytes(b"SQLite format 3\x00")
monkeypatch.setenv("CI", "true")
monkeypatch.setenv("GITHUB_ACTIONS", "true")
monkeypatch.setenv("ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS", "1")
monkeypatch.setenv("PHOTO_EDITOR_E2E_AUTH", "1")
monkeypatch.delenv("PHOTO_EDITOR_E2E_DATA_DIR", raising=False)
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="137" failures="0"/></testsuites>')
marker_file = results_dir / ".disposable-ci-fixture.json"
marker_file.write_text(json.dumps({
"synthetic": True,
"authenticated": True,
"database": str(db_path),
}))
trace = results_dir / "trace.zip"
with zipfile.ZipFile(trace, "w") as z:
action = {"type": "action", "name": "fill", "params": {"value": "sensitive_val"}}
z.writestr("0-trace.trace", json.dumps(action).encode() + b"\n")
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is True
assert junit.exists()
assert trace.exists()
# Marker file itself must be purged so it is never published as an artifact
assert not marker_file.exists()
def test_unhandled_exception_fails_closed_purges_all_non_xml(tmp_path, monkeypatch):
"""Unexpected exception during verification triggers emergency fail-closed purge of non-XML files."""
env = _setup_disposable_ci(tmp_path)
for k, v in env.items():
monkeypatch.setenv(k, v)
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "browser-junit.xml"
junit.write_text('<testsuites><testsuite name="photo-editor" tests="137" failures="0"/></testsuites>')
trace = results_dir / "trace.zip"
trace.write_bytes(b"PK0304 trace")
def broken_sanitize(zp):
raise RuntimeError("Simulated unexpected crash in sanitizer")
monkeypatch.setattr(verify_module, "sanitize_trace_archive", broken_sanitize)
ok = verify_and_sanitize_artifacts(str(results_dir))
assert ok is False
# Safe JUnit reporting is preserved
assert junit.exists()
# Sensitive non-XML file is purged fail-closed!
assert not trace.exists()
def test_cli_invocation_returns_cleanly(tmp_path):
"""Running the script as a CLI entrypoint succeeds with exit code 0."""
results_dir = tmp_path / "test-results"
results_dir.mkdir()
junit = results_dir / "junit.xml"
junit.write_text('<testsuites><testsuite name="native-node" tests="43" failures="0"/></testsuites>')
res = subprocess.run(
[sys.executable, str(VERIFY_SCRIPT), str(results_dir)],
capture_output=True,
text=True,
)
assert res.returncode == 0
assert junit.exists()