Skip to content

[stable22] Add Email validation #32475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
May 19, 2022
Merged

[stable22] Add Email validation #32475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add email validation 
Signed-off-by: Anna Larch <[email protected]>
  • Loading branch information
@miaulalala @backportbot-nextcloud
miaulalala authored and backportbot-nextcloud[bot] committed May 18, 2022
commit fd73fc93ca9f0d6bc77136bb91bd8ab15e013f5d
11 changes: 9 additions & 2 deletions apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
$emailAddressesOfDelegates = $delegates->getParts();
foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
$emailAddresses[substr($addressesOfDelegate, 7)] = [];
$delegateEmail = substr($addressesOfDelegate, 7);
if ($delegateEmail !== false && $this->mailer->validateMailAddress($delegateEmail)) {
$emailAddresses[$delegateEmail] = [];
}
}
}

Expand Down Expand Up @@ -344,8 +347,12 @@ private function getEMailAddressOfAttendee(VObject\Property $attendee):?string {
if (!$this->hasAttendeeMailURI($attendee)) {
return null;
}
$attendeeEMail = substr($attendee->getValue(), 7);
if ($attendeeEMail === false || !$this->mailer->validateMailAddress($attendeeEMail)) {
return null;
}

return substr($attendee->getValue(), 7);
return $attendeeEMail;
}

/**
Expand Down
120 changes: 33 additions & 87 deletions apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,99 +240,45 @@ public function testSendWithAttendees(): void {
$message22 = $this->getMessageMock('[email protected]', $template2);
$message23 = $this->getMessageMock('[email protected]', $template2);

$this->mailer->expects($this->at(0))
$this->mailer->expects(self::exactly(2))
->method('createEMailTemplate')
->with('dav.calendarReminder')
->willReturn($template1);

$this->mailer->expects($this->at(1))
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);

$this->mailer->expects($this->at(2))
->method('createMessage')
->with()
->willReturn($message11);
$this->mailer->expects($this->at(3))
->method('send')
->with($message11)
->willReturn([]);
$this->mailer->expects($this->at(4))
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);
$this->mailer->expects($this->at(5))
->method('createMessage')
->with()
->willReturn($message12);
$this->mailer->expects($this->at(6))
->method('send')
->with($message12)
->willReturn([]);

$this->mailer->expects($this->at(7))
->willReturnOnConsecutiveCalls(
$template1,
$template2,
);
$this->mailer->expects($this->atLeastOnce())
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);

$this->mailer->expects($this->at(8))
->method('createMessage')
->with()
->willReturn($message13);
$this->mailer->expects($this->at(9))
->method('send')
->with($message13)
->willReturn([]);

$this->mailer->expects($this->at(10))
->method('validateMailAddress')
->with('invalid')
->willReturn(false);

$this->mailer->expects($this->at(11))
->method('createEMailTemplate')
->with('dav.calendarReminder')
->willReturn($template2);

$this->mailer->expects($this->at(12))
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);

$this->mailer->expects($this->at(13))
->method('createMessage')
->with()
->willReturn($message21);
$this->mailer->expects($this->at(14))
->method('send')
->with($message21)
->willReturn([]);
$this->mailer->expects($this->at(15))
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);
$this->mailer->expects($this->at(16))
->method('createMessage')
->with()
->willReturn($message22);
$this->mailer->expects($this->at(17))
->method('send')
->with($message22)
->willReturn([]);
$this->mailer->expects($this->at(18))
->method('validateMailAddress')
->with('[email protected]')
->willReturn(true);
$this->mailer->expects($this->at(19))
->willReturnMap([
['[email protected]', true],
['[email protected]', true],
['[email protected]', true],
['[email protected]', true],
['[email protected]', true],
['[email protected]', true],
['invalid', false],
]);
$this->mailer->expects($this->exactly(6))
->method('createMessage')
->with()
->willReturn($message23);
$this->mailer->expects($this->at(20))
->willReturnOnConsecutiveCalls(
$message11,
$message12,
$message13,
$message21,
$message22,
$message23,
);
$this->mailer->expects($this->exactly(6))
->method('send')
->with($message23)
->willReturn([]);

->withConsecutive(
[$message11],
[$message12],
[$message13],
[$message21],
[$message22],
[$message23],
)->willReturn([]);
$this->setupURLGeneratorMock(2);

$vcalendar = $this->getAttendeeVCalendar();
Expand Down