feature #12956 [2.7][Validator] Added checkDNS option on URL validator (saro0h)

fabpot · fabpot · commit 2d4a0876c233 · 2015-01-04T19:35:03.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [2.7][Validator] Added checkDNS option on URL validator | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10088 | License | MIT | Doc PR | symfony/symfony-docs#4631 Commits ------- ad2f906 [Validator] Added a check DNS option on URL validator
diff --git a/Constraints/Url.php b/Constraints/Url.php
@@ -24,5 +24,7 @@
 class Url extends Constraint
 {
     public $message = 'This value is not a valid URL.';
+    public $dnsMessage = 'The host could not be resolved.';
     public $protocols = array('http', 'https');
+    public $checkDNS = false;
 }
diff --git a/Constraints/UrlValidator.php b/Constraints/UrlValidator.php
@@ -62,6 +62,18 @@ public function validate($value, Constraint $constraint)
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->addViolation();
+
+            return;
+        }
+
+        if ($constraint->checkDNS) {
+            $host = parse_url($value, PHP_URL_HOST);
+
+            if (!checkdnsrr($host, 'ANY')) {
+                $this->buildViolation($constraint->dnsMessage)
+                   ->setParameter('{{ value }}', $this->formatValue($host))
+                   ->addViolation();
+            }
         }
     }
 }
diff --git a/Resources/translations/validators.en.xlf b/Resources/translations/validators.en.xlf
@@ -302,6 +302,10 @@
                 <source>An empty file is not allowed.</source>
                 <target>An empty file is not allowed.</target>
             </trans-unit>
+            <trans-unit id="79">
+                <source>The host could not be resolved.</source>
+                <target>The host could not be resolved.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/validators.fr.xlf b/Resources/translations/validators.fr.xlf
@@ -302,6 +302,10 @@
                 <source>An empty file is not allowed.</source>
                 <target>Un fichier vide n'est pas autorisé.</target>
             </trans-unit>
+            <trans-unit id="79">
+                <source>The host could not be resolved.</source>
+                <target>Le nom de domaine n'a pas pu être résolu.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,7 @@`
`24`	`24`	`class Url extends Constraint`
`25`	`25`	`{`
`26`	`26`	`public $message = 'This value is not a valid URL.';`
	`27`	`+ public $dnsMessage = 'The host could not be resolved.';`
`27`	`28`	`public $protocols = array('http', 'https');`
	`29`	`+ public $checkDNS = false;`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,18 @@ public function validate($value, Constraint $constraint)`
`62`	`62`	`$this->buildViolation($constraint->message)`
`63`	`63`	`->setParameter('{{ value }}', $this->formatValue($value))`
`64`	`64`	`->addViolation();`
	`65`	`+`
	`66`	`+ return;`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ if ($constraint->checkDNS) {`
	`70`	`+ $host = parse_url($value, PHP_URL_HOST);`
	`71`	`+`
	`72`	`+ if (!checkdnsrr($host, 'ANY')) {`
	`73`	`+ $this->buildViolation($constraint->dnsMessage)`
	`74`	`+ ->setParameter('{{ value }}', $this->formatValue($host))`
	`75`	`+ ->addViolation();`
	`76`	`+ }`
`65`	`77`	`}`
`66`	`78`	`}`
`67`	`79`	`}`