aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib/Crypto/EncryptAll.php
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2023-01-25 11:42:45 +0100
committerJoas Schilling <coding@schilljs.com>2023-03-08 12:15:18 +0100
commit0f7146c65257915b8a831649ff51382e2424d99b (patch)
tree18aadc27a527a396a40e3e36cc3019a384c03b2f /apps/encryption/lib/Crypto/EncryptAll.php
parent80e12cf72608b7c5776f02f04da98d7a5968bc73 (diff)
downloadnextcloud-server-0f7146c65257915b8a831649ff51382e2424d99b.tar.gz
nextcloud-server-0f7146c65257915b8a831649ff51382e2424d99b.zip
Move encrypt-all password email to EmailTemplate
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/encryption/lib/Crypto/EncryptAll.php')
-rw-r--r--apps/encryption/lib/Crypto/EncryptAll.php73
1 files changed, 34 insertions, 39 deletions
diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php
index 1889c557cdc..72d9646f41a 100644
--- a/apps/encryption/lib/Crypto/EncryptAll.php
+++ b/apps/encryption/lib/Crypto/EncryptAll.php
@@ -34,7 +34,10 @@ use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
use OCP\IConfig;
use OCP\IL10N;
+use OCP\IUser;
use OCP\IUserManager;
+use OCP\L10N\IFactory;
+use OCP\Mail\Headers\AutoSubmitted;
use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom;
use Symfony\Component\Console\Helper\ProgressBar;
@@ -73,6 +76,9 @@ class EncryptAll {
/** @var IL10N */
protected $l;
+ /** @var IFactory */
+ protected $l10nFactory;
+
/** @var QuestionHelper */
protected $questionHelper;
@@ -85,18 +91,6 @@ class EncryptAll {
/** @var ISecureRandom */
protected $secureRandom;
- /**
- * @param Setup $userSetup
- * @param IUserManager $userManager
- * @param View $rootView
- * @param KeyManager $keyManager
- * @param Util $util
- * @param IConfig $config
- * @param IMailer $mailer
- * @param IL10N $l
- * @param QuestionHelper $questionHelper
- * @param ISecureRandom $secureRandom
- */
public function __construct(
Setup $userSetup,
IUserManager $userManager,
@@ -106,6 +100,7 @@ class EncryptAll {
IConfig $config,
IMailer $mailer,
IL10N $l,
+ IFactory $l10nFactory,
QuestionHelper $questionHelper,
ISecureRandom $secureRandom
) {
@@ -117,6 +112,7 @@ class EncryptAll {
$this->config = $config;
$this->mailer = $mailer;
$this->l = $l;
+ $this->l10nFactory = $l10nFactory;
$this->questionHelper = $questionHelper;
$this->secureRandom = $secureRandom;
// store one time passwords for the users
@@ -413,6 +409,10 @@ class EncryptAll {
$progress->advance();
if (!empty($password)) {
$recipient = $this->userManager->get($uid);
+ if (!$recipient instanceof IUser) {
+ continue;
+ }
+
$recipientDisplayName = $recipient->getDisplayName();
$to = $recipient->getEMailAddress();
@@ -421,20 +421,33 @@ class EncryptAll {
continue;
}
- $subject = $this->l->t('one-time password for server-side-encryption');
- [$htmlBody, $textBody] = $this->createMailBody($password);
+ $l = $this->l10nFactory->get('encryption', $this->l10nFactory->getUserLanguage($recipient));
+
+ $template = $this->mailer->createEMailTemplate('encryption.encryptAllPassword', [
+ 'user' => $recipient->getUID(),
+ 'password' => $password,
+ ]);
+
+ $template->setSubject($l->t('one-time password for server-side-encryption'));
+ // 'Hey there,<br><br>The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>
+ // Please login to the web interface, go to the section "Basic encryption module" of your personal settings and update your encryption password by entering this password into the "Old log-in password" field and your current login-password.<br><br>'
+ $template->addHeader();
+ $template->addHeading($l->t('Encryption password'));
+ $template->addBodyText(
+ $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.', [htmlspecialchars($password)]),
+ $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password "%s".', $password)
+ );
+ $template->addBodyText(
+ $l->t('Please login to the web interface, go to the "Security" section of your personal settings and update your encryption password by entering this password into the "Old log-in password" field and your current login-password.')
+ );
+ $template->addFooter();
// send it out now
try {
$message = $this->mailer->createMessage();
- $message->setSubject($subject);
$message->setTo([$to => $recipientDisplayName]);
- $message->setHtmlBody($htmlBody);
- $message->setPlainBody($textBody);
- $message->setFrom([
- \OCP\Util::getDefaultEmailAddress('admin-noreply')
- ]);
-
+ $message->useTemplate($template);
+ $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
$this->mailer->send($message);
} catch (\Exception $e) {
$noMail[] = $uid;
@@ -458,22 +471,4 @@ class EncryptAll {
$table->render();
}
}
-
- /**
- * create mail body for plain text and html mail
- *
- * @param string $password one-time encryption password
- * @return array an array of the html mail body and the plain text mail body
- */
- protected function createMailBody($password) {
- $html = new \OC_Template("encryption", "mail", "");
- $html->assign('password', $password);
- $htmlMail = $html->fetchPage();
-
- $plainText = new \OC_Template("encryption", "altmail", "");
- $plainText->assign('password', $password);
- $plainTextMail = $plainText->fetchPage();
-
- return [$htmlMail, $plainTextMail];
- }
}