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

Get S/MIME decrypt working for #259

Browse source
This commit is contained in:
the-djmaze 2024-02-20 13:04:12 +01:00
parent 1762198642
commit 18d0ba4acb
3 changed files with 74 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,9 @@ import { showScreenPopup } from 'Knoin/Knoin';
import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport'; import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
import { GnuPGUserStore } from 'Stores/User/GnuPG'; import { GnuPGUserStore } from 'Stores/User/GnuPG';
import { OpenPGPUserStore } from 'Stores/User/OpenPGP'; import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
import { IdentityUserStore } from 'Stores/User/Identity';
import { AskPopupView } from 'View/Popup/Ask';
const const
oMessageScrollerDom = () => elementById('messageItem') || {}, oMessageScrollerDom = () => elementById('messageItem') || {},
@ -619,11 +622,39 @@ export class MailMessageView extends AbstractViewRight {
}); });
} }
smimeDecrypt() { async smimeDecrypt() {
/* /*
$sCertificate = $this->GetActionParam('signCertificate', '');
$sPrivateKey = $this->GetActionParam('signPrivateKey', '');
$sPassphrase = $this->GetActionParam('passphrase', '');
// TODO: find private key and certificate to decrypt // TODO: find private key and certificate to decrypt
const oMessage = currentMessage(); const oMessage = currentMessage();
*/ */
const message = currentMessage();
let data = message.smimeEncrypted(); // { partId: "1" }
const addresses = message.from.concat(message.to, message.cc, message.bcc).map(item => item.email),
identity = IdentityUserStore.find(item => addresses.includes(item.email()));
if (data && identity) {
data = { ...data }; // clone
data.folder = message.folder;
data.uid = message.uid;
// data.bodyPart = data.bodyPart?.raw;
data.certificate = identity.smimeCertificate();
data.privateKey = identity.smimeKey();
if (identity.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----')) {
const pass = await AskPopupView.password('S/MIME private key', 'CRYPTO/DECRYPT');
data.passphrase = pass?.password;
}
Remote.post('SMimeDecryptMessage', null, data).then(response => {
if (response?.Result) {
message.smimeDecrypted(true);
MimeToMessage(response.Result, message);
message.html() ? message.viewHtml() : message.viewPlain();
}
});
}
} }
smimeVerify(/*self, event*/) { smimeVerify(/*self, event*/) {

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

@ -71,6 +71,47 @@ trait SMime
return $this->DefaultResponse($result ?: false); return $this->DefaultResponse($result ?: false);
} }
public function DoSMimeDecryptMessage() : array
{
$sFolderName = $this->GetActionParam('folder', '');
$iUid = (int) $this->GetActionParam('uid', 0);
$sPartId = $this->GetActionParam('partId', '');
$sCertificate = $this->GetActionParam('certificate', '');
$sPrivateKey = $this->GetActionParam('privateKey', '');
$sPassphrase = $this->GetActionParam('passphrase', '');
$this->logMask($sPassphrase);
$this->initMailClientConnection();
$oImapClient = $this->ImapClient();
$oImapClient->FolderExamine($sFolderName);
if ('TEXT' === $sPartId) {
$oFetchResponse = $oImapClient->Fetch([
FetchType::BODY_PEEK.'['.$sPartId.']',
// An empty section specification refers to the entire message, including the header.
// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
FetchType::BODY_HEADER_PEEK
], $iUid, true)[0];
$sBody = $oFetchResponse->GetFetchValue(FetchType::BODY_HEADER);
} else {
$oFetchResponse = $oImapClient->Fetch([
FetchType::BODY_PEEK.'['.$sPartId.']',
// An empty section specification refers to the entire message, including the header.
// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
FetchType::BODY_PEEK.'['.$sPartId.'.MIME]'
], $iUid, true)[0];
$sBody = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.'.MIME]');
}
$sBody .= $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']');
$SMIME = $this->SMIME();
$SMIME->setCertificate($sCertificate);
$SMIME->setPrivateKey($sPrivateKey, $sPassphrase);
$result = $SMIME->decrypt($sBody);
return $this->DefaultResponse($result ?: false);
}
public function DoSMimeVerifyMessage() : array public function DoSMimeVerifyMessage() : array
{ {
$sFolderName = $this->GetActionParam('folder', ''); $sFolderName = $this->GetActionParam('folder', '');

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -307,10 +307,8 @@
<div data-bind="visible: message().smimeEncrypted()"> <div data-bind="visible: message().smimeEncrypted()">
<div class="crypto-control encrypted" data-bind="css: {success: message().smimeDecrypted()}"> <div class="crypto-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span> <span data-icon="🔒" data-i18n="SMIME/ENCRYPTED_MESSAGE"></span>
<!-- TODO
<button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button> <button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
-->
</div> </div>
</div> </div>
<div data-bind="visible: message().smimeSigned()"> <div data-bind="visible: message().smimeSigned()">