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

Automatically verify S/MIME decrypted signed message

Browse source
This commit is contained in:
the-djmaze 2024-03-04 15:33:19 +01:00
parent d1466ad2f2
commit 34106c937e
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/View/User/MailBox/MessageView.js
View file

@ -656,6 +656,9 @@ export class MailMessageView extends AbstractViewRight {
MimeToMessage(response.Result.data, message); MimeToMessage(response.Result.data, message);
message.html() ? message.viewHtml() : message.viewPlain(); message.html() ? message.viewHtml() : message.viewPlain();
pass && pass.remember && Passphrases.set(identity, pass.password); pass && pass.remember && Passphrases.set(identity, pass.password);
if ('signed' in response.Result) {
message.smimeSigned(response.Result.signed);
}
} }
}).catch(e => { }).catch(e => {
data.error = e.message data.error = e.message

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

@ -104,8 +104,16 @@ trait SMime
$SMIME->setCertificate($sCertificate); $SMIME->setCertificate($sCertificate);
$SMIME->setPrivateKey($sPrivateKey, $oPassphrase); $SMIME->setPrivateKey($sPrivateKey, $oPassphrase);
$result = $SMIME->decrypt($sBody); $result = $SMIME->decrypt($sBody);
if ($result) {
$result = ['data' => $result];
if (\str_contains($result['data'], 'multipart/signed')) {
$result['signed'] = [
'success' => !empty($SMIME->verify($result['data'], null, true)['success'])
];
}
}
return $this->DefaultResponse($result ? ['data' => $result] : false); return $this->DefaultResponse($result ?: false);
} }
public function DoSMimeVerifyMessage() : array public function DoSMimeVerifyMessage() : array