feat(node,server): implement certpath validate

Signed-off-by: Tianling Shen <[email protected]>
immortalwrt · Dec 4, 2024 · f82fce5 · f82fce5
1 parent 1d815e1
commit f82fce5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/htdocs/luci-static/resources/homeproxy.js b/htdocs/luci-static/resources/homeproxy.js
@@ -267,6 +267,17 @@ return baseclass.extend({
 		return true;
 	},
 
+	validateCertificatePath: function(rmempty, section_id, value) {
+		if (section_id)
+			if (!value && !rmempty)
+				return _('Expecting: %s').format(_('non-empty value'));
+
+			if (!value.match(/^(\/etc\/homeproxy\/certs\/|\/etc\/acme\/|\/etc\/ssl\/).+$/))
+				return _('Expecting: %s').format('/etc/homeproxy/certs/..., /etc/acme/..., /etc/ssl/...');
+
+		return true;
+	},
+
 	validateUniqueValue: function(uciconfig, ucisection, ucioption, section_id, value) {
 		if (section_id) {
 			if (!value)

diff --git a/htdocs/luci-static/resources/view/homeproxy/node.js b/htdocs/luci-static/resources/view/homeproxy/node.js
@@ -1021,7 +1021,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 		_('The path to the server certificate, in PEM format.'));
 	o.value('/etc/homeproxy/certs/client_ca.pem');
 	o.depends('tls_self_sign', '1');
-	o.rmempty = false;
+	o.validate = L.bind(hp.validateCertificatePath, this, false);
 	o.modalonly = true;
 
 	o = s.option(form.Button, '_upload_cert', _('Upload certificate'),

diff --git a/htdocs/luci-static/resources/view/homeproxy/server.js b/htdocs/luci-static/resources/view/homeproxy/server.js
@@ -745,7 +745,7 @@ return view.extend({
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': '0'});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': '0'});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': null});
-		o.rmempty = false;
+		o.validate = L.bind(hp.validateCertificatePath, this, false);
 		o.modalonly = true;
 
 		o = s.option(form.Button, '_upload_cert', _('Upload certificate'),
@@ -763,7 +763,7 @@ return view.extend({
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': null});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': '0'});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': null});
-		o.rmempty = false;
+		o.validate = L.bind(hp.validateCertificatePath, this, false);
 		o.modalonly = true;
 
 		o = s.option(form.Button, '_upload_key', _('Upload key'),