Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2026-01-31 14:50:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: migrate some validation places of config sections to modular

Browse Source
This commit is contained in:
divocat
2025-10-02 21:57:40 +03:00
parent 294cb21e91
commit 14eec8e600
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,18 +254,13 @@ function createConfigSection(section, map, network) {
o.depends('domain_resolver_enabled', '1'); o.depends('domain_resolver_enabled', '1');
o.ucisection = s.section; o.ucisection = s.section;
o.validate = function (section_id, value) { o.validate = function (section_id, value) {
if (!value) { const validation = main.validateDNS(value);
return _('DNS server address cannot be empty');
if (validation.valid) {
return true;
} }
const ipRegex = /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}(:[0-9]{1,5})?$/; return _(validation.message)
const domainRegex = /^(?:https:\/\/)?([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/[^?#\s]*)?$/;
if (!ipRegex.test(value) && !domainRegex.test(value)) {
return _('Invalid DNS server format. Examples: 8.8.8.8 or dns.example.com or dns.example.com/nicedns for DoH');
}
return true;
}; };
o = s.taboption('basic', form.Flag, 'community_lists_enabled', _('Community Lists')); o = s.taboption('basic', form.Flag, 'community_lists_enabled', _('Community Lists'));
@@ -349,12 +344,18 @@ function createConfigSection(section, map, network) {
o.rmempty = false; o.rmempty = false;
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; // Optional
const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*(\.[A-Za-z]{2,})?$/; if (!value || value.length === 0) {
if (!domainRegex.test(value)) { return true
return _('Invalid domain format. Enter domain without protocol (example: sub.example.com or ru)');
} }
return true;
const validation = main.validateDomain(value);
if (validation.valid) {
return true;
}
return _(validation.message)
}; };
o = s.taboption('basic', form.TextValue, 'user_domains_text', _('User Domains List'), _('Enter domain names separated by comma, space or newline. You can add comments after //')); o = s.taboption('basic', form.TextValue, 'user_domains_text', _('User Domains List'), _('Enter domain names separated by comma, space or newline. You can add comments after //'));
@@ -433,7 +434,7 @@ function createConfigSection(section, map, network) {
return true return true
} }
const validation = main.validateUrl(url); const validation = main.validateUrl(value);
if (validation.valid) { if (validation.valid) {
return true; return true;
@@ -567,7 +568,7 @@ function createConfigSection(section, map, network) {
return true return true
} }
const validation = main.validateUrl(url); const validation = main.validateUrl(value);
if (validation.valid) { if (validation.valid) {
return true; return true;
@@ -587,15 +588,18 @@ function createConfigSection(section, map, network) {
o.rmempty = false; o.rmempty = false;
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; // Optional
const ipRegex = /^(\d{1,3}\.){3}\d{1,3}$/; if (!value || value.length === 0) {
if (!ipRegex.test(value)) return _('Invalid IP format. Use format: X.X.X.X (like 192.168.1.1)'); return true
const ipParts = value.split('.');
for (const part of ipParts) {
const num = parseInt(part);
if (num < 0 || num > 255) return _('IP address parts must be between 0 and 255');
} }
return true;
const validation = main.validateIPV4(value);
if (validation.valid) {
return true;
}
return _(validation.message)
}; };
} }