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

Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

pull/1325/head
Iglocska 2016-07-02 22:46:24 +02:00
parent 543293060f fd67b8de2c
commit ea17d33fba
5 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,4 +1,5 @@
language: php
php:
- 5.5
- 5.6
@ -34,6 +35,7 @@ addons:
- python-pip
- php5-mysql
cache: pip
before_install:
- git config --global user.name "TravisCI"
@ -125,6 +127,10 @@ script:
- pushd PyMISP
- coverage run setup.py test
- popd
- cp PyMISP/tests/keys.py PyMISP/examples/events/
- pushd PyMISP/examples/events/
- ./create_massive_dummy_events.py -l 5 -a 30
- popd
after_failure:
- curl http://misp.local

2
PyMISP

@ -1 +1 @@
Subproject commit 03c2a053f41ea0035edd5af03e93eb9fb291346e
Subproject commit 836845abde53ee55bca93f098ece78880ab6b5c6

28
app/Console/Command/EventShell.php
View File

@ -35,6 +35,7 @@ class EventShell extends AppShell
}
public function cachexml() {
$timeStart = time();
$userId = $this->args[0];
$id = $this->args[1];
$user = $this->User->getAuthUser($userId);
@ -58,12 +59,13 @@ class EventShell extends AppShell
$this->Job->saveField('progress', ($k+1) / $eventCount *100);
}
}
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
$file->append('<xml_version>' . $this->Event->mispVersion . '</xml_version>');
$file->append('</response>' . PHP_EOL);
$file->close();
$timeDelta = (time()-$timeStart);
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
private function __recursiveEcho($array) {
@ -90,6 +92,7 @@ class EventShell extends AppShell
}
public function cachehids() {
$timeStart = time();
$userId = $this->args[0];
$user = $this->User->getAuthUser($userId);
$id = $this->args[1];
@ -109,12 +112,14 @@ class EventShell extends AppShell
$file->append($rule . PHP_EOL);
}
$file->close();
$timeDelta = (time()-$timeStart);
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cacherpz() {
$timeStart = time();
$userId = $this->args[0];
$user = $this->User->getAuthUser($userId);
$id = $this->args[1];
@ -148,12 +153,14 @@ class EventShell extends AppShell
}
$file->write($rpzExport->export($values, $rpzSettings));
$file->close();
$timeDelta = (time()-$timeStart);
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachecsv() {
$timeStart = time();
$userId = $this->args[0];
$user = $this->User->getAuthUser($userId);
$id = $this->args[1];
@ -185,12 +192,14 @@ class EventShell extends AppShell
}
}
$file->close();
$timeDelta = (time()-$timeStart);
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachetext() {
$timeStart = time();
$userId = $this->args[0];
$user = $this->User->getAuthUser($userId);
$id = $this->args[1];
@ -212,12 +221,14 @@ class EventShell extends AppShell
$file->close();
$this->Job->saveField('progress', $k / $typeCount * 100);
}
$timeDelta = (time()-$timeStart);
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachenids() {
$timeStart = time();
$userId = $this->args[0];
$user = $this->User->getAuthUser($userId);
$id = $this->args[1];
@ -246,8 +257,9 @@ class EventShell extends AppShell
}
}
$file->close();
$timeDelta = time()-$timeStart;
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('message', 'Job done. (in '.$timeDelta.'s)');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}

2
app/Lib/cakephp

@ -1 +1 @@
Subproject commit 79db545b698cc23e784890a7398075d1212e29cc
Subproject commit 64e7c8d9914c845efa8d1865fe0472fd6b6706b6

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit f0dcc0a55d8f76cbbab163797dd9274325a0d2c2
Subproject commit 9c22ee6d757015beecd2bc50f608a2064d833c20