Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-10-28 16:13:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent nextcloud impersonate plugin to login #561

Browse source
This commit is contained in:
the-djmaze 2022-10-31 14:56:42 +01:00
parent 6e4be76664
commit 1dbf2e909f
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
View file

@ -106,9 +106,13 @@ class SnappyMailHelper
\RainLoop\Utils::SetCookie('smadmin', $sToken);
}
}
} else if (!$oActions->getMainAccountFromToken(false)) {
} else {
$aCredentials = SnappyMailHelper::getLoginCredentials();
if ($aCredentials[0] && $aCredentials[1]) {
if ($oActions->getMainAccountFromToken(false)) {
if (!$aCredentials[0] || !$aCredentials[1]) {
$oActions->Logout(true);
}
} else if ($aCredentials[0] && $aCredentials[1]) {
$oActions->Logger()->AddSecret($aCredentials[1]);
$oAccount = $oActions->LoginProcess($aCredentials[0], $aCredentials[1], false);
if ($oAccount) {
@ -143,6 +147,10 @@ class SnappyMailHelper
$sEmail = $config->getUserValue($sUID, 'settings', 'email', '');
$sPassword = \OC::$server->getSession()['snappymail-password'];
}
if (\OC::$server->getSession()['snappymail-email'] != $sEmail) {
$sPassword = '';
}
// If the user has set credentials for SnappyMail in their personal
// settings, override everything before and use those instead.
$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', '');