v0.29.4

tools/checks/web_server_contracts.py

@@ -21,7 +21,7 @@ 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()
+web_ui = (ROOT / "src/admin/web/web-server.js").read_text() + "\n" + (ROOT / "src/admin/web/web-server-profiles.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()
@@ -107,12 +107,14 @@ need(web,
      "secure filesystem confinement currently requires a Unix platform")
 need(proxy,
      "if let crate::config::CompiledSource::WebServer(service) = &route.source",
-     "let static_method = request.method().clone()",
+     "let request_method = request.method().clone()",
      "crate::web_server::serve(",
-     "static_headers",
+     "let request_headers = request.headers().clone()",
      "response.extensions_mut().insert(StaticSourceResponse)",
-     "let custom_error =",
+     "execute_error_fallback(",
      "crate::pages::replace_error",
+     "state.cache.wrap_with_fill(",
+     "crate::transform::apply(",
      "apply_response_rules(",
      "finish_headers(",
      "crate::compression::encode(")
@@ -123,8 +125,9 @@ web_source_pos = proxy.index("CompiledSource::WebServer(service)", basic_identit
 assert basic_identity_pos < web_source_pos
 assert identity_pos < web_source_pos
 assert web_source_pos < proxy.index("let (backend, backend_lease, affinity_cookie)")
-custom_error_pos = proxy.index("let custom_error =")
-assert proxy.find("apply_response_rules(", custom_error_pos) > custom_error_pos
+web_source = rust_source(ROOT, "src/proxy/forward/web_source.rs")
+assert web_source.index("apply_response_rules(") > web_source.index("let origin_headers =")
+assert web_source.index("crate::transform::apply(") > web_source.index("apply_response_rules(")
 need(acl, "ambiguous encoded path character", '"/%2e%2e/secret"', '"/a%2fb"', '"/a%5cb"', '"/bad%"')
 need(admin, '"/web-server"', '"/assets/web-server.js"', '"web-services"', '"vhost_metrics"')
 need(html, 'data-panel="web-server"', 'id="panel-web-server"', 'id="web-service-dialog"',
@@ -133,7 +136,9 @@ need(html, 'data-panel="web-server"', 'id="panel-web-server"', 'id="web-service-
      'data-web-service-page="php"', 'data-web-service-page="security"', 'data-web-service-page="htaccess"',
      'id="web-service-htaccess-enabled"', 'id="web-service-htaccess-help"', 'id="htaccess-help-dialog"', 'id="web-service-try-files"',
      'id="web-service-cache-rules"', 'id="web-service-precompressed"', 'id="web-service-compression"', 'id="web-service-compression-zstd"', 'id="web-service-compression-br"', 'id="web-service-compression-gzip"', 'id="web-service-compression-deflate"', 'id="web-service-php-enabled"',
-     'id="web-service-php-pass-authorization"', 'id="web-service-php-body-limit"',
+     'id="web-service-php-pass-authorization"', 'id="web-service-php-profile"',
+     'id="web-service-php-profiles"', 'id="php-fpm-profiles-dialog"',
+     'id="web-service-php-body-limit"',
      'id="web-service-php-header-limit"', 'id="web-service-php-stderr-limit"',
      'id="web-service-php-custom-params"', 'id="web-service-php-values"', 'id="php-help-dialog"',
      'id="web-service-symlink-policy"', 'id="web-service-preset"', 'id="web-service-preset-apply"',
@@ -147,6 +152,10 @@ need(web_ui, 'saveSection("web-services"', "directory_listing", "web_service_id"
      "syncHtaccess", "htaccess-help-dialog", "php-help-dialog", "parseFastCgiParams", "parsePhpValues", "validatePhpCustomData", "activateTab", "initTabs", "presetChanged",
      'button = el("button", t(key), "quiet")', 'button.dataset.tab = name', 'button.setAttribute("role", "tab")', "vhost-detail",
      'el("span", t(key), "small-label")', "if (envelope) render();")
+need(config, "pub php_fpm_profiles: Vec<crate::web_server::PhpFpmProfile>", "duplicate PHP-FPM profile id", "unknown PHP-FPM profile")
+need(web, "pub struct PhpFpmProfile", "pub php_profile_id: Option<String>", "fastcgi_always_sets_http_host_for_http2_http3_wordpress_requests")
+need(proxy, "empty_for_cache(&mut request)", 'request.headers_mut().insert(HOST, original_host.clone())')
+need(web_ui, "phpProfileLocal", 'saveSection("php-fpm-profiles"', "function profileEditor(")
 need(logging, '"route"', '"cache_effective_enabled"', '"transform_effective_enabled"', 'value["cache_enabled"]', 'value["transform_enabled"]')
 need(metrics, "pub struct VhostMetricsView", "ewma_duration_us", "pub fn view(&self) -> VhostMetricsView")
 assert 'item.append(text("span"' not in web_ui
@@ -154,7 +163,10 @@ need(app_ui, 'function showStartupFailure(error)', '$("login").hidden = true', '
 assert '$("login").hidden = false; document.documentElement.classList.remove("app-loading")' not in app_ui
 need(ui, 'type: "web_server"', "web_service_id", "sourceReverseProxy", "vhBackendRequired", "backend-diagnostics-card", "status.vhost_metrics", "vhostTrafficRate")
 assert "WebService" in openapi.get("components", {}).get("schemas", {})
+assert "PhpFpmProfile" in openapi["components"]["schemas"]
+assert "php_fpm_profiles" in openapi["components"]["schemas"]["Config"]["properties"]
 web_service_schema = openapi["components"]["schemas"]["WebService"]
+assert "php_profile_id" in web_service_schema["properties"]
 assert web_service_schema["properties"]["index"].get("minItems", 0) == 0
 assert web_service_schema["properties"]["index"]["maxItems"] == 16
 assert web_service_schema["properties"]["mime_types"]["maxProperties"] == 64