paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2941 from patschi/domain-name-fix 

Make is_valid_domain_name more strict
master
André Peters 2019-09-19 15:03:51 +02:00 committed by GitHub
parent b5d169cf90 6b2f5a30d2
commit 0dbc03a416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/inc/functions.inc.php
View File

@ -709,14 +709,14 @@ function user_get_alias_details($username) {
} }
return $data; return $data;
} }
function is_valid_domain_name($domain_name) { function is_valid_domain_name($domain_name) {
if (empty($domain_name)) { if (empty($domain_name)) {
return false; return false;
} }
$domain_name = idn_to_ascii($domain_name, 0, INTL_IDNA_VARIANT_UTS46); $domain_name = idn_to_ascii($domain_name, 0, INTL_IDNA_VARIANT_UTS46);
return (preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name) return (preg_match("/^([a-z\d](-*[a-z\d])*)\.(([a-z\d](-*[a-z\d])*))*$/i", $domain_name)
&& preg_match("/^.{1,253}$/", $domain_name) && preg_match("/^.{1,253}$/", $domain_name)
&& preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name)); && preg_match("/^[^\.]{1,63}\.([^\.]{1,63})*$/", $domain_name));
} }
function set_tfa($_data) { function set_tfa($_data) {
global $lang; global $lang;