Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2026-04-11 21:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: migrate User Domains List validation to modular

Browse Source
This commit is contained in:
divocat
2025-10-03 03:00:50 +03:00
parent 327c3d2b68
commit 8f19f31e7a
1 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,35 +385,27 @@ 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
if (!value || value.length === 0) {
const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*(\.[A-Za-z]{2,})?$/; return true
const lines = value.split(/\n/).map(line => line.trim());
let hasValidDomain = false;
for (const line of lines) {
// Skip empty lines
if (!line) continue;
// Extract domain part (before any //)
const domainPart = line.split('//')[0].trim();
// Skip if line is empty after removing comments
if (!domainPart) continue;
// Process each domain in the line (separated by comma or space)
const domains = domainPart.split(/[,\s]+/).map(d => d.trim()).filter(d => d.length > 0);
for (const domain of domains) {
if (!domainRegex.test(domain)) {
return _('Invalid domain format: %s. Enter domain without protocol').format(domain);
}
hasValidDomain = true;
}
} }
if (!hasValidDomain) { const subnets = main.parseValueList(value);
return _('At least one valid domain must be specified. Comments-only content is not allowed.');
if (!subnets.length) {
return _(
'At least one valid domain must be specified. Comments-only content is not allowed.'
);
}
const { valid, results } = main.bulkValidate(subnets, main.validateDomain);
if (!valid) {
const errors = results
.filter(validation => !validation.valid) // Leave only failed validations
.map((validation) => _(`${validation.value}: ${validation.message}`)) // Collect validation errors
return [_('Validation errors:'), ...errors].join('\n');
} }
return true; return true;
@@ -534,13 +526,7 @@ function createConfigSection(section, map, network) {
return true return true
} }
const subnets = value const subnets = main.parseValueList(value);
.split(/\n/) // Split to array by newline separator
.map(line => line.split('//')[0]) // Remove comments
.join(' ') // Build clean string
.split(/[,\s]+/) // Split to subnets array by comma and space
.map(s => s.trim()) // Remove extra spaces
.filter(Boolean);
if (!subnets.length) { if (!subnets.length) {
return _( return _(
@@ -552,8 +538,8 @@ function createConfigSection(section, map, network) {
if (!valid) { if (!valid) {
const errors = results const errors = results
.filter(subnetValidation => !subnetValidation.valid) // Leave only failed validations .filter(validation => !validation.valid) // Leave only failed validations
.map((subnetValidation) => _(`${subnetValidation.value}: ${subnetValidation.message}`)) // Collect validation errors .map((validation) => _(`${validation.value}: ${validation.message}`)) // Collect validation errors
return [_('Validation errors:'), ...errors].join('\n'); return [_('Validation errors:'), ...errors].join('\n');
} }