v0.25.1

scripts/web_server_contracts.py

@@ -2,6 +2,8 @@
 """Rust-independent 0.25 Web Server architecture/security contract checks."""
 from pathlib import Path
 import json
+from rust_source import rust_source, rust_tree
+from web_assets import read_app_js, read_vhosts_js
 
 ROOT = Path(__file__).resolve().parents[1]
 
@@ -9,19 +11,23 @@ def need(text: str, *markers: str) -> None:
     for marker in markers:
         assert marker in text, marker
 
-config = (ROOT / "src/config.rs").read_text()
-vhost = (ROOT / "src/vhost.rs").read_text()
-web = (ROOT / "src/web_server.rs").read_text()
-proxy = (ROOT / "src/proxy/mod.rs").read_text()
-admin = (ROOT / "src/admin/mod.rs").read_text()
-ui = (ROOT / "src/admin/web/vhosts.js").read_text()
+config = rust_source(ROOT, "src/config.rs")
+vhost = rust_source(ROOT, "src/vhost.rs")
+web_dir = ROOT / "src/web_server"
+assert not (ROOT / "src/web_server.rs").exists(), "Web Server monolith must not coexist with src/web_server/mod.rs"
+for module in ["mod.rs", "config.rs", "filesystem.rs", "security.rs", "response.rs", "request.rs", "routing.rs", "fastcgi.rs", "serve.rs", "htaccess.rs", "tests.rs"]:
+    assert (web_dir / module).is_file(), module
+web = rust_tree(ROOT, "src/web_server")
+proxy = rust_source(ROOT, "src/proxy/mod.rs")
+admin = rust_source(ROOT, "src/admin/mod.rs")
+ui = read_vhosts_js(ROOT)
 web_ui = (ROOT / "src/admin/web/web-server.js").read_text()
-app_ui = (ROOT / "src/admin/web/app.js").read_text()
+app_ui = read_app_js(ROOT)
 html = (ROOT / "src/admin/web/index.html").read_text()
 settings_ui = (ROOT / "src/admin/web/settings.js").read_text()
-logging = (ROOT / "src/logging.rs").read_text()
-metrics = (ROOT / "src/metrics.rs").read_text()
-acl = (ROOT / "src/acl.rs").read_text()
+logging = rust_source(ROOT, "src/logging.rs")
+metrics = rust_source(ROOT, "src/metrics.rs")
+acl = rust_source(ROOT, "src/acl.rs")
 openapi = json.loads((ROOT / "src/admin/openapi.json").read_text())
 
 need(config,
@@ -90,7 +96,7 @@ need(web,
      'HeaderValue::from_static("no-store")',
      "builtin_error_response(StatusCode::FORBIDDEN, &method)",
      "empty_index_can_go_directly_to_directory_listing",
-     "RustProxy <b>0.25.0</b>",
+     "RustProxy <b>0.25.1</b>",
      "traversal_and_symlink_escape_are_not_served",
      "try_files_rewrites_cache_rules_headers_and_downloads_work",
      "precompressed_sidecars_keep_mime_validators_and_range_semantics",
@@ -166,12 +172,13 @@ assert web_service_schema["properties"]["htaccess"]["properties"]["enabled"]["de
 assert web_service_schema["properties"]["htaccess"]["properties"]["filename"]["default"] == ".htaccess"
 assert web_service_schema["properties"]["hardening"]["properties"]["block_common_attacks"]["default"] is False
 assert web_service_schema["properties"]["hardening"]["properties"]["strip_unnecessary_headers"]["default"] is False
-htaccess_source = (ROOT / "src/web_server/htaccess.rs").read_text()
+htaccess_source = rust_source(ROOT, "src/web_server/htaccess.rs")
 need(htaccess_source, "MAX_HTACCESS_FILES", "MAX_HTACCESS_TOTAL_BYTES", "RewriteEngine", "RewriteCond", "RewriteRule", "DirectoryIndex", "AddType", "AddHandler", "ExpiresByType", "Require all granted/denied", "general Files/FilesMatch semantics are not supported", "security/handler directive", "apply_response", "apply_rewrites")
 assert "Source" in openapi.get("components", {}).get("schemas", {})
 assert "client_ips" in openapi["components"]["schemas"]["TrafficCounters"]["properties"]
 assert (ROOT / "docs/WEB_SERVER.md").is_file()
 assert (ROOT / "docs/PHP_FPM.md").is_file()
+assert (ROOT / "docs/V0.25.1_AUDIT.md").is_file()
 assert (ROOT / "docs/V0.25.0_AUDIT.md").is_file()
 assert (ROOT / "docs/TODO.md").is_file()
 docs_html = (ROOT / "src/admin/web/docs.html").read_text()