Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nextcloud changed stored password handling

Browse source
This commit is contained in:
the-djmaze 2024-03-15 00:53:30 +01:00
parent 56950b4b70
commit 46bd6d4564
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integrations/nextcloud/snappymail/lib/Controller/FetchController.php
View file

@ -103,7 +103,7 @@ class FetchController extends Controller {
$sPass = $_POST['snappymail-password']; $sPass = $_POST['snappymail-password'];
if ('******' !== $sPass) { if ('******' !== $sPass) {
$this->config->setUserValue($sUser, 'snappymail', 'snappymail-password', $this->config->setUserValue($sUser, 'snappymail', 'passphrase',
$sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : ''); $sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : '');
} }
} else { } else {

8
integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
View file

@ -24,15 +24,19 @@ class PersonalSettings implements ISettings
$sEmail = $aRainLoop[0]; $sEmail = $aRainLoop[0];
$this->config->setUserValue($uid, 'snappymail', 'snappymail-email', $sEmail); $this->config->setUserValue($uid, 'snappymail', 'snappymail-email', $sEmail);
if ($aRainLoop[1]) { if ($aRainLoop[1]) {
$this->config->setUserValue($uid, 'snappymail', 'snappymail-password', $this->config->setUserValue($uid, 'snappymail', 'passphrase',
\OCA\SnappyMail\Util\SnappyMailHelper::encodePassword($aRainLoop[1], \md5($sEmail)) \OCA\SnappyMail\Util\SnappyMailHelper::encodePassword($aRainLoop[1], \md5($sEmail))
); );
} }
} }
} }
if ($sPass = $this->config->getUserValue($uid, 'snappymail', 'snappymail-password')) {
$this->config->deleteUserValue($uid, 'snappymail', 'snappymail-password');
$this->config->setUserValue($uid, 'snappymail', 'passphrase', $sPass);
}
$parameters = [ $parameters = [
'snappymail-email' => $sEmail, 'snappymail-email' => $sEmail,
'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-password') ? '******' : '' 'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'passphrase') ? '******' : ''
]; ];
\OCP\Util::addScript('snappymail', 'snappymail'); \OCP\Util::addScript('snappymail', 'snappymail');
return new TemplateResponse('snappymail', 'personal_settings', $parameters, ''); return new TemplateResponse('snappymail', 'personal_settings', $parameters, '');

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

@ -106,7 +106,8 @@ class SnappyMailHelper
// Login failure, reset password to prevent more attempts // Login failure, reset password to prevent more attempts
$sUID = \OC::$server->getUserSession()->getUser()->getUID(); $sUID = \OC::$server->getUserSession()->getUser()->getUID();
\OC::$server->getSession()['snappymail-passphrase'] = ''; \OC::$server->getSession()['snappymail-passphrase'] = '';
\OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'snappymail-password', ''); \OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'passphrase', '');
\SnappyMail\Log::error('Nextcloud', $e->getMessage());
} }
} }
} }
@ -132,11 +133,14 @@ class SnappyMailHelper
// If the user has set credentials for SnappyMail in their personal settings, // If the user has set credentials for SnappyMail in their personal settings,
// this has the first priority. // this has the first priority.
$sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email'); $sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
$sPassword = $config->getUserValue($sUID, 'snappymail', 'snappymail-password'); $sPassword = $config->getUserValue($sUID, 'snappymail', 'passphrase')
?: $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
if ($sEmail && $sPassword) { if ($sEmail && $sPassword) {
$sPassword = static::decodePassword($sPassword, \md5($sEmail)); $sPassword = static::decodePassword($sPassword, \md5($sEmail));
if ($sPassword) { if ($sPassword) {
return [$sUID, $sEmail, $sPassword]; return [$sUID, $sEmail, $sPassword];
} else {
\SnappyMail\Log::debug('Nextcloud', 'decodePassword failed for getUserValue');
} }
} }