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

Merge branch '2.4' of github.com:MISP/MISP into pr-5210

pull/5615/head
mokaddem 2020-02-10 13:41:26 +01:00
parent 6e66256f7a 2dbd994cca
commit 2bdc11b5d4
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -1162,7 +1162,6 @@ class AppController extends Controller
public function restSearch()
{
$ordered_url_params = func_get_args();
if (empty($this->RestSearch->paramArray[$this->modelClass])) {
throw new NotFoundException(__('RestSearch is not implemented (yet) for this scope.'));
}
@ -1185,7 +1184,6 @@ class AppController extends Controller
if ($filters === false) {
return $exception;
}
$list = array();
$key = empty($filters['key']) ? $filters['returnFormat'] : $filters['key'];
$user = $this->_getApiAuthUser($key, $exception);
if ($user === false) {

2
app/View/Servers/add.ctp
View File

@ -74,7 +74,7 @@
echo sprintf(
'<div id="AuthkeyContainer"><p class="red clear" style="width:50%%;">%s</p>%s</div>',
__('Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user\'s credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance.'),
$this->Form->input('authkey', array())
$this->Form->input('authkey', array('autocomplete' => 'off'))
);
echo '<div class = "input clear" style="width:100%;"><hr /></div>';
echo '<h4 class="input clear">' . __('Enabled synchronisation methods') . '</h4>';

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 5a299129122558bcebefcbc95f827a63f1d99097
Subproject commit 659264240a82893e22df6dccdf8fbdced6398b43