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

chg: [internal] Optimise saving logs

pull/7774/head
Jakub Onderka 2021-09-27 12:34:51 +02:00
parent 0e4bc7f349
commit a989489ae6
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Model/Log.php
View File

@ -1,5 +1,4 @@
<?php
App::uses('AppModel', 'Model');
class Log extends AppModel
@ -15,7 +14,7 @@ class Log extends AppModel
'error'
);
public $validate = array(
'action' => array(
'action' => array(
'rule' => array(
'inList',
array( // ensure that the length of the rules is < 20 in length
@ -114,30 +113,26 @@ class Log extends AppModel
return false;
}
if (Configure::read('MISP.log_client_ip')) {
$ip_header = 'REMOTE_ADDR';
if (Configure::read('MISP.log_client_ip_header')) {
$ip_header = Configure::read('MISP.log_client_ip_header');
}
if (isset($_SERVER[$ip_header])) {
$this->data['Log']['ip'] = $_SERVER[$ip_header];
$ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR';
if (isset($_SERVER[$ipHeader])) {
$this->data['Log']['ip'] = $_SERVER[$ipHeader];
}
}
$setEmpty = array('title' => '', 'model' => '', 'model_id' => 0, 'action' => '', 'user_id' => 0, 'change' => '', 'email' => '', 'org' => '', 'description' => '', 'ip' => '');
foreach ($setEmpty as $field => $empty) {
if (!isset($this->data['Log'][$field]) || empty($this->data['Log'][$field])) {
if (empty($this->data['Log'][$field])) {
$this->data['Log'][$field] = $empty;
}
}
if (!isset($this->data['Log']['created'])) {
$this->data['Log']['created'] = date('Y-m-d H:i:s');
}
if (!isset($this->data['Log']['org']) || empty($this->data['Log']['org'])) {
if (empty($this->data['Log']['org'])) {
$this->data['Log']['org'] = 'SYSTEM';
}
$truncate_fields = array('title', 'change', 'description');
foreach ($truncate_fields as $tf) {
if (isset($this->data['Log'][$tf]) && strlen($this->data['Log'][$tf]) >= 65535) {
if (strlen($this->data['Log'][$tf]) >= 65535) {
$this->data['Log'][$tf] = substr($this->data['Log'][$tf], 0, 65532) . '...';
}
}
@ -369,10 +364,10 @@ class Log extends AppModel
if ($this->syslog) {
$action = 'info';
if (isset($data['Log']['action'])) {
if (in_array($data['Log']['action'], $this->errorActions)) {
if (in_array($data['Log']['action'], $this->errorActions, true)) {
$action = 'err';
}
if (in_array($data['Log']['action'], $this->warningActions)) {
if (in_array($data['Log']['action'], $this->warningActions, true)) {
$action = 'warning';
}
}