Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-17 21:18:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow .tld for user_domains_text & user_domains

Browse Source
This commit is contained in:
divocat
2025-10-07 19:19:10 +03:00
parent ae4a3781e6
commit 72b2a34af9
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,7 +455,7 @@ function createConfigSection(section) {
return true;
}
const validation = main.validateDomain(value);
const validation = main.validateDomain(value, true);
if (validation.valid) {
return true;
@@ -493,7 +493,7 @@ function createConfigSection(section) {
);
}
const { valid, results } = main.bulkValidate(domains, main.validateDomain);
const { valid, results } = main.bulkValidate(domains, row => main.validateDomain(row, true));
if (!valid) {
const errors = results

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

@@ -14,8 +14,14 @@ function validateIPV4(ip) {
}
// src/validators/validateDomain.ts
function validateDomain(domain) {
function validateDomain(domain, allowDotTLD = false) {
const domainRegex = /^(?=.{1,253}(?:\/|$))(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+(?:[a-zA-Z]{2,}|xn--[a-zA-Z0-9-]{1,59}[a-zA-Z0-9])(?:\/[^\s]*)?$/;
if (allowDotTLD) {
const dotTLD = /^\.[a-zA-Z]{2,}$/;
if (dotTLD.test(domain)) {
return { valid: true, message: _("Valid") };
}
}
if (!domainRegex.test(domain)) {
return { valid: false, message: _("Invalid domain address") };
}