zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-05-14 08:37:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improved domain validation in CP as well

Browse source
This commit is contained in:
Pinga 2025-02-11 10:44:27 +02:00
parent 8428a05bfb
commit 657373519f
2 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

102
cp/bootstrap/helper.php
View file

@ -211,89 +211,89 @@ function validate_identifier($identifier) {
} }
} }
function isDomainValid(string $domain): bool { function validate_label($domain, $db) {
// Ensure the domain only contains valid characters (letters, numbers, hyphens, and dots) if (!$domain) {
if (!preg_match('/^([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/', $domain)) {
return false;
}
// Split the domain into its labels (subdomains, SLD, etc.)
$labels = explode('.', $domain);
foreach ($labels as $label) {
if (strlen($label) > 63 || empty($label)) { // Labels cannot be empty or exceed 63 chars
return false;
}
}
return true;
}
function validate_label($label, $db) {
if (!$label) {
return 'You must enter a domain name'; return 'You must enter a domain name';
} }
// Ensure input contains only valid domain characters // Ensure domain has at least one dot (.) separating labels
if (!preg_match('/^([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/', $label)) { if (strpos($domain, '.') === false) {
return 'Invalid domain name format: only letters, numbers, dots, and hyphens allowed'; return 'Invalid domain name format: must contain at least one dot (.)';
} }
if (!isDomainValid($label)) { // Split domain into labels (subdomains, SLD, TLD)
return 'Domain label is too long (exceeds 63 characters)'; $labels = explode('.', $domain);
foreach ($labels as $label) {
$len = strlen($label);
// Labels cannot be empty, shorter than 2, or longer than 63 characters
if ($len < 2 || $len > 63) {
return 'Each domain label must be between 2 and 63 characters';
} }
// Ensure domain starts and ends with an alphanumeric character if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]$/', $label)) {
$parts = explode('.', $label); return 'Each domain label must start and end with a letter or number and contain only letters, numbers, or hyphens';
foreach ($parts as $part) { }
if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]$/', $part)) {
return 'Each domain label must start and end with an alphanumeric character'; // Check if it's a Punycode label (IDN)
if (strpos($label, 'xn--') === 0) {
// Ensure valid Punycode structure
if (!preg_match('/^xn--[a-zA-Z0-9-]+$/', $label)) {
return 'Invalid Punycode format';
}
// Convert Punycode to UTF-8
$decoded = idn_to_utf8($label, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
if ($decoded === false || $decoded === '') {
return 'Invalid Punycode conversion';
}
// Ensure decoded label follows normal domain rules
if (!preg_match('/^[\p{L}0-9][\p{L}0-9-]*[\p{L}0-9]$/u', $decoded)) {
return 'IDN must start and end with a letter or number';
}
} else {
// Prevent consecutive or invalid hyphen usage
if (preg_match('/--|\.\./', $label)) {
return 'Domain labels cannot contain consecutive dashes (--) or dots (..)';
}
} }
} }
// Extract domain and TLD // Extract domain and TLD
$parts = extractDomainAndTLD($label); $parts = extractDomainAndTLD($domain);
if (!$parts || empty($parts['domain']) || empty($parts['tld'])) { if (!$parts || empty($parts['domain']) || empty($parts['tld'])) {
return 'Invalid domain structure, unable to parse domain name'; return 'Invalid domain structure, unable to parse domain name';
} }
$tld = "." . $parts['tld']; $tld = "." . $parts['tld'];
if (strlen($parts['domain']) > 63) { // Validate domain length
return 'Total length of your domain must be less than 63 characters'; $domainLength = strlen($parts['domain']);
} if ($domainLength < 2 || $domainLength > 63) {
return 'Domain length must be between 2 and 63 characters';
if (strlen($parts['domain']) < 2) {
return 'Total length of your domain must be greater than 2 characters';
}
if (strpos($label, '.') === false) {
return 'Invalid domain name format, must contain at least one dot (.)';
}
// Ensure no invalid use of hyphens (double dashes, leading/trailing dashes)
if (strpos($parts['domain'], 'xn--') === false && preg_match("/(^-|^\.|-\.|\.-|--|\.\.|-$|\.$)/", $parts['domain'])) {
return 'Domain name cannot contain consecutive dashes (--) unless it is a punycode domain';
} }
// Check if the TLD exists in the domain_tld table // Check if the TLD exists in the domain_tld table
$tldExists = $db->select('SELECT COUNT(*) FROM domain_tld WHERE tld = ?', [$tld]); $tldExists = $db->selectValue('SELECT COUNT(*) FROM domain_tld WHERE tld = ?', [$tld]);
if ($tldExists[0]["COUNT(*)"] == 0) { if (!$tldExists) {
return 'Zone is not supported'; return 'Zone is not supported';
} }
// If domain is an IDN (Punycode), convert it to Unicode // IDN-specific validation (only if the domain contains Punycode)
if (strpos($parts['domain'], 'xn--') === 0) { if (strpos($parts['domain'], 'xn--') === 0) {
$label = idn_to_utf8($parts['domain'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); $label = idn_to_utf8($parts['domain'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
// Fetch the IDN regex for the given TLD (only if it's an IDN) // Fetch the IDN regex for the given TLD
$idnRegex = $db->selectRow('SELECT idn_table FROM domain_tld WHERE tld = ?', [$tld]); $idnRegex = $db->selectValue('SELECT idn_table FROM domain_tld WHERE tld = ?', [$tld]);
if (!$idnRegex) { if (!$idnRegex) {
return 'Failed to fetch domain IDN table'; return 'Failed to fetch domain IDN table';
} }
// Check for invalid characters using fetched regex // Check against IDN regex
if (!preg_match($idnRegex['idn_table'], $label)) { if (!preg_match($idnRegex, $label)) {
return 'Invalid domain name format, please review registry policy about accepted labels'; return 'Invalid domain name format, please review registry policy about accepted labels';
} }
} }

2
epp/src/helpers.php
View file

@ -203,7 +203,7 @@ function validate_label($domain, $pdo) {
} }
if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]$/', $label)) { if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]$/', $label)) {
return 'Each domain label must start and end with an alphanumeric character'; return 'Each domain label must start and end with a letter or number and contain only letters, numbers, or hyphens';
} }
// Check if it's a Punycode label (IDN) // Check if it's a Punycode label (IDN)