Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-24 03:12:46 +01:00
Code Issues Releases Wiki Activity

Improve email validation: do not allow @unknown emails - closes #3101

Browse Source
This commit is contained in:
FreeScout 2023-06-13 23:18:26 -07:00
parent 2d4e4e71ab
commit 6cb39bd6ee
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/FetchEmails.php
View File

@ -267,7 +267,8 @@ class FetchEmails extends Command
// From - $from is the plain text email.
$from = $message->getReplyTo();
if (!$from) {
if (!$from || !$this->formatEmailList($from)) {
$from = $message->getFrom();
}
// https://github.com/freescout-helpdesk/freescout/issues/2833
@ -280,12 +281,15 @@ class FetchEmails extends Command
}
}*/
if ($from) {
$from = $this->formatEmailList($from);
}
if (!$from) {
$this->logError('From is empty');
$this->setSeen($message, $mailbox);
return;
} else {
$from = $this->formatEmailList($from);
$from = $from[0];
}

3
app/Email.php
View File

@ -55,6 +55,9 @@ class Email extends Model
if (!preg_match('/^.+@.+$/', $email ?? '')) {
return false;
}
if (preg_match('/^.+@unknown$/', $email ?? '')) {
return false;
}
$email = filter_var($email, FILTER_SANITIZE_EMAIL);
$email = mb_strtolower($email, 'UTF-8');
// Remove trailing dots.