Skip to content

[Validator] check for empty host when calling checkdnsrr() #22109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

[Validator] check for empty host when calling checkdnsrr() #22109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
74629a4
[Validator] Allow checkMX() to return false when $host is empty
Mar 22, 2017
b7f6db6
Add empty check on host in other methods + add unit tests
Mar 23, 2017
af3b0d9
Remove malformed EmailValidatorTest + Update UrlValidator test
Mar 23, 2017
fd9843a
fix coding standard to comply with fabbot
Mar 23, 2017
61e2439
Use LF line separator
Mar 23, 2017
1683fee
Move empty condition in return statement
Mar 23, 2017
00f8e7b
Add a test case to prevent future regressions
Mar 23, 2017
6a919dd
Remove unnecessary parentheses
Mar 23, 2017
628c2d8
Switch to `is_string` native method
Mar 24, 2017
794f63d
remove non relevant test case
Mar 24, 2017
756f9ce
Switch to `empty` native function to check emptiness
Mar 24, 2017
b6f471a
Add a test to prevent future regressions
Mar 24, 2017
7defce7
rename dataset provider
Mar 24, 2017
c9b4613
cast substr result to string and remove empty function use
Mar 24, 2017
67e1dcc
update dataProvider function name
Mar 24, 2017
bb05115
move provider after test
Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Symfony/Component/Validator/Constraints/EmailValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function validate($value, Constraint $constraint)
return;
}

$host = substr($value, strrpos($value, '@') + 1);
$host = (string) substr($value, strrpos($value, '@') + 1);

// Check for host DNS resource records
if ($constraint->checkMX) {
Expand Down Expand Up @@ -118,7 +118,7 @@ public function validate($value, Constraint $constraint)
*/
private function checkMX($host)
{
return checkdnsrr($host, 'MX');
return '' !== $host && checkdnsrr($host, 'MX');
}

/**
Expand All @@ -130,6 +130,6 @@ private function checkMX($host)
*/
private function checkHost($host)
{
return $this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA'));
return '' !== $host && ($this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA')));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Constraints/UrlValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->checkDNS) {
$host = parse_url($value, PHP_URL_HOST);

if (!checkdnsrr($host, 'ANY')) {
if (!is_string($host) || !checkdnsrr($host, 'ANY')) {
$this->context->buildViolation($constraint->dnsMessage)
->setParameter('{{ value }}', $this->formatValue($host))
->setCode(Url::INVALID_URL_ERROR)
Expand Down
28 changes: 28 additions & 0 deletions src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,32 @@ public function testHostnameIsProperlyParsed()

$this->assertNoViolation();
}

/**
* @dataProvider provideCheckTypes
*/
public function testEmptyHostIsNotValid($checkType, $violation)
{
$this->validator->validate(
'foo@bar.fr@',
new Email(array(
'message' => 'myMessage',
$checkType => true,
))
);

$this
->buildViolation('myMessage')
->setParameter('{{ value }}', '"foo@bar.fr@"')
->setCode($violation)
->assertRaised();
}

public function provideCheckTypes()
{
return array(
array('checkMX', Email::MX_CHECK_FAILED_ERROR),
array('checkHost', Email::HOST_CHECK_FAILED_ERROR),
);
}
}
1 change: 1 addition & 0 deletions src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ public function getInvalidUrls()
array('http://example.com/exploit.html?<script>alert(1);</script>'),
array('http://example.com/exploit.html?hel lo'),
array('http://example.com/exploit.html?not_a%hex'),
array('http://'),
);
}

Expand Down