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

chg: [ipUser] API now accepts lists of IPs 

{
    "ip": ["8.8.8.8", "1.1.1.1"]
}
pull/8216/head
iglocska 2022-03-10 13:47:27 +01:00
parent 7174b86999
commit 86832556a4
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/Controller/ServersController.php
View File

@ -2727,33 +2727,39 @@ misp.direct_call(relative_path, body)
}
}
public function ipUser($ip = false)
public function ipUser($input = false)
{
$params = $this->IndexFilter->harvestParameters(['ip']);
if (!empty($params['ip'])) {
$ip = $params['ip'];
$input = $params['ip'];
}
$redis = $this->Server->setupRedis();
if (!filter_var($ip, FILTER_VALIDATE_IP)) {
throw new InvalidArgumentException(__('No valid IP provided.'));
if (!is_array($input)) {
$input = [$input];
}
$user_id = $redis->get('misp:ip_user:' . $ip);
if (empty($user_id)) {
throw new NotFoundException(__('No hits for the provided IP.'));
$users = [];
foreach ($input as $ip) {
if (!filter_var($ip, FILTER_VALIDATE_IP)) {
continue;
}
$user_id = $redis->get('misp:ip_user:' . $ip);
if (empty($user_id)) {
continue;
}
$this->loadModel('User');
$user = $this->User->find('first', [
'recursive' => -1,
'conditions' => ['User.id' => $user_id],
'contain' => ['Organisation.name']
]);
if (empty($user)) {
throw new NotFoundException(__('User not found (perhaps it has been removed?).'));
}
$users[$ip] = [
'id' => $user['User']['id'],
'email' => $user['User']['email'],
];
}
$this->loadModel('User');
$user = $this->User->find('first', [
'recursive' => -1,
'conditions' => ['User.id' => $user_id],
'contain' => ['Organisation.name']
]);
if (empty($user)) {
throw new NotFoundException(__('User not found (perhaps it has been removed?).'));
}
$user = [
'id' => $user['User']['id'],
'email' => $user['User']['email'],
];
return $this->RestResponse->viewData($user, $this->response->type());
return $this->RestResponse->viewData($users, $this->response->type());
}
}