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

chg: [diagnostic:submodule] continued sync DB after pull done - WiP

pull/4435/head
mokaddem 2019-04-05 16:04:22 +02:00
parent fe00c4d193
commit 95bdff2093
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Console/Command/AdminShell.php
View File

@ -51,15 +51,14 @@ class AdminShell extends AppShell
$jobId = $this->args[1];
$userId = $this->args[2];
$this->Job->id = $jobId;
$result = $this->Server->updateAfterPull($submodule_name, $userId) . PHP_EOL;
$job['Job']['progress'] = 100;
$job['Job']['date_modified'] = date("y-m-d H:i:s");
$result = $this->Server->updateAfterPull($submodule_name, $userId);
$this->Job->saveField('progress', 100);
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
if ($result) {
$job['Job']['message'] = __('Database updated.');
$this->Job->saveField('message', __('Database updated: ' . $submodule_name));
} else {
$job['Job']['message'] = __('Could not update the database.');
$this->Job->saveField('message', __('Could not update the database: ' . $submodule_name));
}
$this->Job->save($job);
}
public function updateGalaxies() {
@ -89,7 +88,7 @@ class AdminShell extends AppShell
}
public function updateWarningLists() {
$result = $this->Galaxy->update();
$result = $this->Warninglist->update();
if ($result) {
echo 'Warning lists updated';
} else {

36
app/Model/Server.php
View File

@ -4640,9 +4640,7 @@ class Server extends AppModel
$path = APP . '../';
if ($submodule_name == false) {
$command = sprintf('cd %s; git submodule update 2>&1', $path);
// exec($command, $output, $return_code);
$return_code = 0;
$output = array();
exec($command, $output, $return_code);
$output = implode("\n", $output);
$res = array('status' => ($return_code==0 ? true : false), 'output' => $output);
if ($return_code == 0) { // update all DB
@ -4650,9 +4648,7 @@ class Server extends AppModel
}
} else if ($this->_isAcceptedSubmodule($submodule_name)) {
$command = sprintf('cd %s; git submodule update -- %s 2>&1', $path, $submodule_name);
// exec($command, $output, $return_code);
$return_code = 0;
$output = array();
exec($command, $output, $return_code);
$output = implode("\n", $output);
$res = array('status' => ($return_code==0 ? true : false), 'output' => $output);
if ($return_code == 0) { // update DB if necessary
@ -4697,15 +4693,31 @@ class Server extends AppModel
public function updateAfterPull($submodule_name, $userId) {
$user = $this->User->getAuthUser($userId);
$result = false;
if ($user['Role']['perm_site_admin']) {
if (empty($submodule_name)) { // update all
} else { // update specific
$updateAll = empty($submodule_name);
if ($submodule_name == 'app/files/misp-galaxy' || $updateAll) {
$this->Galaxy = ClassRegistry::init('Galaxy');
$result = $this->Galaxy->update();
}
if ($submodule_name == 'app/files/misp-objects' || $updateAll) {
$this->ObjectTemplate = ClassRegistry::init('ObjectTemplate');
$result = $this->ObjectTemplate->update($user, false, false);
}
if ($submodule_name == 'app/files/noticelists' || $updateAll) {
$this->Noticelist = ClassRegistry::init('Noticelist');
$result = $this->Noticelist->update();
}
if ($submodule_name == 'app/files/taxonomies' || $updateAll) {
$this->Taxonomy = ClassRegistry::init('Taxonomy');
$result = $this->Taxonomy->update();
}
if ($submodule_name == 'app/files/warninglists' || $updateAll) {
$this->Warninglist = ClassRegistry::init('Warninglist');
$result = $this->Warninglist->update();
}
} else {
return false;
}
return $result;
}
public function update($status)