YGGverse/YGGtracker
1
0
Fork 0
mirror of https://github.com/YGGverse/YGGtracker.git synced 2025-01-11 15:37:57 +00:00
Code Issues Projects Releases Wiki Activity

fix url/host validation, remove lib dependencies

Browse Source
This commit is contained in:
ghost 2023-09-16 01:51:04 +03:00
parent 521a8eade8
commit 8586d713ef
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/library/valid.php
View File

@ -15,6 +15,19 @@ class Valid
return false; return false;
} }
if (!filter_var(str_replace(['[',']'], false, $value), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
{
array_push(
$error,
sprintf(
_('Host of "%s" not supported'),
$value
)
);
return false;
}
if (!preg_match(YGGDRASIL_HOST_REGEX, str_replace(['[',']'], false, $value))) if (!preg_match(YGGDRASIL_HOST_REGEX, str_replace(['[',']'], false, $value)))
{ {
array_push( array_push(
@ -44,7 +57,7 @@ class Valid
return false; return false;
} }
if (!$url = Yggverse\Parser\Url::parse($value)) if (!filter_var($value, FILTER_VALIDATE_URL))
{ {
array_push( array_push(
$error, $error,
@ -57,12 +70,12 @@ class Valid
return false; return false;
} }
if (empty($url->host->name)) if (!$host = parse_url($value, PHP_URL_HOST))
{ {
array_push( array_push(
$error, $error,
sprintf( sprintf(
_('Could not init host name for URL "%s"'), _('Could not init host for URL "%s"'),
$value $value
) )
); );
@ -70,14 +83,14 @@ class Valid
return false; return false;
} }
if (!self::host($url->host->name, $error)) if (!self::host($host, $error))
{ {
array_push( array_push(
$error, $error,
sprintf( sprintf(
_('URL host "%s" not supported'), _('URL "%s" has not supported host "%s"'),
$value, $value,
$url->host->name $host,
) )
); );