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

Merge branch '2.4' into develop

pull/9193/head
Sami Mokaddem 2023-06-16 09:05:33 +02:00
parent 554056c60c 2ab3245ad4
commit f79221abc8
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Command/ServerShell.php
View File

@ -800,15 +800,14 @@ class ServerShell extends AppShell
$userId = $this->args[0];
$user = $this->getUser($userId);
$serverId = $this->args[1];
if (!empty($this->args[3])) {
$jobId = $this->args[3];
if (!empty($this->args[2])) {
$jobId = $this->args[2];
} else {
$jobId = $this->Job->createJob($user, Job::WORKER_DEFAULT, 'push_taxii', 'Server: ' . $serverId, 'Pushing.');
}
$this->Job->read(null, $jobId);
$result = $this->TaxiiServer->push($serverId, $user, $jobId);
if ($result !== true && !is_array($result)) {
$message = 'Job failed. Reason: ' . $result;
$this->Job->saveStatus($jobId, false, $message);
@ -816,12 +815,5 @@ class ServerShell extends AppShell
$message = 'Job done.';
$this->Job->saveStatus($jobId, true, $message);
}
if (isset($this->args[4])) {
$this->Task->id = $this->args[5];
$message = 'Job(s) started at ' . date('d/m/Y - H:i:s') . '.';
$this->Task->saveField('message', $message);
echo $message . PHP_EOL;
}
}
}

2
app/Controller/AppController.php
View File

@ -33,7 +33,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '150';
private $__queryVersion = '151';
public $pyMispVersion = '2.4.172';
public $phpmin = '7.2';
public $phprec = '7.4';

1
app/Model/AppModel.php
View File

@ -1953,6 +1953,7 @@ class AppModel extends Model
break;
case 109:
$sqlArray[] = "UPDATE `over_correlating_values` SET `value` = LOWER(`value`) COLLATE utf8mb4_unicode_ci;";
break;
case 110:
$sqlArray[] = "ALTER TABLE `users` ADD `totp` varchar(255) DEFAULT NULL;";
$sqlArray[] = "ALTER TABLE `users` ADD `hotp_counter` int(11) DEFAULT NULL;";

1
app/Model/TaxiiServer.php
View File

@ -77,6 +77,7 @@ class TaxiiServer extends AppModel
$this->__pushEvents($user, $taxii_server, $filters, $eventids, $i, $jobId, $eventCount);
}
unset($eventid);
return true;
}
private function __setPushFilters($taxii_server)

2
app/webroot/js/misp.js
View File

@ -2303,7 +2303,7 @@ function runIndexQuickFilterFixed(preserveParams, url, target) {
searchKey = 'searchall';
}
if ($quickFilterField.val().trim().length > 0) {
preserveParams[searchKey] = encodeURIComponent($quickFilterField.val().trim());
preserveParams[searchKey] = encodeURIComponent($quickFilterField.val().trim()).replace('%20', '+');
} else {
delete preserveParams[searchKey]
}