TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve the validate_email function

Browse Source 
The validate_email function relied on doing an actual domain lookup (on
supported platforms) to validate the domain of the email address. This
does not work too well in testing environments where we may not want to
spam the DNS system, if it at all is available.

Apart from the the function did very little to actually verify that it
was a valid email address.

This patch tries to change that by usng a somewhat stricted regex based
validation. While this may not be perfect, it should be good enough in
the vast majority of cases. For platforms where no validation was
performed with the old version, it will at least be an improvement.

Also, it allows testing without having an external network connection.

Also clarify the doc comment, that it does not actually try to resolve
the email address, just the domain.
This commit is contained in:
Harald Eilertsen
2024-01-08 11:16:45 +01:00
parent 52ea2fa33e
commit 403539919a
2 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/network.php
View File

@@ -591,23 +591,30 @@ function validate_url(&$url) {
}
/**
* @brief Checks that email is an actual resolvable internet address.
* @brief Checks that email is valid, and that the domain resolves.
*
* @param string $addr
* @return boolean
* Note: This does not try to check that the actual email address will resolve,
* only the domain!
*
* @param string $addr The email address to validate.
* @return boolean True if email is valid, false otherwise.
*/
function validate_email($addr) {
function validate_email(string $addr): bool {
if(get_config('system', 'disable_email_validation'))
return true;
if(! strpos($addr, '@'))
return false;
$matches = array();
$result = preg_match(
'/^[A-Z0-9._%-]+@([A-Z0-9.-]+\.[A-Z0-9-]{2,})$/i',
punify($addr),
$matches);
$h = substr($addr, strpos($addr, '@') + 1);
if(($h) && z_dns_check($h, true)) {
return true;
if($result) {
$domain = $matches[1];
if(($domain) && z_dns_check($domain, true)) {
return true;
}
}
return false;