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

Nextcloud use RainLoop settings #898

Browse source
This commit is contained in:
the-djmaze 2023-02-01 21:09:18 +01:00
parent 094609102d
commit 8cf8823d56
2 changed files with 72 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
<?php <?php
namespace OCA\SnappyMail\Settings; namespace OCA\SnappyMail\Settings;
use OCA\SnappyMail\Util\SnappyMailHelper;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig; use OCP\IConfig;
use OCP\Settings\ISettings; use OCP\Settings\ISettings;
@ -17,8 +19,23 @@ class PersonalSettings implements ISettings
public function getForm() public function getForm()
{ {
$uid = \OC::$server->getUserSession()->getUser()->getUID(); $uid = \OC::$server->getUserSession()->getUser()->getUID();
$sEmail = $this->config->getUserValue($uid, 'snappymail', 'snappymail-email');
if (!$sEmail) {
$sEmail = $this->config->getUserValue($uid, 'rainloop', 'rainloop-email');
if ($sEmail) {
$this->config->setUserValue($uid, 'rainloop', 'rainloop-email'. $sEmail);
$sPassword = $this->config->getUserValue($uid, 'rainloop', 'rainloop-password');
if ($sPassword) {
require_once \dirname(__DIR__) . '/Util/SnappyMailHelper.php';
$sPassword = SnappyMailHelper::decodeRainLoopPassword($sPassword, md5($sEmail));
}
if ($sPassword) {
$this->config->setUserValue($uid, 'snappymail', 'snappymail-password', SnappyMailHelper::encodePassword($sPassword, \md5($sEmail)));
}
}
}
$parameters = [ $parameters = [
'snappymail-email' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-email'), 'snappymail-email' => $sEmail,
'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-password') ? '******' : '' 'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-password') ? '******' : ''
]; ];
\OCP\Util::addScript('snappymail', 'snappymail'); \OCP\Util::addScript('snappymail', 'snappymail');

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

@ -106,7 +106,7 @@ class SnappyMailHelper
$sEmail = $sUID; $sEmail = $sUID;
$sPassword = $ocSession['snappymail-password']; $sPassword = $ocSession['snappymail-password'];
} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) { } else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
$sEmail = $config->getUserValue($sUID, 'settings', 'email', ''); $sEmail = $config->getUserValue($sUID, 'settings', 'email');
$sPassword = $ocSession['snappymail-password']; $sPassword = $ocSession['snappymail-password'];
} }
if ($sPassword) { if ($sPassword) {
@ -116,13 +116,24 @@ class SnappyMailHelper
// If the user has set credentials for SnappyMail in their personal // If the user has set credentials for SnappyMail in their personal
// settings, override everything before and use those instead. // settings, override everything before and use those instead.
$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', ''); $sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
if ($sCustomEmail) { if ($sCustomEmail) {
$sEmail = $sCustomEmail; $sEmail = $sCustomEmail;
$sPassword = $config->getUserValue($sUID, 'snappymail', 'snappymail-password', ''); $sPassword = $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
if ($sPassword) { if ($sPassword) {
$sPassword = static::decodePassword($sPassword, \md5($sEmail)); $sPassword = static::decodePassword($sPassword, \md5($sEmail));
} }
} else if ($sCustomEmail = $config->getUserValue($sUID, 'rainloop', 'rainloop-email')) {
$sEmail = $sCustomEmail;
$this->config->setUserValue($sUser, 'snappymail', 'snappymail-email', $sEmail);
$sPassword = $config->getUserValue($sUID, 'rainloop', 'rainloop-password', '');
if ($sPassword) {
$sPassword = static::decodeRainLoopPassword($sPassword, md5($sEmail));
}
if ($sPassword) {
$this->config->setUserValue($sUser, 'snappymail', 'snappymail-password', static::encodePassword($sPassword, \md5($sEmail)));
}
} }
return [$sUID, $sEmail, $sPassword ?: '']; return [$sUID, $sEmail, $sPassword ?: ''];
} }
@ -212,4 +223,44 @@ class SnappyMailHelper
return $result; return $result;
} }
/**
* @param string $sPassword
* @param string $sSalt
*
* @return string
*/
public static function decodeRainLoopPassword($sPassword, $sSalt)
{
$method = 'AES-256-CBC';
if (\function_exists('openssl_encrypt') &&
\function_exists('openssl_decrypt') &&
\function_exists('openssl_random_pseudo_bytes') &&
\function_exists('openssl_cipher_iv_length') &&
\function_exists('openssl_get_cipher_methods') &&
\defined('OPENSSL_RAW_DATA') && \defined('OPENSSL_ZERO_PADDING') &&
\in_array($method, openssl_get_cipher_methods())
) {
$sLine = base64_decode(trim($sPassword));
$aParts = explode('|', $sLine, 2);
if (is_array($aParts) && !empty($aParts[0]) && !empty($aParts[1])) {
$sData = @base64_decode($aParts[0]);
$iv = @base64_decode($aParts[1]);
return @base64_decode(trim(
@openssl_decrypt($sData, $method, md5($sSalt), OPENSSL_RAW_DATA, $iv)
));
}
}
if (\function_exists('mcrypt_encrypt') &&
\function_exists('mcrypt_decrypt') &&
\defined('MCRYPT_RIJNDAEL_256') &&
\defined('MCRYPT_MODE_ECB')
) {
return @base64_decode(trim(
@mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_decode(trim($sPassword)), MCRYPT_MODE_ECB)
));
}
return @base64_decode(trim($sPassword));
}
} }