extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. SMIME:

Browse Source 
- Add missing parts from commit 0499f50943
This commit is contained in:
Hadi Nategh 2017-07-20 18:54:09 +02:00
parent 74b4ff908e
commit 4deaf6c09a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Mail.php
View File

@ -7342,12 +7342,16 @@ class Mail
'mimeType' => $_mime_part->getType()
), $_params);
$metadata = array (
'mimeType' => $params['mimeType']
);
$this->smime = new Mail\Smime;
$message = $this->getMessageRawBody($params['uid'], null, $params['mailbox']);
if (!Mail\Smime::isSmimeSignatureOnly($params['mimeType']))
{
$message = $this->_decryptSmimeBody($message, $params['passphrase'] !='' ?
$params['passphrase'] : Api\Cache::getSession('mail', 'smime_passphrase'));
$metadata['encrypted'] = true;
}
try {
@ -7363,19 +7367,18 @@ class Mail
if ($cert) // signed message, it might be encrypted too
{
$message_parts = $this->smime->extractSignedContents($message);
$metadata = array (
$metadata = array_merge ($metadata, array (
'verify' => $cert->verify,
'cert' => $cert->cert,
'msg' => $cert->msg,
'certHtml' => $this->smime->certToHTML($cert->cert),
'signed' => true,
);
));
}
else // only encrypted message
{
$message_parts = Horde_Mime_Part::parseMessage($message, array('forcemime' => true));
}
$metadata['mimeType'] = $params['mimeType'];
$message_parts->setMetadata('X-EGroupware-Smime', $metadata);
return $message_parts;
}