mirror of https://github.com/MISP/MISP
commit
8cb184ad4b
2
PyMISP
2
PyMISP
|
@ -1 +1 @@
|
|||
Subproject commit cc6391233c01362a1b4b483c4ea8e67f306e3459
|
||||
Subproject commit 190f82923687cebaf06138724e7c03239e529cb4
|
|
@ -1 +1 @@
|
|||
{"major":2, "minor":4, "hotfix":181}
|
||||
{"major":2, "minor":4, "hotfix":182}
|
||||
|
|
|
@ -540,6 +540,10 @@ class AdminShell extends AppShell
|
|||
$whoami = ProcessTool::whoami();
|
||||
if (in_array($whoami, ['httpd', 'www-data', 'apache', 'wwwrun', 'travis', 'www'], true) || $whoami === Configure::read('MISP.osuser')) {
|
||||
$this->out('Executing all updates to bring the database up to date with the current version.');
|
||||
$lock = $this->AdminSetting->find('first', array('conditions' => array('setting' => 'update_locked')));
|
||||
if (!empty($lock)) {
|
||||
$this->AdminSetting->delete($lock['AdminSetting']['id']);
|
||||
}
|
||||
$processId = empty($this->args[0]) ? false : $this->args[0];
|
||||
$this->Server->runUpdates(true, false, $processId);
|
||||
$this->Server->cleanCacheFiles();
|
||||
|
|
|
@ -34,7 +34,7 @@ class AppController extends Controller
|
|||
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
|
||||
|
||||
private $__queryVersion = '157';
|
||||
public $pyMispVersion = '2.4.179';
|
||||
public $pyMispVersion = '2.4.182';
|
||||
public $phpmin = '7.2';
|
||||
public $phprec = '7.4';
|
||||
public $phptoonew = '8.0';
|
||||
|
|
|
@ -626,6 +626,6 @@ class DefaultCorrelationBehavior extends ModelBehavior
|
|||
]);
|
||||
$Model->deleteAll([
|
||||
'Correlation.value_id' => $valueIds
|
||||
]);
|
||||
], false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -416,6 +416,6 @@ class NoAclCorrelationBehavior extends ModelBehavior
|
|||
]);
|
||||
$Model->deleteAll([
|
||||
'Correlation.value_id' => $valueIds
|
||||
]);
|
||||
], false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -153,8 +153,12 @@ class EventReport extends AppModel
|
|||
{
|
||||
$errors = array();
|
||||
if (!isset($report['EventReport']['uuid'])) {
|
||||
$errors[] = __('Event Report doesn\'t have an UUID');
|
||||
return $errors;
|
||||
if ($fromPull) {
|
||||
$report['EventReport']['uuid'] = $attribute['uuid'] = CakeText::uuid();
|
||||
} else {
|
||||
$errors[] = __('Event Report doesn\'t have an UUID');
|
||||
return $errors;
|
||||
}
|
||||
}
|
||||
$report['EventReport']['event_id'] = $eventId;
|
||||
$existingReport = $this->find('first', array(
|
||||
|
|
|
@ -52,6 +52,18 @@
|
|||
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
$isTotp = isset($this->request->data['User']['totp']) ? true : false;
|
||||
if ($isTotp) {
|
||||
echo sprintf(
|
||||
'<div class="clear"><span role="button" tabindex="0" aria-label="%s" onclick="openGenericModal(\'%s/users/totp_delete/%s\')" class="btn btn-inverse" style="margin-bottom:10px;">%s</span></div>',
|
||||
__('Delete TOTP token'),
|
||||
h($baseurl),
|
||||
h($this->request->data['User']['id']),
|
||||
__('Delete TOTP token')
|
||||
);
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
<?php
|
||||
|
|
Binary file not shown.
|
@ -1 +1 @@
|
|||
Subproject commit dbbb075b1c7154f27a096a35b483c826bdedec13
|
||||
Subproject commit e5b4209f3a88147985120215eb898e563e4976af
|
|
@ -1 +1 @@
|
|||
Subproject commit c18a240153cbe9ef68e46f05565d08653c2ad103
|
||||
Subproject commit 587b298e1e7f87426182d55d44aa045a1522dc98
|
|
@ -1 +1 @@
|
|||
Subproject commit 88d2e472b0cb41fa6a076be4f5b7e5240bfab285
|
||||
Subproject commit 260920bf7c9d8f678b0d69730acb17e9a34811f2
|
|
@ -1 +1 @@
|
|||
Subproject commit fbf99aae8f054072d0d3097f04d9f81e12835bdc
|
||||
Subproject commit e7255574c79b946365fdd066429d822730010726
|
|
@ -95,6 +95,9 @@ class EventGraph {
|
|||
// });
|
||||
});
|
||||
|
||||
this.network.on("doubleClick", function (params) {
|
||||
eventGraph.expand_node(params.nodes[0]);
|
||||
});
|
||||
this.network.on("dragStart", function (params) {
|
||||
eventGraph.physics_state(false);
|
||||
eventGraph.physics_activate_physics_for_nodes(params.nodes);
|
||||
|
|
|
@ -1132,7 +1132,7 @@ function mergeNodeAndModuleFilters(node, moduleFilters) {
|
|||
|
||||
/* API */
|
||||
function fetchWorkflow(id, callback) {
|
||||
var url = '/workflows/view/' + id + '.json'
|
||||
var url = baseurl + '/workflows/view/' + id + '.json'
|
||||
$.ajax({
|
||||
beforeSend: function () {
|
||||
toggleEditorLoading(true, 'Loading workflow')
|
||||
|
|
144
db_schema.json
144
db_schema.json
|
@ -8625,6 +8625,140 @@
|
|||
"extra": ""
|
||||
}
|
||||
],
|
||||
"user_login_profiles": [
|
||||
{
|
||||
"column_name": "id",
|
||||
"is_nullable": "NO",
|
||||
"data_type": "int",
|
||||
"character_maximum_length": null,
|
||||
"numeric_precision": "10",
|
||||
"collation_name": null,
|
||||
"column_type": "int(10) unsigned",
|
||||
"column_default": null,
|
||||
"extra": "auto_increment"
|
||||
},
|
||||
{
|
||||
"column_name": "created_at",
|
||||
"is_nullable": "NO",
|
||||
"data_type": "timestamp",
|
||||
"character_maximum_length": null,
|
||||
"numeric_precision": null,
|
||||
"collation_name": null,
|
||||
"column_type": "timestamp",
|
||||
"column_default": "current_timestamp()",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "user_id",
|
||||
"is_nullable": "NO",
|
||||
"data_type": "int",
|
||||
"character_maximum_length": null,
|
||||
"numeric_precision": "10",
|
||||
"collation_name": null,
|
||||
"column_type": "int(11)",
|
||||
"column_default": null,
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "status",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "ip",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "user_agent",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "accept_lang",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "geoip",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "ua_platform",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "ua_browser",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "ua_pattern",
|
||||
"is_nullable": "YES",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "191",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(191)",
|
||||
"column_default": "NULL",
|
||||
"extra": ""
|
||||
},
|
||||
{
|
||||
"column_name": "hash",
|
||||
"is_nullable": "NO",
|
||||
"data_type": "varchar",
|
||||
"character_maximum_length": "32",
|
||||
"numeric_precision": null,
|
||||
"collation_name": "utf8mb4_unicode_ci",
|
||||
"column_type": "varchar(32)",
|
||||
"column_default": null,
|
||||
"extra": ""
|
||||
}
|
||||
],
|
||||
"user_settings": [
|
||||
{
|
||||
"column_name": "id",
|
||||
|
@ -9531,6 +9665,14 @@
|
|||
"server_id": false,
|
||||
"sub": true
|
||||
},
|
||||
"user_login_profiles": {
|
||||
"geoip": false,
|
||||
"hash": true,
|
||||
"id": true,
|
||||
"ip": false,
|
||||
"status": false,
|
||||
"user_id": false
|
||||
},
|
||||
"user_settings": {
|
||||
"id": true,
|
||||
"setting": false,
|
||||
|
@ -9560,5 +9702,5 @@
|
|||
"uuid": false
|
||||
}
|
||||
},
|
||||
"db_version": "117"
|
||||
"db_version": "118"
|
||||
}
|
|
@ -6,7 +6,7 @@ misp-lib-stix2>=3.0.1.1
|
|||
mixbox>=1.0.5
|
||||
plyara>=2.1.1
|
||||
pydeep2>=0.5.1
|
||||
pymisp==2.4.179
|
||||
pymisp==2.4.182
|
||||
python-magic>=0.4.27
|
||||
pyzmq>=25.1.1
|
||||
redis>=5.0.1
|
||||
|
|
Loading…
Reference in New Issue