v0.29.4

src/admin/web/web-server.js

@@ -153,15 +153,22 @@
     activateTab("general");
   }
 
+  const { renderProfiles, openProfiles, refreshProfileSelect } = window.rustProxyPhpProfiles({
+    defaults, mapLines, lines, parseFastCgiParams, parsePhpValues, validatePhpCustomData
+  });
+
   function syncPhp() {
+    const attached = !!$("web-service-php-profile").value;
     const enabled = $("web-service-php-enabled").checked;
+    $("web-service-php-enabled").disabled = attached;
+
     for (const id of [
       "web-service-php-endpoint", "web-service-php-extensions", "web-service-php-connect-timeout",
       "web-service-php-request-timeout", "web-service-php-concurrency", "web-service-php-pass-authorization",
       "web-service-php-path-info",
       "web-service-php-body-limit", "web-service-php-header-limit", "web-service-php-stderr-limit",
       "web-service-php-custom-params", "web-service-php-values", "web-service-php-admin-values"
-    ]) $(id).disabled = !enabled;
+    ]) $(id).disabled = !enabled || attached;
   }
 
   function syncCompression() {
@@ -196,7 +203,7 @@
       id: "", name: "", document_root: "", index: ["index.html", "index.htm"], directory_listing: false,
       mime_types: {}, default_mime_type: "application/octet-stream", cache_control: null, cache_rules: [], response_headers: {},
       try_files: [], rewrites: [], compression: { enabled: null, gzip: null, br: null, zstd: null, deflate: null }, precompressed: { enabled: false, brotli: true, gzip: true }, download_extensions: [],
-      symlink_policy: "deny", php: {
+      symlink_policy: "deny", php_profile_id: null, php: {
         enabled: false, path_info: false, extensions: ["php"], endpoint: "unix:/run/php/php-fpm.sock", connect_timeout_ms: 1000,
         request_timeout_ms: 30000, max_concurrent_requests: 64, pass_authorization: true, max_request_body_bytes: 0,
         max_response_header_bytes: 65536, stderr_log_bytes: 4096, custom_params: {}, php_values: {}, php_admin_values: {}
@@ -243,6 +250,7 @@
     $("web-service-precompressed-br").checked = item.precompressed?.brotli !== false;
     $("web-service-precompressed-gzip").checked = item.precompressed?.gzip !== false;
     $("web-service-download-extensions").value = (item.download_extensions || []).join("\n");
+    refreshProfileSelect(item.php_profile_id || "");
     $("web-service-php-enabled").checked = item.php?.enabled === true;
     $("web-service-php-path-info").checked = item.php?.path_info === true;
     $("web-service-php-endpoint").value = item.php?.endpoint || "unix:/run/php/php-fpm.sock";
@@ -373,7 +381,7 @@
         ["webServiceDirectoryListing", t(service.directory_listing ? "enabled" : "notEnabled")],
         ["webServiceTryFiles", (service.try_files || []).length ? String(service.try_files.length) : "-"],
         ["webServiceHtaccessEnabled", t(service.htaccess?.enabled ? "enabled" : "notEnabled")],
-        ["webServicePhpEnabled", t(service.php?.enabled ? "enabled" : "notEnabled")],
+        ["webServicePhpEnabled", service.php_profile_id ? `${service.php_profile_id} (${t("phpProfileShared")})` : t(service.php?.enabled ? "enabled" : "notEnabled")],
         ["webServiceCompression", service.compression?.enabled === true ? t("enabled") : service.compression?.enabled === false ? t("notEnabled") : t("inherit")],
         ["webServicePrecompressed", t(service.precompressed?.enabled ? "enabled" : "notEnabled")],
         ["webServiceHardeningTitle", t((service.hardening?.block_common_attacks || service.hardening?.strip_unnecessary_headers) ? "enabled" : "notEnabled")],
@@ -428,6 +436,7 @@
           block_common_attacks: $("web-service-hardening-attacks").checked,
           strip_unnecessary_headers: $("web-service-hardening-headers").checked
         },
+        php_profile_id: $("web-service-php-profile").value || null,
         php: {
           enabled: phpEnabled,
           path_info: $("web-service-php-path-info").checked,
@@ -446,7 +455,7 @@
         }
       };
       validatePhpCustomData(item.php.custom_params, item.php.php_values, item.php.php_admin_values);
-      if (phpEnabled && item.symlink_policy !== "deny") throw new Error(t("webServicePhpSymlinkConflict"));
+      if ((phpEnabled || item.php_profile_id && (envelope.config.php_fpm_profiles || []).find(profile => profile.id === item.php_profile_id)?.php?.enabled) && item.symlink_policy !== "deny") throw new Error(t("webServicePhpSymlinkConflict"));
       const next = structuredClone(envelope.config.web_services || []);
       const duplicate = next.find(service => service.id === item.id && service.id !== editing);
       if (duplicate) { toast(t("webServiceDuplicate"), true); return; }
@@ -462,6 +471,11 @@
   form.addEventListener("input", () => { dirty = true; });
   form.addEventListener("change", () => { dirty = true; });
   $("web-service-php-enabled").addEventListener("change", syncPhp);
+  $("web-service-php-profile").addEventListener("change", syncPhp);
+  $("web-service-php-profiles").addEventListener("click", openProfiles);
+  $("web-service-php-profiles-open").addEventListener("click", openProfiles);
+  $("php-fpm-profiles-close").addEventListener("click", () => $("php-fpm-profiles-dialog").close());
+  $("php-fpm-profile-add").addEventListener("click", () => renderProfiles(true));
   $("web-service-compression").addEventListener("change", syncCompression);
   $("web-service-precompressed").addEventListener("change", syncPrecompressed);
   $("web-service-htaccess-enabled").addEventListener("change", syncHtaccess);