MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: Testing encrypted headers !wip

pull/1120/head
Iglocska 2016-04-27 11:50:34 +02:00
parent 55f20d5381
commit 49dfce6e38
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/User.php
View File

@ -764,13 +764,19 @@ class User extends AppModel {
try {
App::uses('Folder', 'Utility');
$dir = APP . 'tmp' . DS . 'SMIME';
$headers_smime = array("To" => $user['User']['email'], "From" => Configure::read('MISP.email'), "Subject" => $subject);
$headers_smime_enc = '';
foreach ($headers_smime as $h => $v) $headers_smime_enc .= $h . ': ' . $v . PHP_EOL;
$headers_smime_enc .= 'Content-Type: text/plain; format=flowed; charset=\"iso-8859-1\"; reply-type=original' . PHP_EOL;
$headers_smime_enc .= 'Content-Transfer-Encoding: 7bit' . PHP_EOL;
if (!file_exists($dir)) {
if (!mkdir($dir, 0750, true)) throw new MethodNotAllowedException('The SMIME temp directory is not writeable (app/tmp/SMIME).');
}
// save message to file
$msg = tempnam($dir, 'SMIME');
$fp = fopen($msg, "w");
fwrite($fp, $body);
fwrite($fp, $headers_smime_enc . $body);
fclose($fp);
$canSign = true;
@ -799,7 +805,6 @@ class User extends AppModel {
$msg_signed = $msg;
}
$msg_signed_encrypted = tempnam($dir, 'SMIME');
$headers_smime = array("To" => $user['User']['email'], "From" => Configure::read('MISP.email'), "Subject" => $subject);
// encrypt it
if (openssl_pkcs7_encrypt($msg_signed, $msg_signed_encrypted, $user['User']['certif_public'], $headers_smime, 0, OPENSSL_CIPHER_AES_256_CBC)){
$fp = fopen($msg_signed_encrypted, 'r');