gru/RustProxy
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.34.4

Browse Source
This commit is contained in:
Mateusz Gruszczyński committed 2026-10-20 23:13:39 +02:00
1 parent 52e7ce7b46
commit 3776edf4fc
5 files changed
+226 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/admin/web/docker.js
+11 -23
View File
@@ -335,36 +335,24 @@
const compressionEnabled = input("", "checkbox", "docker-compression-enabled"); compressionEnabled.checked = assignment?.compression_enabled !== false; const compressionField = checkboxField("dockerCompression", compressionEnabled); compressionField.title = t("dockerCompressionHelp");
const switches = el("div", undefined, "docker-switch-row"); switches.append(preserveLabel, forceSslField, websocketField, cacheField, compressionField, transformField);
const certMismatch = input("", "checkbox", "docker-cert-mismatch"); certMismatch.checked = assignment?.allow_certificate_mismatch === true;
const mismatchField = checkboxField("dockerCertMismatchForce", certMismatch);
const mismatchHelp = el("p", t("dockerCertMismatchWarning"), "fine acl-stack-warning");
const mismatchUnavailable = el("p", t("dockerCertMismatchUnavailable"), "fine");
const riskPill = el("span", t("dockerCertMismatchRisk"), "acl-picker-policy is-deny docker-cert-risk-pill");
const syncMismatch = () => {
certMismatch.disabled = !agent.certificate_id;
if (!agent.certificate_id) certMismatch.checked = false;
mismatchHelp.hidden = !certMismatch.checked;
mismatchUnavailable.hidden = !!agent.certificate_id;
riskPill.hidden = !certMismatch.checked;
};
certMismatch.addEventListener("change", syncMismatch);
mismatchField.append(mismatchHelp, mismatchUnavailable);
certMismatch.disabled = !agent.certificate_id;
if (certMismatch.disabled) certMismatch.checked = false;
const mismatchLabel = el("label", undefined, "check");
mismatchLabel.append(certMismatch, el("span", t("dockerCertMismatchForce")));
mismatchLabel.title = t(certMismatch.disabled ? "dockerCertMismatchUnavailable" : "dockerCertMismatchWarning");
const certificateBar = el("div", undefined, "docker-service-certificate-bar");
const tlsControl = el("div", undefined, "docker-service-certificate-control");
const tlsHeading = el("div", undefined, "docker-service-certificate-title");
tlsHeading.append(el("strong", t("dockerCertSection")), riskPill);
tlsControl.append(tlsHeading, mismatchField); certificateBar.append(tlsControl);
syncMismatch();
certificateBar.append(mismatchLabel);
const h2Enabled = input("", "checkbox", "docker-http2-enabled"); h2Enabled.checked = assignment?.http2_enabled !== false;
const h3Enabled = input("", "checkbox", "docker-http3-enabled"); h3Enabled.checked = assignment?.http3_enabled !== false;
const protocolBox = el("section", undefined, "docker-protocol-panel");
const protocolHeading = el("div", undefined, "docker-protocol-heading");
protocolHeading.append(el("strong", t("dockerFrontendProtocols")), el("small", t("dockerFrontendProtocolsHelp"), "fine"));
// New publications default to H3 off; legacy assignments keep their saved behavior.
const h3Enabled = input("", "checkbox", "docker-http3-enabled"); h3Enabled.checked = assignment ? assignment.http3_enabled !== false : false;
const protocolBox = el("details", undefined, "docker-protocol-editor"), protocolSummary = el("summary");
protocolSummary.append(el("span", t("dockerFrontendProtocols")), el("small", t("dockerFrontendProtocolsHelp"), "fine"));
const protocolOptions = el("div", undefined, "docker-protocol-options");
const h1 = el("span", undefined, "docker-protocol-fixed");
h1.append(el("strong", "HTTP/1.1"), el("small", t("dockerHttp1Always"), "fine"));
protocolOptions.append(h1, checkboxField("dockerHttp2Enabled", h2Enabled), checkboxField("dockerHttp3Enabled", h3Enabled));
protocolBox.append(protocolHeading, protocolOptions);
protocolBox.append(protocolSummary, protocolOptions);
route.append(labeled("dockerHostname", host, t("dockerHostnameHelp").replace("{domain}", agent.base_domain)), aliases.node, labeled("dockerBackendIp", target), labeled("dockerBackendScheme", scheme), switches);
editor.append(certificateBar, route, protocolBox, aclEditor(assignment, agent), timeoutEditor(assignment), healthEditor(assignment), passiveHealthEditor(assignment));
const actions = el("div", undefined, "docker-service-actions"), apply = el("button", t("dockerApplyService"), "outline docker-apply"); apply.type = "button"; apply.disabled = !publish.checked; apply.addEventListener("click", async () => { apply.disabled = true; try { await saveAssignment(agent.id, row, true); } catch (error) { toast(error.message, true); } finally { if (row.isConnected) apply.disabled = !publish.checked; } }); actions.append(apply); editor.append(actions); row.append(editor);
src/admin/web/style.css
+205 -72
View File
@@ -5887,12 +5887,14 @@ dialog .window-heading {
gap: 8px;
}
.docker-protocol-editor,
.docker-acl-editor,
.docker-timeout-editor {
border-top: 1px solid var(--line);
padding-top: 9px;
}
.docker-protocol-editor>summary,
.docker-acl-editor>summary,
.docker-timeout-editor>summary {
cursor: pointer;
@@ -12316,7 +12318,7 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
}
/* Docker TLS SHA-256 values must wrap even in narrow mobile details cards. */
.docker-agent-summary > span,
.docker-agent-summary>span,
.docker-agent-security-hint,
.docker-fingerprint {
min-width: 0;
@@ -12328,15 +12330,28 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
/* Reusable searchable ACL multi-select: identical in the ordinary vhost editor,
Docker agent defaults and Docker per-service overrides. All internal corners
follow the user-selected control radius; fallbacks preserve Original style. */
.vh-acl-profile-picker, .acl-picker { min-width: 0; width: 100%; }
.vh-acl-profile-picker > strong { display: block; margin-bottom: 8px; }
.vh-acl-profile-picker,
.acl-picker {
min-width: 0;
width: 100%;
}
.vh-acl-profile-picker>strong {
display: block;
margin-bottom: 8px;
}
.acl-picker-details {
border: 1px solid var(--field-line);
background: var(--field-bg);
border-radius: var(--rp-radius-control, 8px);
min-width: 0;
}
.acl-picker-details[open] { border-color: var(--border-hover); }
.acl-picker-details[open] {
border-color: var(--border-hover);
}
.acl-picker-summary {
display: flex;
align-items: center;
@@ -12347,7 +12362,13 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
user-select: none;
min-height: 21px;
}
.acl-picker-heading { flex: 1 1 auto; font-weight: 600; min-width: 0; }
.acl-picker-heading {
flex: 1 1 auto;
font-weight: 600;
min-width: 0;
}
.acl-picker-counter {
color: var(--accent);
border: 1px solid var(--pill-line);
@@ -12356,15 +12377,28 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
font: 11px var(--mono);
margin-left: auto;
}
.acl-picker-dropdown { padding: 10px; border-top: 1px solid var(--line); }
.acl-picker-search, .docker-agent-grid .acl-picker-search {
.acl-picker-dropdown {
padding: 10px;
border-top: 1px solid var(--line);
}
.acl-picker-search,
.docker-agent-grid .acl-picker-search {
width: 100%;
box-sizing: border-box;
min-height: 34px;
height: 34px;
margin: 0 0 9px;
}
.acl-picker-options { display: grid; max-height: 270px; overflow-y: auto; gap: 5px; }
.acl-picker-options {
display: grid;
max-height: 270px;
overflow-y: auto;
gap: 5px;
}
.acl-picker-option {
display: flex;
align-items: flex-start;
@@ -12376,9 +12410,23 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
cursor: pointer;
min-width: 0;
}
.acl-picker-option:hover, .acl-picker-option:has(input:focus-visible) { border-color: var(--border-hover); }
.acl-picker-option:has(input:checked) { border-color: var(--pill-live-line); background: var(--nav-selected-bg); }
.acl-picker-option[hidden], .acl-picker-empty[hidden], .acl-picker-limit[hidden] { display: none !important; }
.acl-picker-option:hover,
.acl-picker-option:has(input:focus-visible) {
border-color: var(--border-hover);
}
.acl-picker-option:has(input:checked) {
border-color: var(--pill-live-line);
background: var(--nav-selected-bg);
}
.acl-picker-option[hidden],
.acl-picker-empty[hidden],
.acl-picker-limit[hidden] {
display: none !important;
}
.acl-picker-option input[type=checkbox] {
flex: 0 0 auto;
width: 16px !important;
@@ -12386,12 +12434,42 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
min-height: 16px !important;
margin: 2px 0 0;
}
.acl-picker-option input:disabled { opacity: .35; }
.acl-picker-option:has(input:disabled) { cursor: not-allowed; opacity: .6; }
.acl-picker-option-content { display: grid; flex: 1; min-width: 0; gap: 5px; }
.acl-picker-option-heading { display: flex; flex-wrap: wrap; gap: 5px 9px; align-items: center; }
.acl-picker-option-heading strong { font-size: 12px; color: var(--text); overflow-wrap: anywhere; }
.acl-picker-id { font: 10px var(--mono); color: var(--muted); overflow-wrap: anywhere; }
.acl-picker-option input:disabled {
opacity: .35;
}
.acl-picker-option:has(input:disabled) {
cursor: not-allowed;
opacity: .6;
}
.acl-picker-option-content {
display: grid;
flex: 1;
min-width: 0;
gap: 5px;
}
.acl-picker-option-heading {
display: flex;
flex-wrap: wrap;
gap: 5px 9px;
align-items: center;
}
.acl-picker-option-heading strong {
font-size: 12px;
color: var(--text);
overflow-wrap: anywhere;
}
.acl-picker-id {
font: 10px var(--mono);
color: var(--muted);
overflow-wrap: anywhere;
}
.acl-picker-policy {
font: 10px var(--mono);
line-height: 1.4;
@@ -12401,8 +12479,17 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
color: var(--muted);
white-space: nowrap;
}
.acl-picker-policy.is-deny { border-color: var(--danger-line); color: var(--red); }
.acl-picker-policy.is-allow { border-color: var(--pill-live-line); color: var(--green); }
.acl-picker-policy.is-deny {
border-color: var(--danger-line);
color: var(--red);
}
.acl-picker-policy.is-allow {
border-color: var(--pill-live-line);
color: var(--green);
}
.acl-picker-rule-preview {
display: block;
line-height: 1.45;
@@ -12410,7 +12497,15 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
color: var(--muted);
font-size: 11px;
}
.acl-picker-selected { display: flex; gap: 6px; flex-wrap: wrap; margin: 8px 0 0; min-width: 0; }
.acl-picker-selected {
display: flex;
gap: 6px;
flex-wrap: wrap;
margin: 8px 0 0;
min-width: 0;
}
.acl-picker-tag {
display: inline-flex;
align-items: center;
@@ -12422,7 +12517,12 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
background: var(--nav-selected-bg);
font-size: 11px;
}
.acl-picker-tag > span { overflow-wrap: anywhere; min-width: 0; }
.acl-picker-tag>span {
overflow-wrap: anywhere;
min-width: 0;
}
.acl-picker-tag .acl-picker-remove {
border: none;
border-radius: var(--rp-radius-control, 50%);
@@ -12434,72 +12534,105 @@ html[data-dashboard-density=ultra] #panel-overview .stat-cache-outcomes .cache-m
padding: 0;
cursor: pointer;
}
.acl-picker-tag .acl-picker-remove:hover { background: var(--panel2); color: var(--text); }
.acl-picker-no-selection { font-size: 11px; }
.acl-picker-limit { display: block; padding-top: 7px; }
.acl-stack-warning { margin: 8px 0 0; font-size: 11px; line-height: 1.5; color: var(--notice-text); }
.docker-profile-field { min-width: 0; }
.docker-acl-grid .docker-profile-field { grid-column: span 2; }
.docker-agent-grid .docker-profile-field { grid-column: span 2; }
/* Certificate acceptance is an independent, upper-right security control. */
.docker-service-certificate-bar { display: flex; justify-content: flex-end; margin: 0 0 12px; }
.docker-service-certificate-control {
display: grid;
gap: 5px;
width: min(100%, 510px);
padding: 10px 12px;
border: 1px solid var(--notice-line);
border-radius: 8px;
background: var(--notice-bg);
.acl-picker-tag .acl-picker-remove:hover {
background: var(--panel2);
color: var(--text);
}
.acl-picker-no-selection {
font-size: 11px;
}
.acl-picker-limit {
display: block;
padding-top: 7px;
}
.acl-stack-warning {
margin: 8px 0 0;
font-size: 11px;
line-height: 1.5;
color: var(--notice-text);
}
.docker-profile-field {
min-width: 0;
}
.docker-service-certificate-title { display: flex; align-items: center; gap: 9px; }
.docker-service-certificate-title strong { font-size: 11px; }
.docker-cert-risk-pill[hidden] { display: none; }
.docker-service-certificate-control .docker-field > span:first-child { color: var(--text); }
.docker-service-certificate-control .docker-checkbox-field { gap: 3px; }
.docker-service-certificate-control .docker-checkbox-field .check { font-size: 11px; }
.docker-service-certificate-control .acl-stack-warning { color: var(--notice-text); }
.docker-service-certificate-control .fine[hidden] { display: none; }
.docker-cert-mismatch { flex: 0 0 auto; }
.docker-protocol-panel {
border: 1px solid var(--line);
border-radius: 8px;
background: var(--panel);
padding: 11px 12px;
margin: 10px 0 12px;
min-width: 0;
.docker-acl-grid .docker-profile-field {
grid-column: span 2;
}
.docker-protocol-heading { display: flex; align-items: baseline; flex-wrap: wrap; gap: 5px 12px; margin-bottom: 9px; }
.docker-protocol-heading strong { font-size: 12px; }
.docker-protocol-heading small { font-size: 11px; }
.docker-protocol-options { display: flex; flex-wrap: wrap; gap: 8px; }
.docker-protocol-options > * {
.docker-agent-grid .docker-profile-field {
grid-column: span 2;
}
.docker-service-certificate-bar {
display: flex;
justify-content: flex-end;
}
.docker-protocol-options {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 12px;
}
.docker-protocol-options>* {
display: grid;
align-content: center;
min-width: 130px;
flex: 1 1 145px;
border-radius: 6px;
border-radius: var(--rp-radius-control, 6px);
border: 1px solid var(--line);
background: var(--panel2);
padding: 8px 12px;
min-height: 49px;
box-sizing: border-box;
}
.docker-protocol-fixed { gap: 4px; }
.docker-protocol-fixed strong { font-size: 11px; }
.docker-protocol-fixed small { font-size: 10px; }
.docker-protocol-options .docker-checkbox-field > span:first-child { color: var(--text); font-size: 11px; }
.docker-protocol-options .docker-checkbox-field .vh-check { font-size: 11px; }
@media (max-width: 760px) {
.docker-acl-grid .docker-profile-field, .docker-agent-grid .docker-profile-field { grid-column: auto; }
.docker-service-certificate-control { width: 100%; }
.docker-agent-summary > span, .docker-fingerprint { width: 100%; }
.acl-picker-option-heading { align-items: flex-start; }
.docker-protocol-fixed {
gap: 4px;
}
/* Keep the editable SHA-256 input from expanding narrow settings grids. */
.docker-agent-grid .docker-agent-fingerprint { min-width: 0; width: 100%; box-sizing: border-box; }
.docker-protocol-fixed strong {
font-size: 11px;
}
.docker-protocol-fixed small {
font-size: 10px;
}
.docker-protocol-options .docker-checkbox-field>span:first-child {
color: var(--text);
font-size: 11px;
}
.docker-protocol-options .docker-checkbox-field .vh-check {
font-size: 11px;
}
@media (max-width: 760px) {
.docker-acl-grid .docker-profile-field,
.docker-agent-grid .docker-profile-field {
grid-column: auto;
}
.docker-agent-summary>span,
.docker-fingerprint {
width: 100%;
}
.acl-picker-option-heading {
align-items: flex-start;
}
}
.docker-agent-grid .docker-agent-fingerprint {
min-width: 0;
width: 100%;
box-sizing: border-box;
}