Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-10 13:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: update domain validation regex to allow single-level domains

Browse Source
This commit is contained in:
Ivan K
2025-02-21 11:47:14 +03:00
parent 89737efcbc
commit a32a5c600b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js
View File

@@ -263,9 +263,9 @@ function createConfigSection(section, map, network) {
o.ucisection = s.section; o.ucisection = s.section;
o.validate = function (section_id, value) { o.validate = function (section_id, value) {
if (!value || value.length === 0) return true; if (!value || value.length === 0) return true;
const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/; const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*(\.[A-Za-z]{2,})?$/;
if (!domainRegex.test(value)) { if (!domainRegex.test(value)) {
return _('Invalid domain format. Enter domain without protocol (example: sub.example.com)'); return _('Invalid domain format. Enter domain without protocol (example: sub.example.com or ru)');
} }
return true; return true;
}; };
@@ -279,7 +279,7 @@ function createConfigSection(section, map, network) {
o.validate = function (section_id, value) { o.validate = function (section_id, value) {
if (!value || value.length === 0) return true; if (!value || value.length === 0) return true;
const domains = value.split(/[,\s\n]/).map(d => d.trim()).filter(d => d.length > 0); const domains = value.split(/[,\s\n]/).map(d => d.trim()).filter(d => d.length > 0);
const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/; const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*(\.[A-Za-z]{2,})?$/;
for (const domain of domains) { for (const domain of domains) {
if (!domainRegex.test(domain)) return _('Invalid domain format: %s. Enter domain without protocol').format(domain); if (!domainRegex.test(domain)) return _('Invalid domain format: %s. Enter domain without protocol').format(domain);
} }