v0.34.4

src/admin/web/vhosts/editor.js

@@ -83,8 +83,6 @@ function load(value = defaults(), migrationIds = [], show = true) {
   wwwDetails.append(wwwLabel, wwwChoices, wwwNoHosts, wwwOther, wwwHelp);
   wwwPanel.append(wwwHeader, wwwInactive, wwwDetails, wwwTarget);
   g.append(wwwPanel);
-  // Persist only the selected canonical host; choosing the www variant does
-  // not require adding an extra hostname to the vhost manually.
   let selectedCanonical = value.www_redirect_target || (value.frontend?.hosts || []).find(host => !host.startsWith("*.")) || "";
   const syncCanonical = () => {
     const allHosts = lines(read("hosts").value);
@@ -129,8 +127,6 @@ function load(value = defaults(), migrationIds = [], show = true) {
     wwwNoHosts.hidden = bases.length > 0;
     wwwRedirect.disabled = !bases.length;
     if (!bases.length) wwwRedirect.checked = false;
-    // Never hide the destination choices: the unchecked state is a preview
-    // that the operator can configure before enabling the rule.
     wwwDetails.hidden = false;
     wwwInactive.hidden = wwwRedirect.checked;
     wwwRedirect.setAttribute("aria-expanded", "true");
@@ -241,14 +237,7 @@ function load(value = defaults(), migrationIds = [], show = true) {
   const selectedProfiles = new Set([value.acl_profile_id, ...(value.acl_profile_ids || [])].filter(Boolean));
   const profileBox = el("div", undefined, "vh-wide vh-acl-profile-picker");
   profileBox.append(text("strong", "vhAclProfile"));
-  const choices = el("div", undefined, "vh-acl-profile-choices");
-  for (const profile of envelope?.config.acl_profiles || []) {
-    const label = el("label", undefined, "check vh-acl-profile-choice");
-    const checkbox = document.createElement("input"); checkbox.type = "checkbox"; checkbox.name = "acl-profile-choices";
-    checkbox.value = profile.id; checkbox.checked = selectedProfiles.has(profile.id);
-    label.append(checkbox, el("span", profile.name || profile.id)); choices.append(label);
-  }
-  if (!choices.children.length) choices.append(text("span", "vhAclProfileNone", "fine"));
+  const choices = window.rustProxyAclPicker.create([...selectedProfiles], "vh-acl-profile-choices");
   profileBox.append(choices);
   const multiWarning = text("p", "multiAclWarning", "fine acl-stack-warning");
   const syncMultiWarning = () => { multiWarning.hidden = choices.querySelectorAll('input:checked').length < 2; };
@@ -406,7 +395,7 @@ function load(value = defaults(), migrationIds = [], show = true) {
 
 }
 function collect() {
-  locationsReader(); // Validate every visual row; never silently save an earlier JSON value.
+  locationsReader();
   let paths, acl, headers;
   try {
     paths = JSON.parse(str("paths")); acl = JSON.parse(str("acl")); headers = JSON.parse(str("headers"));
@@ -464,7 +453,7 @@ function collect() {
   }
   return {
     id: str("id"), enabled: yes("enabled"), source: mainSourceType === "web_server" ? { type: "web_server", web_service_id: str("source-web-service") } : { type: "reverse_proxy" }, error_fallback: mainFallbackTarget ? { target: mainFallbackTarget, statuses: mainFallbackStatuses.length ? mainFallbackStatuses : [404] } : null, force_ssl: yes("force-ssl"), www_redirect: yes("www-redirect"), www_redirect_target: str("www-redirect-target") || null, forward_client_ip: yes("forward-client-ip"), websockets: yes("websockets"), websocket_legacy_support: yes("websockets") && yes("websocket-legacy-support"), websocket_rfc8441: yes("websockets") && ["h2", "h2h3"].includes(str("websocket-mode")), websocket_rfc9220: yes("websockets") && ["h3", "h2h3"].includes(str("websocket-mode")), http2_enabled: yes("http2-enabled"), http3_enabled: yes("http3-enabled"), cloudflare_client_ip: yes("cloudflare-client-ip"), timing_headers: yes("timing-headers"), backend_header: yes("backend-header"), backend_timing_header: yes("backend-timing-header"), basic_auth: basicEditor.read(), certificate_id: nullable("certificate-id"), allow_certificate_mismatch: yes("allow-certificate-mismatch"), tls_policy: yes("tls-policy-custom") ? { tls12: yes("tls-policy-12"), tls13: yes("tls-policy-13"), cipher_suites: lines(str("tls-policy-ciphers")) } : null, cache: collectCache(), compression: collectCompression(), transform: collectTransform(), pages: pagesEditor.read(), frontend: { hosts: readHosts(), listener_ids: bindingSelection }, acl_profile_id: null,
-    acl_profile_ids: [...form.querySelectorAll('input[name="acl-profile-choices"]:checked')].map(input => input.value),
+    acl_profile_ids: window.rustProxyAclPicker.read(form.querySelector(".vh-acl-profile-choices")),
     proxy_timeouts: { connect_timeout_seconds: num("proxy-connect-timeout"), response_header_timeout_seconds: num("proxy-header-timeout"), read_timeout_seconds: num("proxy-read-timeout"), send_timeout_seconds: num("proxy-send-timeout") },
     rate_limit: { enabled: yes("rate-enabled"), requests: num("rate-requests"), window_seconds: num("rate-window"), burst: num("rate-burst"), country_access: { mode: str("country-mode"), countries: lines(str("country-list")).map(value => value.toUpperCase()) }, country_limits: countryRatesReader(), user_agent_limits: uaRatesReader() },
     method_policy: { mode: str("method-mode"), methods: lines(str("method-list")).map(value => value.toUpperCase()) },