Merge branch 'master' of https://github.com/cm-schl/snappymail

dev/Common/Cache.js

@@ -62,7 +62,7 @@ export const
 	 * @returns {?FolderModel}
 	 */
 	getFolderFromCacheList = folderFullName =>
-		FOLDERS_CACHE[folderFullName] ? FOLDERS_CACHE[folderFullName] : null,
+		FOLDERS_CACHE[folderFullName] || null,
 
 	/**
 	 * @param {string} folderFullName

dev/Common/Folders.js

@@ -9,7 +9,7 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { getNotification } from 'Common/Translator';
-import { Settings,  } from 'Common/Globals';
+import { Settings } from 'Common/Globals';
 import { serverRequest } from 'Common/Links';
 
 import Remote from 'Remote/User/Fetch';
@@ -27,37 +27,6 @@ sortFolders = folders => {
 	}
 },
 
-/**
- * @param {?Function} fCallback
- * @param {string} folder
- * @param {Array=} list = []
- */
-fetchFolderInformation = (fCallback, folder, list = []) => {
-	let fetch = !arrayLength(list);
-	const uids = [],
-		folderFromCache = getFolderFromCacheList(folder);
-
-	if (!fetch) {
-		list.forEach(messageListItem => {
-			MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
-			messageListItem.threads.forEach(uid => {
-				MessageFlagsCache.getFor(folder, uid) || uids.push(uid);
-			});
-		});
-		fetch = uids.length;
-	}
-
-	if (fetch) {
-		Remote.request('FolderInformation', fCallback, {
-			Folder: folder,
-			FlagsUids: uids,
-			UidNext: folderFromCache?.uidNext || 0 // Used to check for new messages
-		});
-	} else if (SettingsUserStore.useThreads()) {
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
-	}
-},
-
 /**
  * @param {Array=} aDisabled
  * @param {Array=} aHeaderLines
@@ -127,8 +96,22 @@ refreshFoldersInterval = 300000,
  */
 folderInformation = (folder, list) => {
 	if (folder?.trim()) {
-		fetchFolderInformation(
+		let fetch = !arrayLength(list);
-			(iError, data) => {
+		const uids = [],
+			folderFromCache = getFolderFromCacheList(folder);
+
+		if (!fetch) {
+			list.forEach(messageListItem => {
+				MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
+				messageListItem.threads.forEach(uid => {
+					MessageFlagsCache.getFor(folder, uid) || uids.push(uid);
+				});
+			});
+			fetch = uids.length;
+		}
+
+		if (fetch) {
+			Remote.request('FolderInformation', (iError, data) => {
 				if (!iError && data.Result) {
 					const result = data.Result,
 						folderFromCache = getFolderFromCacheList(result.Folder);
@@ -159,15 +142,20 @@ folderInformation = (folder, list) => {
 							if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
 							} else if (getFolderInboxName() === folderFromCache.fullName) {
-								Remote.messageList(null, {Folder: getFolderInboxName()}, true);
+//								Remote.messageList(null, {folder: getFolderFromCacheList(getFolderInboxName())}, true);
+								Remote.messageList(null, {folder: getFolderInboxName()}, true);
 							}
 						}
 					}
 				}
-			},
+			}, {
-			folder,
+				Folder: folder,
-			list
+				FlagsUids: uids,
-		);
+				UidNext: folderFromCache?.uidNext || 0 // Used to check for new messages
+			});
+		} else if (SettingsUserStore.useThreads()) {
+			MessagelistUserStore.reloadFlagsAndCachedMessage();
+		}
 	}
 },
 

dev/Remote/AbstractFetch.js

@@ -130,11 +130,6 @@ export class AbstractFetchRemote
 			sGetAdd ? null : (params || {}),
 			undefined === iTimeout ? 30000 : pInt(iTimeout),
 			data => {
-				let cached = false;
-				if (data?.Time) {
-					cached = pInt(data.Time) > Date.now() - start;
-				}
-
 				let iError = 0;
 				if (sAction && oRequests[sAction]) {
 					abort(sAction, 0, 1);
@@ -157,9 +152,12 @@ export class AbstractFetchRemote
 				fCallback && fCallback(
 					iError,
 					data,
-					cached,
+					/**
-					sAction,
+					 * Responses like "304 Not Modified" are returned as "200 OK"
-					params
+					 * This is an attempt to detect if the request comes from cache.
+					 * But when client has wrong date/time, it will fail.
+					 */
+					data?.epoch && data.epoch < Math.floor(start / 1000) - 60
 				);
 			}
 		)
@@ -203,8 +201,8 @@ export class AbstractFetchRemote
 				}
 /*
 				let isCached = false, type = '';
-				if (data?.Time) {
+				if (data?.epoch) {
-					isCached = pInt(data.Time) > microtime() - start;
+					isCached = data.epoch > microtime() - start;
 				}
 				// backward capability
 				switch (true) {

dev/Remote/User/Fetch.js

@@ -22,8 +22,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 	 */
 	messageList(fCallback, params, bSilent = false) {
 		const
-			sFolderFullName = pString(params.Folder),
+	//		folder = getFolderFromCacheList(params.folder.fullName),
-			folder = getFolderFromCacheList(sFolderFullName),
+			folder = getFolderFromCacheList(params.folder),
 			folderHash = folder?.hash || '';
 
 		params = Object.assign({
@@ -31,10 +31,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 			limit: SettingsUserStore.messagesPerPage(),
 			search: '',
 			uidNext: folder?.uidNext || 0, // Used to check for new messages
-			sort: FolderUserStore.sortMode(),
+			sort: FolderUserStore.sortMode()
-			Hash: folderHash + SettingsGet('AccountHash')
 		}, params);
-		params.Folder = sFolderFullName;
 		if (AppUserStore.threadsAllowed() && SettingsUserStore.useThreads()) {
 			params.useThreads = 1;
 		} else {
@@ -42,12 +40,9 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		}
 
 		let sGetAdd = '';
-
+		if (folderHash) {
-		if (folderHash && (!params.search || !params.search.includes('is:'))) {
+			params.hash = folderHash + '-' + SettingsGet('AccountHash');
-			sGetAdd = 'MessageList/' +
+			sGetAdd = 'MessageList/' + SUB_QUERY_PREFIX + '/' + b64EncodeJSONSafe(params);
-				SUB_QUERY_PREFIX +
-				'/' +
-				b64EncodeJSONSafe(params);
 			params = {};
 		}
 

dev/Stores/User/Messagelist.js

@@ -293,7 +293,8 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 			MessagelistUserStore.loading(false);
 		},
 		{
-			Folder: FolderUserStore.currentFolderFullName(),
+//			folder: FolderUserStore.currentFolder() ? self.currentFolder().fullName : ''),
+			folder: FolderUserStore.currentFolderFullName(),
 			offset: iOffset,
 			limit: SettingsUserStore.messagesPerPage(),
 			search: MessagelistUserStore.listSearch(),

dev/Styles/Main.less

@@ -76,7 +76,7 @@ dialog:not(.animate) {
  */
 .rl-mobile dialog {
 	margin: 0 auto;
-	max-height: calc(100vh - 86px);
+/*	max-height: calc(100vh - 86px);*/
 	width: 100%;
 }
 

dev/View/Popup/Domain.js

@@ -210,7 +210,15 @@ export class DomainPopupView extends AbstractViewPopup {
 	createOrAddCommand() {
 		this.saving(true);
 		Remote.request('AdminDomainSave',
-			this.onDomainCreateOrSaveResponse.bind(this),
+			iError => {
+				this.saving(false);
+				if (iError) {
+					this.savingError(getNotification(iError));
+				} else {
+					DomainAdminStore.fetch();
+					this.close();
+				}
+			},
 			Object.assign(domainToParams(this), {
 				Create: this.edit() ? 0 : 1
 			})
@@ -263,16 +271,6 @@ export class DomainPopupView extends AbstractViewPopup {
 		});
 	}
 
-	onDomainCreateOrSaveResponse(iError) {
-		this.saving(false);
-		if (iError) {
-			this.savingError(getNotification(iError));
-		} else {
-			DomainAdminStore.fetch();
-			this.close();
-		}
-	}
-
 	clearTesting() {
 		this.testing(false);
 		this.testingDone(false);

dev/sieve.js

@@ -55,13 +55,11 @@ window.Sieve = {
 	deleteScript: script => {
 		serverError(false);
 		Remote.request('FiltersScriptDelete',
-			(iError, data) => {
+			(iError, data) =>
-				if (iError) {
+				iError
-					setError(data?.ErrorMessageAdditional || getNotification(iError));
+					? setError(data?.ErrorMessageAdditional || getNotification(iError))
-				} else {
+					: scripts.remove(script)
-					scripts.remove(script);
+			,
-				}
-			},
 			{name:script.name()}
 		);
 	},
@@ -69,13 +67,11 @@ window.Sieve = {
 	setActiveScript(name) {
 		serverError(false);
 		Remote.request('FiltersScriptActivate',
-			(iError, data) => {
+			(iError, data) =>
-				if (iError) {
+				iError
-					setError(data?.ErrorMessageAdditional || iError)
+					? setError(data?.ErrorMessageAdditional || iError)
-				} else {
+					: scripts.forEach(script => script.active(script.name() === name))
-					scripts.forEach(script => script.active(script.name() === name));
+			,
-				}
-			},
 			{name:name}
 		);
 	}

plugins/recaptcha/index.php

@@ -6,8 +6,8 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'reCaptcha',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '2.13',
+		VERSION  = '2.14',
-		RELEASE  = '2022-12-08',
+		RELEASE  = '2023-01-11',
 		REQUIRED = '2.23',
 		CATEGORY = 'General',
 		LICENSE  = 'MIT',
@@ -141,10 +141,12 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
 	{
-		$CSP->script[] = 'https://www.google.com/recaptcha/';
+//		$CSP->script[] = 'https://www.google.com/recaptcha/';
 		$CSP->script[] = 'https://www.gstatic.com/recaptcha/';
-		$CSP->frame[] = 'https://www.google.com/recaptcha/';
+		$CSP->script[] = 'https://www.recaptcha.net/recaptcha/';
-		$CSP->frame[] = 'https://recaptcha.google.com/recaptcha/';
+//		$CSP->frame[] = 'https://www.google.com/recaptcha/';
+//		$CSP->frame[] = 'https://recaptcha.google.com/recaptcha/';
+		$CSP->frame[] = 'https://www.recaptcha.net/recaptcha/';
 	}
 
 }

snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php

@@ -582,11 +582,11 @@ class MailClient
 		$sSerializedHash = '';
 		$sSerializedLog = '';
 		if ($bUseCacheAfterSearch) {
-			$sSerializedHash = 'GetUids/'.
+			$sSerializedHash = 'Get'
-				($bUseSort ? 'S' . $sSort : 'N').'/'.
+				. ($bReturnUid ? 'UIDS/' : 'IDS/')
-				$this->oImapClient->Hash().'/'.
+				. ($bUseSort ? 'S' . $sSort : 'N')
-				$sFolderName.'/'.$sSearchCriterias;
+				. "/{$this->oImapClient->Hash()}/{$sFolderName}/{$sSearchCriterias}";
-			$sSerializedLog = '"'.$sFolderName.'" / '.$sSearchCriterias.'';
+			$sSerializedLog = "\"{$sFolderName}\" / {$sSort} / {$sSearchCriterias}";
 
 			$sSerialized = $oCacher->Get($sSerializedHash);
 			if (!empty($sSerialized)) {
@@ -596,14 +596,12 @@ class MailClient
 					\is_array($aSerialized['Uids'])
 				) {
 					if ($this->oLogger) {
-						$this->oLogger->Write('Get Serialized UIDS from cache ('.$sSerializedLog.') [count:'.\count($aSerialized['Uids']).']');
+						$this->oLogger->Write('Get Serialized '.($bReturnUid?'UIDS':'IDS').' from cache ('.$sSerializedLog.') [count:'.\count($aSerialized['Uids']).']');
 					}
-					if (\is_array($aSerialized['Uids'])) {
 					return $aSerialized['Uids'];
 				}
 			}
 		}
-		}
 
 		$aResultUids = [];
 		if ($bUseSort) {
@@ -631,7 +629,7 @@ class MailClient
 			)));
 
 			if ($this->oLogger) {
-				$this->oLogger->Write('Save Serialized UIDS to cache ('.$sSerializedLog.') [count:'.\count($aResultUids).']');
+				$this->oLogger->Write('Save Serialized '.($bReturnUid?'UIDS':'IDS').' to cache ('.$sSerializedLog.') [count:'.\count($aResultUids).']');
 			}
 		}
 

snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php

@@ -51,4 +51,18 @@ class MessageListParams
 //		0 > $oParams->iLimit
 //		999 < $oParams->iLimit
 	}
+
+	public function hash() : string
+	{
+		return \md5(\implode('-', [
+			$this->sFolderName,
+			$this->iOffset,
+			$this->iLimit,
+			$this->bHideDeleted ? '1' : '0',
+			$this->sSearch,
+			$this->bUseSort ? $this->sSort : '',
+			$this->bUseThreads ? $this->iThreadUid : '',
+			$this->iPrevUidNext
+		]));
+	}
 }

snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php

@@ -157,7 +157,7 @@ class Header
 		}
 
 		// https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1
-		return \wordwrap($this->NameWithDelimitrom() . $sValue, 78, "\r\n ");
+		return \wordwrap($this->NameWithDelimitrom() . $sResult, 78, "\r\n ");
 	}
 
 	public function IsSubject() : bool

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -408,6 +408,12 @@ class Actions
 		return $this->oMailClient;
 	}
 
+	public function ImapClient(): \MailSo\Imap\ImapClient
+	{
+//		$this->initMailClientConnection();
+		return $this->MailClient()->ImapClient();
+	}
+
 	// Stores data in AdditionalAccount else MainAccount
 	public function LocalStorageProvider(): Providers\Storage
 	{
@@ -590,7 +596,7 @@ class Actions
 	{
 		$sLine = $this->oConfig->Get('logs', 'auth_logging_format', '');
 		if (!empty($sLine)) {
-			$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, false, $aAdditionalParams));
+			$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, false, $aAdditionalParams), \LOG_WARNING);
 		}
 		if (($this->oConfig->Get('logs', 'auth_logging', false) || $this->oConfig->Get('logs', 'auth_syslog', false))
 		 && \openlog('snappymail', 0, \LOG_AUTHPRIV)) {
@@ -1066,9 +1072,9 @@ class Actions
 		return \md5($sKey . $this->oConfig->Get('cache', 'index', ''));
 	}
 
-	public function cacheByKey(string $sKey, bool $bForce = false): bool
+	public function cacheByKey(string $sKey): bool
 	{
-		if ($sKey && ($bForce || ($this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)))) {
+		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
 			\MailSo\Base\Http::ServerUseCache(
 				$this->etag($sKey),
 				1382478804,
@@ -1080,11 +1086,11 @@ class Actions
 		return false;
 	}
 
-	public function verifyCacheByKey(string $sKey, bool $bForce = false): void
+	public function verifyCacheByKey(string $sKey): void
 	{
-		if ($sKey && ($bForce || ($this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)))) {
+		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
 			\MailSo\Base\Http::checkETag($this->etag($sKey));
-//			$this->cacheByKey($sKey, $bForce);
+//			\MailSo\Base\Http::checkLastModified(1382478804);
 		}
 	}
 

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php

@@ -4,6 +4,7 @@ namespace RainLoop\Actions;
 
 use RainLoop\Enumerations\PluginPropertyType;
 use RainLoop\Exceptions\ClientException;
+use RainLoop\Notifications;
 
 trait AdminExtensions
 {

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php

@@ -24,12 +24,12 @@ trait Messages
 		$oParams = new \MailSo\Mail\MessageListParams;
 
 		$sRawKey = $this->GetActionParam('RawKey', '');
-		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
+		$aValues = $sRawKey ? \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) : null;
+		$sHash = '';
 		if ($aValues && 6 < \count($aValues)) {
-			$this->verifyCacheByKey($sRawKey);
+			// GET
-
+			$sHash = (string) $aValues['hash'];
-//			$oParams->sHash = (string) $aValues['Hash'];
+			$oParams->sFolderName = (string) $aValues['folder'];
-			$oParams->sFolderName = (string) $aValues['Folder'];
 			$oParams->iLimit = $aValues['limit'];
 			$oParams->iOffset = $aValues['offset'];
 			$oParams->sSearch = (string) $aValues['search'];
@@ -42,7 +42,8 @@ trait Messages
 				$oParams->iThreadUid = $aValues['threadUid'];
 			}
 		} else {
-			$oParams->sFolderName = $this->GetActionParam('Folder', '');
+			// POST
+			$oParams->sFolderName = $this->GetActionParam('folder', '');
 			$oParams->iOffset = $this->GetActionParam('offset', 0);
 			$oParams->iLimit = $this->GetActionParam('limit', 10);
 			$oParams->sSearch = $this->GetActionParam('search', '');
@@ -60,6 +61,16 @@ trait Messages
 
 		$oAccount = $this->initMailClientConnection();
 
+		if ($sHash) {
+			$oInfo = $this->ImapClient()->FolderStatusAndSelect($oParams->sFolderName);
+			$aRequestHash = \explode('-', $sHash);
+			$sFolderHash = $oInfo->getHash($this->ImapClient()->Hash());
+			$sHash = $oParams->hash() . '-' . $sFolderHash;
+			if ($aRequestHash[0] == $sFolderHash) {
+				$this->verifyCacheByKey($sHash);
+			}
+		}
+
 		try
 		{
 			if (!$this->Config()->Get('imap', 'use_thread', true)) {
@@ -75,17 +86,15 @@ trait Messages
 			}
 
 			$oMessageList = $this->MailClient()->MessageList($oParams);
+			if ($sHash) {
+				$this->cacheByKey($sHash);
+			}
+			return $this->DefaultResponse($oMessageList);
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantGetMessageList, $oException);
 		}
-
-		if ($oMessageList) {
-			$this->cacheByKey($sRawKey);
-		}
-
-		return $this->DefaultResponse($oMessageList);
 	}
 
 	public function DoSaveMessage() : array

snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php

@@ -2,7 +2,7 @@
 
 namespace RainLoop\Plugins;
 
-use \RainLoop\Enumerations\PluginPropertyType;
+use RainLoop\Enumerations\PluginPropertyType;
 
 class Property implements \JsonSerializable
 {

snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php

@@ -2,7 +2,7 @@
 
 namespace RainLoop\Providers\AddressBook\Classes;
 
-use \Sabre\VObject\Component\VCard;
+use Sabre\VObject\Component\VCard;
 
 class Contact implements \JsonSerializable
 {

snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php

@@ -160,14 +160,17 @@ class ServiceActions
 
 		$aResponse['Action'] = $sAction ?: 'Unknown';
 
-		if (\is_array($aResponse)) {
-			$aResponse['Time'] = (int) ((\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000);
-		}
-
 		if (!\headers_sent()) {
 			\header('Content-Type: application/json; charset=utf-8');
 		}
 
+		if (\is_array($aResponse)) {
+			$aResponse['epoch'] = \time();
+//			if ($this->Config()->Get('debug', 'enable', false)) {
+//				$aResponse['rtime'] = \round(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], 3);
+//			}
+		}
+
 		$sResult = Utils::jsonEncode($aResponse);
 
 		$sObResult = \ob_get_clean();