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

More S/MIME changes for #259

Browse source
This commit is contained in:
the-djmaze 2024-02-19 15:35:10 +01:00
parent a9b60a762f
commit 9a5a5091a1
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/Model/Message.js
View file

@ -115,16 +115,17 @@ export class MessageModel extends AbstractModel {
hasExternals: false, hasExternals: false,
hasTracking: false, hasTracking: false,
encrypted: false,
pgpSigned: null, pgpSigned: null,
pgpVerified: null, pgpVerified: null,
encrypted: false,
pgpEncrypted: null, pgpEncrypted: null,
pgpDecrypted: false, pgpDecrypted: false,
smimeSigned: null, smimeSigned: null,
smimeVerified: null, smimeVerified: null,
smimeEncrypted: null, smimeEncrypted: null,
smimeDecrypted: false,
// rfc8621 // rfc8621
id: '', id: '',

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

@ -619,6 +619,13 @@ export class MailMessageView extends AbstractViewRight {
}); });
} }
smimeDecrypt() {
/*
// TODO: find private key and certificate to decrypt
const oMessage = currentMessage();
*/
}
smimeVerify(/*self, event*/) { smimeVerify(/*self, event*/) {
const message = currentMessage(); const message = currentMessage();
let data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" } let data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" }

2
snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -490,7 +490,7 @@ class Message implements \JsonSerializable
'uid' => $this->Uid, 'uid' => $this->Uid,
'hash' => \md5($this->sFolder . $this->Uid), 'hash' => \md5($this->sFolder . $this->Uid),
'subject' => \trim(Utils::Utf8Clear($this->sSubject)), 'subject' => \trim(Utils::Utf8Clear($this->sSubject)),
'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted, 'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted || $this->smimeEncrypted,
'messageId' => $this->sMessageId, 'messageId' => $this->sMessageId,
'spamScore' => $this->bIsSpam ? 100 : $this->SpamScore, 'spamScore' => $this->bIsSpam ? 100 : $this->SpamScore,
'spamResult' => $this->sSpamResult, 'spamResult' => $this->sSpamResult,

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

@ -305,8 +305,16 @@
</div> </div>
</div> </div>
<div data-bind="visible: message().smimeEncrypted()">
<div class="smime-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
<!-- TODO
<button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
-->
</div>
</div>
<div data-bind="visible: message().smimeSigned()"> <div data-bind="visible: message().smimeSigned()">
<div class="openpgp-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}"> <div class="smime-control signed" data-bind="css: {success: message().smimeVerified() && message().smimeVerified().success, error: message().smimeVerified() && !message().smimeVerified().success}">
<span data-icon="✍" data-i18n="SMIME/SIGNED_MESSAGE"></span> <span data-icon="✍" data-i18n="SMIME/SIGNED_MESSAGE"></span>
<button class="btn" data-bind="click: smimeVerify" data-i18n="CRYPTO/VERIFY"></button> <button class="btn" data-bind="click: smimeVerify" data-i18n="CRYPTO/VERIFY"></button>
</div> </div>