luci-app-homeproxy: sync mainline

Signed-off-by: Tianling Shen <[email protected]>
immortalwrt · Dec 15, 2024 · 55d4b68 · 55d4b68
1 parent d94f364
commit 55d4b68
Show file tree

Hide file tree

Showing 13 changed files with 10,023 additions and 3,693 deletions.
diff --git a/applications/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js b/applications/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
@@ -1050,9 +1050,19 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 		o.default = o.disabled;
 		o.modalonly = true;
 
-		o = s.option(form.DynamicList, 'tls_ech_config', _('ECH config'));
+		o = s.option(form.Value, 'tls_ech_config_path', _('ECH config path'),
+			_('The path to the ECH config, in PEM format. If empty, load from DNS will be attempted.'));
+		o.value('/etc/homeproxy/certs/client_ech_conf.pem');
 		o.depends('tls_ech', '1');
 		o.modalonly = true;
+
+		o = s.option(form.Button, '_upload_ech_config', _('Upload ECH config'),
+			_('<strong>Save your configuration before uploading files!</strong>'));
+		o.inputstyle = 'action';
+		o.inputtitle = _('Upload...');
+		o.depends({'tls_ech': '1', 'tls_ech_config_path': '/etc/homeproxy/certs/client_ech_conf.pem'});
+		o.onclick = L.bind(hp.uploadCertificate, this, _('ECH config'), 'client_ech_conf');
+		o.modalonly = true;
 	}
 
 	if (features.with_utls) {