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

Merge branch 'hotfix-2.2.12'

pull/274/merge
iglocska 2014-03-13 13:40:41 +01:00
parent f4a884bef7 3439cc4237
commit 40709ee8a7
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL/INSTALL.txt
View File

@ -122,6 +122,10 @@ sudo -u www-data gpg --homedir /var/www/MISP/.gnupg --gen-key
# And export the public key to the webroot
sudo -u www-data gpg --homedir /var/www/MISP/.gnupg --export --armor YOUR-EMAIL > /var/www/MISP/app/webroot/gpg.asc
# Start the workers to enable background jobs
cd /var/www/MISP/app/Console/worker/
./start.sh
Now log in using the webinterface:
The default user/pass = admin@admin.test/admin

2
app/Controller/EventsController.php
View File

@ -184,7 +184,7 @@ class EventsController extends AppController {
),
));
$this->set('events', $this->paginate());
if (!$this->Auth->user('gpgkey')) {
if (!$this->Auth->user('gpgkey') and Configure::read('GnuPG.onlyencrypted') == 'true') {
$this->Session->setFlash(__('No GPG key set in your profile. To receive emails, submit your public key in your profile.'));
}
$this->set('eventDescriptions', $this->Event->fieldDescriptions);

17
app/Model/Event.php
View File

@ -1071,15 +1071,14 @@ class Event extends AppModel {
$body .= '==============================================' . "\n";
$appendlen = 20;
$body .= 'URL : ' . Configure::read('MISP.baseurl') . '/events/view/' . $event['Event']['id'] . "\n";
$body .= 'Event : ' . $event['Event']['id'] . "\n";
$body .= 'Event ID : ' . $event['Event']['id'] . "\n";
$body .= 'Date : ' . $event['Event']['date'] . "\n";
if ('true' == Configure::read('MISP.showorg')) {
$body .= 'Reported by : ' . $event['Event']['org'] . "\n";
}
$body .= 'Risk : ' . $event['ThreatLevel']['name'] . "\n";
$body .= 'Threat Level: ' . $event['ThreatLevel']['name'] . "\n";
$body .= 'Analysis : ' . $this->analysisLevels[$event['Event']['analysis']] . "\n";
$body .= 'Info : ' . "\n";
$body .= $event['Event']['info'] . "\n";
$body .= 'Description : ' . $event['Event']['info'] . "\n\n";
$user['org'] = $org;
$relatedEvents = $this->getRelatedEvents($user, false);
if (!empty($relatedEvents)) {
@ -1120,6 +1119,10 @@ class Event extends AppModel {
if (!empty($bodyTempOther)) {
$body .= "\n";
}
$subject = preg_replace( "/\r|\n/", "", $event['Event']['info']);
if (strlen($subject) > 55) {
$subject = substr($subject, 0, 55) . '...';
}
$body .= $bodyTempOther; // append the 'other' attribute types to the bottom.
$body .= '==============================================' . "\n";
// find out whether the event is private, to limit the alerted user's list to the org only
@ -1154,7 +1157,7 @@ class Event extends AppModel {
$Email = new CakeEmail();
$Email->from(Configure::read('MISP.email'));
$Email->to($user['User']['email']);
$Email->subject("[" . Configure::read('MISP.org') . " " . Configure::read('MISP.name') . "] Event " . $id . " - " . $event['ThreatLevel']['name'] . " - TLP Amber");
$Email->subject("[" . Configure::read('MISP.org') . " " . Configure::read('MISP.name') . "] Event " . $id . " - " . $subject . " - " . $event['ThreatLevel']['name'] . " - TLP Amber");
$Email->emailFormat('text'); // both text or html
// send it
$Email->send($bodySigned);
@ -1184,7 +1187,7 @@ class Event extends AppModel {
$Email = new CakeEmail();
$Email->from(Configure::read('MISP.email'));
$Email->to($user['User']['email']);
$Email->subject("[" . Configure::read('MISP.org') . " " . Configure::read('MISP.name') . "] Event " . $id . " - " . $event['ThreatLevel']['name'] . " - TLP Amber");
$Email->subject("[" . Configure::read('MISP.org') . " " . Configure::read('MISP.name') . "] Event " . $id . " - " . $subject . " - " . $event['ThreatLevel']['name'] . " - TLP Amber");
$Email->emailFormat('text'); // both text or html
// import the key of the user into the keyring
// this is not really necessary, but it enables us to find
@ -1453,7 +1456,7 @@ class Event extends AppModel {
unset($data['Event']['Attribute'][$k]);
} else {
unset($data['Event']['Attribute'][$k]);
}
}
} else {
unset($data['Event']['Attribute'][$k]['id']);
$data['Attribute'][] = $data['Event']['Attribute'][$k];