diff --git a/apps/files_sharing/lib/SharesReminderJob.php b/apps/files_sharing/lib/SharesReminderJob.php index 7f7cec4047d34..6019a0abd2a62 100644 --- a/apps/files_sharing/lib/SharesReminderJob.php +++ b/apps/files_sharing/lib/SharesReminderJob.php @@ -23,6 +23,7 @@ use OCP\IUserManager; use OCP\L10N\IFactory; use OCP\Mail\EMailDetails; +use OCP\Mail\Headers\AutoSubmitted; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Share\Exceptions\ShareNotFound; @@ -270,6 +271,7 @@ private function sendReminder(array $reminderInfo): void { $message->setFrom($from); $message->setTo([$reminderInfo['email']]); $message->useTemplate($emailTemplate); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); $errorText = "Sending email with share reminder to $reminderInfo[email] failed."; try { $failedRecipients = $this->mailer->send($message); diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php index af36d9f97e27d..4710a5e458b1a 100644 --- a/apps/settings/lib/Hooks.php +++ b/apps/settings/lib/Hooks.php @@ -23,6 +23,7 @@ use OCP\L10N\IFactory; use OCP\Mail\EMailDetails; use OCP\Mail\IEMailTemplate; +use OCP\Mail\Headers\AutoSubmitted; use OCP\Mail\IMailer; use OCP\User\Events\PasswordUpdatedEvent; use OCP\User\Events\UserChangedEvent; @@ -119,6 +120,7 @@ public function onChangePassword(PasswordUpdatedEvent $handle): void { $message = $this->mailer->createMessage(); $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]); $message->useTemplate($template); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); $this->mailer->send($message); } } @@ -199,6 +201,7 @@ public function onChangeEmail(UserChangedEvent $handle): void { $message = $this->mailer->createMessage(); $message->setTo([$oldMailAddress => $user->getDisplayName()]); $message->useTemplate($template); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); $this->mailer->send($message); } } diff --git a/core/BackgroundJobs/CheckCodeIntegrityJob.php b/core/BackgroundJobs/CheckCodeIntegrityJob.php index fbe8b375e9fa0..95d2eef775154 100644 --- a/core/BackgroundJobs/CheckCodeIntegrityJob.php +++ b/core/BackgroundJobs/CheckCodeIntegrityJob.php @@ -21,6 +21,7 @@ use OCP\IURLGenerator; use OCP\IUser; use OCP\L10N\IFactory; +use OCP\Mail\Headers\AutoSubmitted; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Notification\IManager as INotificationManager; @@ -208,6 +209,7 @@ private function sendMail(IUser $admin, array $summary): void { $message = $this->mailer->createMessage(); $message->setTo([$email => $admin->getDisplayName()]); $message->useTemplate($template); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); try { $this->mailer->send($message); diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index 6c53060cd0a3b..1f98778ee39f5 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -38,6 +38,7 @@ use OCP\IUser; use OCP\IUserManager; use OCP\Log\Audit\CriticalActionPerformedEvent; +use OCP\Mail\Headers\AutoSubmitted; use OCP\Mail\IMailer; use OCP\PreConditionNotMetException; use OCP\Security\VerificationToken\InvalidTokenException; @@ -279,6 +280,7 @@ protected function sendEmail(string $input): void { $message->setTo([$email => $user->getDisplayName()]); $message->setFrom([$this->defaultMailAddress => $this->defaults->getName()]); $message->useTemplate($emailTemplate); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); $this->mailer->send($message); } catch (Exception $e) { // Log the exception and continue diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 04008cb3d7069..7289aa91acd72 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -1,5 +1,6 @@ setTo([$email => $user->getDisplayName()]); $message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]); $message->useTemplate($emailTemplate); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); $this->mailer->send($message); } catch (Exception $e) { // Log the exception and continue @@ -792,6 +795,9 @@ private function sanitizePropertyFediverse(IAccountProperty $property): void { if (is_resource($data)) { $data = stream_get_contents($data); } + if ($data === false) { + throw new InvalidArgumentException(); + } $decoded = json_decode($data, true); // ensure the username is the same the user passed // in this case we can assume this is a valid fediverse server and account diff --git a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php index a797b1251f3b1..64e408c7478ac 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php @@ -19,6 +19,7 @@ use OCP\IUser; use OCP\IUserManager; use OCP\L10N\IFactory as IL10nFactory; +use OCP\Mail\Headers\AutoSubmitted; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Mail\IMessage; @@ -117,6 +118,7 @@ private function getWipingStartedMessage(RemoteWipeStarted $event, IUser $user): $emailTemplate->addFooter(); $message->setTo([$user->getEMailAddress()]); $message->useTemplate($emailTemplate); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); return $message; } @@ -148,6 +150,7 @@ private function getWipingFinishedMessage(RemoteWipeFinished $event, IUser $user $emailTemplate->addFooter(); $message->setTo([$user->getEMailAddress()]); $message->useTemplate($emailTemplate); + $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED); return $message; }