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

fix(security): require CSRF token for headerless GET JSON actions

Browse source 
ba3741080a
This commit is contained in:
the-djmaze 2026-11-02 01:07:33 +01:00
parent 2de4ebac54
commit 71d10f8cf6
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,11 +103,17 @@ class ServiceActions
$this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERR, 'Token'); $this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERR, 'Token');
throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'HTTP Token mismatch'); throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'HTTP Token mismatch');
} }
} else if ($this->oHttp->IsPost()) { } else {
if (empty($_POST['XToken']) || $_POST['XToken'] !== $token) { // A state-changing action must never be triggerable by a bare
// headerless POST/GET (e.g. <img src> or a top-level navigation):
// without the X-SM-Token header the token has to arrive as a
// query parameter. The first-party UI always sends the header,
// so this only affects headerless callers.
$xToken = $this->oHttp->IsPost() ? ($_POST['XToken'] ?? '') : ($_GET['XToken'] ?? '');
if (empty($xToken) || $xToken !== $token) {
$oAccount = $this->oActions->getAccountFromToken(false); $oAccount = $this->oActions->getAccountFromToken(false);
$sEmail = $oAccount ? $oAccount->Email() : 'guest'; $sEmail = $oAccount ? $oAccount->Email() : 'guest';
$this->oActions->logWrite("{$_POST['XToken']} !== {$token} for {$sEmail}", \LOG_ERR, 'XToken'); $this->oActions->logWrite("{$xToken} !== {$token} for {$sEmail}", \LOG_ERR, 'XToken');
throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken mismatch'); throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken mismatch');
} }
} }