the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-09-04 12:14:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix: mailto handling was broken, and now also works without auto-login

Browse source
This commit is contained in:
the-djmaze 2022-03-04 15:22:37 +01:00
parent a503329b77
commit ee135f2032
5 changed files with 30 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dev/App/User.js
View file

@ -317,25 +317,6 @@ class AppUser extends AbstractApp {
setTimeout(() => Remote.request('AppDelayStart'), 35000);
// When auto-login is active
if (
SettingsGet('AccountSignMe') &&
navigator.registerProtocolHandler
) {
setTimeout(() => {
try {
navigator.registerProtocolHandler(
'mailto',
location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
(SettingsGet('Title') || 'SnappyMail')
);
} catch (e) {} // eslint-disable-line no-empty
value = SettingsGet('MailToEmail');
value && mailToHelper(value);
}, 500);
}
// add pointermove ?
addEventsListener(doc, ['touchstart','mousemove','keydown'], SettingsUserStore.delayLogout, {passive:true});
SettingsUserStore.delayLogout();
@ -356,6 +337,21 @@ class AppUser extends AbstractApp {
setInterval(reloadTime(), 60000);
PgpUserStore.init();
// When auto-login is active
if (navigator.registerProtocolHandler) {
try {
navigator.registerProtocolHandler(
'mailto',
location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
(SettingsGet('Title') || 'SnappyMail')
);
} catch (e) {} // eslint-disable-line no-empty
}
setTimeout(() => {
value = SettingsGet('MailToEmail');
value && mailToHelper(value);
}, 500);
} else {
this.logout();
}

16
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -818,16 +818,14 @@ class Actions
}
}
if ($aResult['AccountSignMe']) {
$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null);
if (null !== $sToken) {
Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);
$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null);
if (null !== $sToken) {
Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);
$mMailToData = Utils::DecodeKeyValuesQ($sToken);
if (!empty($mMailToData['MailTo']) &&
'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) {
$aResult['MailToEmail'] = $mMailToData['To'];
}
$mMailToData = Utils::DecodeKeyValuesQ($sToken);
if (!empty($mMailToData['MailTo']) &&
'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) {
$aResult['MailToEmail'] = $mMailToData['To'];
}
}

12
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
View file

@ -32,18 +32,6 @@ trait User
return $this->oSuggestionsProvider;
}
public function SetMailtoRequest(string $sTo): void
{
if (!empty($sTo)) {
Utils::SetCookie(self::AUTH_MAILTO_TOKEN_KEY,
Utils::EncodeKeyValuesQ(array(
'Time' => \microtime(true),
'MailTo' => 'MailTo',
'To' => $sTo
)), 0);
}
}
/**
* @throws \MailSo\Base\Exceptions\Exception
*/

2
snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -112,7 +112,7 @@ abstract class Service
$sResult = '';
if (\count($aPaths) && !empty($aPaths[0]) && 'index' !== \strtolower($aPaths[0]))
{
if (!\SnappyMail\HTTP\SecFetch::isSameOrigin()) {
if ('mailto' !== \strtolower($aPaths[0]) && !\SnappyMail\HTTP\SecFetch::isSameOrigin()) {
\MailSo\Base\Http::StatusHeader(403);
echo $oServiceActions->ErrorTemplates('Access Denied.',
"Disallowed Sec-Fetch

16
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -620,17 +620,15 @@ class ServiceActions
public function ServiceMailto() : string
{
$this->oHttp->ServerNoCache();
$sTo = \trim($_GET['to'] ?? '');
if (!empty($sTo) && \preg_match('/^mailto:/i', $sTo))
{
$oAccount = $this->oActions->GetAccountFromSignMeToken();
if ($oAccount)
{
$this->oActions->SetMailtoRequest($sTo);
}
if (!empty($sTo) && \preg_match('/^mailto:/i', $sTo)) {
Utils::SetCookie(\RainLoop\Actions::AUTH_MAILTO_TOKEN_KEY,
Utils::EncodeKeyValuesQ(array(
'Time' => \microtime(true),
'MailTo' => 'MailTo',
'To' => $sTo
)), 0);
}
$this->oActions->Location('./');
return '';
}