Merge pull request #363 from Tautve/issue_357

Fixed Issue #357
This commit is contained in:
Willem Wollebrants 2022-10-03 09:50:30 +02:00 committed by GitHub
commit 57a9f68f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -630,6 +630,10 @@ class Validator
*/ */
protected function validateEmailDNS($field, $value) protected function validateEmailDNS($field, $value)
{ {
if (!is_string($value)) {
return false;
}
if ($this->validateEmail($field, $value)) { if ($this->validateEmail($field, $value)) {
$domain = ltrim(stristr($value, '@'), '@') . '.'; $domain = ltrim(stristr($value, '@'), '@') . '.';
if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46')) { if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46')) {
@ -651,6 +655,10 @@ class Validator
*/ */
protected function validateUrl($field, $value) protected function validateUrl($field, $value)
{ {
if (!is_string($value)) {
return false;
}
foreach ($this->validUrlPrefixes as $prefix) { foreach ($this->validUrlPrefixes as $prefix) {
if (strpos($value, $prefix) !== false) { if (strpos($value, $prefix) !== false) {
return filter_var($value, \FILTER_VALIDATE_URL) !== false; return filter_var($value, \FILTER_VALIDATE_URL) !== false;
@ -669,6 +677,10 @@ class Validator
*/ */
protected function validateUrlActive($field, $value) protected function validateUrlActive($field, $value)
{ {
if (!is_string($value)) {
return false;
}
foreach ($this->validUrlPrefixes as $prefix) { foreach ($this->validUrlPrefixes as $prefix) {
if (strpos($value, $prefix) !== false) { if (strpos($value, $prefix) !== false) {
$host = parse_url(strtolower($value), PHP_URL_HOST); $host = parse_url(strtolower($value), PHP_URL_HOST);