mirror of
https://github.com/calibrain/shelfmark.git
synced 2026-11-15 14:58:11 +00:00
`main.py` also builds the app itself, and this moves the parts of that which need no route into `core/app_setup.py`: the persisted secret key and the session cookie settings, the security headers, and the filter that keeps status polling and the WebSocket upgrade noise out of the log. It is the app setup item in the plan from Discussion #1536. The first commit adds 14 tests for them, since none existed: the key reused, created with mode 600, replaced when too short, and still returned when the config directory cannot be written, the cookie settings, the headers on a real response and that a header a route set itself is kept, and each case the log filter drops or keeps. They pass on current `main`. The second commit is the move. The security headers hook is registered from the same spot in `main.py` as before, so the `after_request` order is unchanged. The secret key function takes the config directory as a parameter instead of reading `CONFIG_DIR`, which is the one change in the move, and the key tests call it with a temp directory. The URL map and the hook order are identical, and the full suite, ruff and basedpyright are clean. I also ran the app from the branch: the secret file is created with mode 600 and the four security headers come back on a normal response. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> <!-- coderabbit-ai-generated:v1 --> ## Summary by CodeRabbit * **Bug Fixes** * Sessions now remain consistent across app restarts, and session cookies use more protective browser settings, including HTTP-only access and a seven-day lifetime. * Responses include baseline security headers while preserving any headers already set by the app. * Routine status-polling and connection-upgrade messages are filtered from application logs, reducing unrelated log noise. * If saving a session key fails, the app can still start with a generated key. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
156 lines
5.8 KiB
Python
156 lines
5.8 KiB
Python
"""Characterization tests for the app setup that moves out of main.py: the persisted secret key,
|
|
the session cookie settings, the security headers and the werkzeug log filter.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
import logging
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from shelfmark.core.app_setup import (
|
|
FLASK_SECRET_KEY_MIN_BYTES,
|
|
LogNoiseFilter,
|
|
load_or_create_secret_key,
|
|
register_security_headers,
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def main_module():
|
|
"""Import `shelfmark.main` with background startup disabled."""
|
|
with patch("shelfmark.download.orchestrator.start"):
|
|
import shelfmark.main as main
|
|
|
|
importlib.reload(main)
|
|
return main
|
|
|
|
|
|
def _record(message: str, *, level: int = logging.INFO, exc_info=None) -> logging.LogRecord:
|
|
return logging.LogRecord("werkzeug", level, __file__, 1, message, None, exc_info)
|
|
|
|
|
|
class TestSecretKey:
|
|
def test_a_persisted_key_is_reused(self, main_module, tmp_path):
|
|
persisted = b"k" * 64
|
|
(tmp_path / ".flask_secret").write_bytes(persisted)
|
|
|
|
assert load_or_create_secret_key(tmp_path) == persisted
|
|
|
|
def test_a_missing_key_is_created_and_kept_private(self, main_module, tmp_path):
|
|
created = load_or_create_secret_key(tmp_path)
|
|
again = load_or_create_secret_key(tmp_path)
|
|
|
|
path = tmp_path / ".flask_secret"
|
|
assert len(created) == 64
|
|
assert path.read_bytes() == created == again
|
|
assert path.stat().st_mode & 0o777 == 0o600
|
|
|
|
def test_a_key_that_is_too_short_is_replaced(self, main_module, tmp_path):
|
|
path = tmp_path / ".flask_secret"
|
|
path.write_bytes(b"short")
|
|
|
|
key = load_or_create_secret_key(tmp_path)
|
|
|
|
assert len(key) == 64
|
|
assert path.read_bytes() == key
|
|
|
|
def test_a_key_of_exactly_the_minimum_length_is_kept(self, main_module, tmp_path):
|
|
minimum = b"m" * FLASK_SECRET_KEY_MIN_BYTES
|
|
(tmp_path / ".flask_secret").write_bytes(minimum)
|
|
|
|
assert load_or_create_secret_key(tmp_path) == minimum
|
|
|
|
def test_an_unwritable_config_dir_still_gives_a_key(self, main_module, tmp_path):
|
|
blocked = tmp_path / "file-not-dir"
|
|
blocked.write_text("x")
|
|
|
|
key = load_or_create_secret_key(blocked / "config")
|
|
|
|
assert len(key) == 64
|
|
|
|
def test_the_app_and_the_opaque_id_key_use_the_same_secret(self, main_module):
|
|
from shelfmark.core import viewer_redaction
|
|
|
|
assert len(main_module.app.config["SECRET_KEY"]) >= 32
|
|
assert viewer_redaction._public_id_key is not None
|
|
|
|
|
|
class TestSessionCookie:
|
|
def test_cookie_settings(self, main_module):
|
|
config = main_module.app.config
|
|
|
|
assert config["SESSION_COOKIE_HTTPONLY"] is True
|
|
assert config["SESSION_COOKIE_SAMESITE"] == "Lax"
|
|
assert config["SESSION_COOKIE_NAME"] == main_module.SESSION_COOKIE_NAME
|
|
assert config["SESSION_COOKIE_SECURE"] == main_module.SESSION_COOKIE_SECURE
|
|
assert config["PERMANENT_SESSION_LIFETIME"] == 604800
|
|
|
|
|
|
class TestSecurityHeaders:
|
|
def test_every_response_carries_the_baseline_headers(self, main_module):
|
|
response = main_module.app.test_client().get("/api/health")
|
|
|
|
assert response.headers["X-Content-Type-Options"] == "nosniff"
|
|
assert response.headers["Permissions-Policy"] == "camera=(), microphone=(), geolocation=()"
|
|
assert response.headers["Cross-Origin-Embedder-Policy"] == "credentialless"
|
|
csp = response.headers["Content-Security-Policy"]
|
|
assert csp.startswith("default-src 'self'; script-src 'self';")
|
|
assert "connect-src 'self' ws: wss:" in csp
|
|
|
|
def test_a_header_already_on_the_response_is_not_overridden(self, main_module):
|
|
from flask import Flask, Response
|
|
|
|
response = Response("{}")
|
|
response.headers["X-Content-Type-Options"] = "route-value"
|
|
|
|
app = Flask(__name__)
|
|
register_security_headers(app)
|
|
with app.test_request_context():
|
|
result = app.process_response(response)
|
|
|
|
assert result is response
|
|
assert response.headers["X-Content-Type-Options"] == "route-value"
|
|
assert response.headers["Permissions-Policy"] == "camera=(), microphone=(), geolocation=()"
|
|
|
|
|
|
class TestLogNoiseFilter:
|
|
def test_status_polling_is_dropped(self, main_module):
|
|
noise = LogNoiseFilter()
|
|
|
|
assert noise.filter(_record('127.0.0.1 - "GET /api/status HTTP/1.1" 200 -')) is False
|
|
|
|
def test_other_requests_are_kept(self, main_module):
|
|
noise = LogNoiseFilter()
|
|
|
|
assert noise.filter(_record('127.0.0.1 - "GET /api/releases HTTP/1.1" 200 -')) is True
|
|
assert noise.filter(_record('127.0.0.1 - "POST /api/status HTTP/1.1" 200 -')) is True
|
|
|
|
def test_the_websocket_upgrade_noise_is_dropped(self, main_module):
|
|
noise = LogNoiseFilter()
|
|
|
|
assert noise.filter(_record("write() before start_response")) is False
|
|
assert noise.filter(_record("Error on request:", level=logging.ERROR)) is False
|
|
|
|
def test_an_assertion_error_from_the_upgrade_is_dropped_but_other_errors_are_not(
|
|
self, main_module
|
|
):
|
|
noise = LogNoiseFilter()
|
|
upgrade = AssertionError("write() before start_response")
|
|
other = AssertionError("something else")
|
|
|
|
dropped = _record("boom", level=logging.ERROR, exc_info=(AssertionError, upgrade, None))
|
|
kept = _record("boom", level=logging.ERROR, exc_info=(AssertionError, other, None))
|
|
kept_type = _record("boom", level=logging.ERROR, exc_info=(ValueError, upgrade, None))
|
|
|
|
assert noise.filter(dropped) is False
|
|
assert noise.filter(kept) is True
|
|
assert noise.filter(kept_type) is True
|
|
|
|
def test_the_filter_is_installed_on_the_werkzeug_logger(self, main_module):
|
|
filters = logging.getLogger("werkzeug").filters
|
|
|
|
assert any(type(f).__name__ == "LogNoiseFilter" for f in filters)
|