diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch kmohrf/ticket_2827_validator_mail_A_RR_DNS_hostcheck (PR #3799) 

Commits
-------

f617e02 [Validator] added less-strict email host verification

Discussion
----------

[Validator] added less-strict email host verification

uhhhhh, my first pull request :>. uhm... tell me if i did something wrong :)

#### Request info
Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes... well,not really (i guess master branch is not passing - at least i didnt broke the email test)
Fixes the following tickets: #2827

#### Description
New checkHost attribute in email constraint will make the validator check for only one of MX, A or AAAA DNS resource records to verify it as a valid email address.
This commit is contained in:
Fabien Potencier 2012-04-11 14:41:31 +02:00
parent 3d6575e152 f617e02a96
commit 3469713d90
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Component/Validator/Constraints/Email.php
View File

@ -22,4 +22,5 @@ class Email extends Constraint
{
public $message = 'This value is not a valid email address';
public $checkMX = false;
public $checkHost = false;
}

18
src/Symfony/Component/Validator/Constraints/EmailValidator.php
View File

@ -51,9 +51,11 @@ class EmailValidator extends ConstraintValidator
$valid = false;
}
// Check MX records
// Check for host DNS resource records
if ($valid && $constraint->checkMX) {
$valid = $this->checkMX($host);
} else if ($valid && $constraint->checkHost) {
$valid = $this->checkHost($host);
}
}
@ -69,7 +71,7 @@ class EmailValidator extends ConstraintValidator
/**
* Check DNS Records for MX type.
*
* @param string $host Host name
* @param string $host Hostname
*
* @return Boolean
*/
@ -77,4 +79,16 @@ class EmailValidator extends ConstraintValidator
{
return checkdnsrr($host, 'MX');
}
/**
* Check if one of MX, A or AAAA DNS RR exists.
*
* @param string $host Hostname
*
* @return Boolean
*/
private function checkHost($host)
{
return $this->checkMX($host) || (checkdnsrr($host, "A") || checkdnsrr($host, "AAAA"));
}
}