mirror of https://github.com/MISP/MISP
new: [usagedata widget] upgraded
- allows for filtering based on organisation metadata - shows changes in current month - fixed several invalid statistics - moved all individual statistics to separate functions for readability - removed permission restriction - the data is only showing aggregatesnew_widgets
iglocska
parent
984be50b75
commit
e5cd415579
|
|
@ -5,40 +5,82 @@ class UsageDataWidget
|
|||
public $render = 'SimpleList';
|
||||
public $width = 2;
|
||||
public $height = 5;
|
||||
public $params = array();
|
||||
public $description = 'Shows usage data / statistics.';
|
||||
public $cacheLifetime = false;
|
||||
public $autoRefreshDelay = 3;
|
||||
public $params = [
|
||||
'filter' => 'A list of filters by organisation meta information (nationality, sector, type, name, uuid) to include. (dictionary, prepending values with ! uses them as a negation)',
|
||||
];
|
||||
private $User = null;
|
||||
private $Event = null;
|
||||
private $Correlation = null;
|
||||
private $Thread = null;
|
||||
private $AuthKey = null;
|
||||
|
||||
private $validFilterKeys = [
|
||||
'nationality',
|
||||
'sector',
|
||||
'type',
|
||||
'name',
|
||||
'uuid'
|
||||
];
|
||||
|
||||
private $validFields = [
|
||||
'Events',
|
||||
'Attributes',
|
||||
'Attributes / event',
|
||||
'Correlations',
|
||||
'Active proposals',
|
||||
'Users',
|
||||
'Users with PGP keys',
|
||||
'Organisations',
|
||||
'Local organisations',
|
||||
'Event creator orgs',
|
||||
'Average users / org',
|
||||
'Discussion threads',
|
||||
'Discussion posts'
|
||||
];
|
||||
|
||||
public function handler($user, $options = array()){
|
||||
$this->User = ClassRegistry::init('User');
|
||||
|
||||
$orgsCount = $this->User->Organisation->find('count');
|
||||
$localOrgsParams['conditions']['Organisation.local'] = 1;
|
||||
$localOrgsCount = $this->User->Organisation->find('count', $localOrgsParams);
|
||||
|
||||
$thisMonth = strtotime('first day of this month');
|
||||
$this->Event = ClassRegistry::init('Event');
|
||||
$eventsCount = $this->Event->find('count', array('recursive' => -1));
|
||||
$eventsCountMonth = $this->Event->find('count', array('conditions' => array('Event.timestamp >' => $thisMonth), 'recursive' => -1));
|
||||
|
||||
$this->Attribute = ClassRegistry::init('Attribute');
|
||||
$attributesCount = $this->Attribute->find('count', array('conditions' => array('Attribute.deleted' => 0), 'recursive' => -1));
|
||||
$attributesCountMonth = $this->Attribute->find('count', array('conditions' => array('Attribute.timestamp >' => $thisMonth, 'Attribute.deleted' => 0), 'recursive' => -1));
|
||||
$attributesPerEvent = round($attributesCount / $eventsCount);
|
||||
|
||||
$this->Correlation = ClassRegistry::init('Correlation');
|
||||
$correlationsCount = $this->Correlation->find('count', array('recursive' => -1)) / 2;
|
||||
|
||||
$proposalsCount = $this->Event->ShadowAttribute->find('count', array('recursive' => -1, 'conditions' => array('deleted' => 0)));
|
||||
|
||||
$usersCount = $this->User->find('count', array('recursive' => -1));
|
||||
$usersCountPgp = $this->User->find('count', array('recursive' => -1, 'conditions' => array('User.gpgkey !=' => '')));
|
||||
$usersCountPgpPercentage = round(100* ($usersCountPgp / $usersCount), 1);
|
||||
$contributingOrgsCount = $this->Event->find('count', array('recursive' => -1, 'group' => array('Event.orgc_id')));
|
||||
$averageUsersPerOrg = round($usersCount / $localOrgsCount, 1);
|
||||
|
||||
$this->Thread = ClassRegistry::init('Thread');
|
||||
$this->Correlation = ClassRegistry::init('Correlation');
|
||||
$thisMonth = strtotime('first day of this month');
|
||||
$orgConditions = [];
|
||||
$orgIdList = null;
|
||||
if (!empty($options['filter']) && is_array($options['filter'])) {
|
||||
foreach ($this->validFilterKeys as $filterKey) {
|
||||
if (!empty($options['filter'][$filterKey])) {
|
||||
if (!is_array($options['filter'][$filterKey])) {
|
||||
$options['filter'][$filterKey] = [$options['filter'][$filterKey]];
|
||||
}
|
||||
$tempConditionBucket = [];
|
||||
foreach ($options['filter'][$filterKey] as $value) {
|
||||
if ($value[0] === '!') {
|
||||
$tempConditionBucket['Organisation.' . $filterKey . ' NOT IN'][] = mb_substr($value, 1);
|
||||
} else {
|
||||
$tempConditionBucket['Organisation.' . $filterKey . ' IN'][] = $value;
|
||||
}
|
||||
}
|
||||
if (!empty($tempConditionBucket)) {
|
||||
$orgConditions[] = $tempConditionBucket;
|
||||
}
|
||||
}
|
||||
}
|
||||
$orgIdList = $this->User->Organisation->find('column', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $orgConditions,
|
||||
'fields' => ['Organisation.id']
|
||||
]);
|
||||
}
|
||||
$eventsCount = $this->getEventsCount($orgConditions, $orgIdList, $thisMonth);
|
||||
$attributesCount = $this->getAttributesCount($orgConditions, $orgIdList, $thisMonth);
|
||||
$usersCount = $this->getUsersCount($orgConditions, $orgIdList, $thisMonth);
|
||||
$usersCountPgp = $this->getUsersCountPgp($orgConditions, $orgIdList, $thisMonth);
|
||||
$localOrgsCount = $this->getLocalOrgsCount($orgConditions, $orgIdList, $thisMonth);
|
||||
|
||||
|
||||
$threadCount = $this->Thread->find('count', array('conditions' => array('Thread.post_count >' => 0), 'recursive' => -1));
|
||||
$threadCountMonth = $this->Thread->find('count', array('conditions' => array('Thread.date_created >' => date("Y-m-d H:i:s", $thisMonth), 'Thread.post_count >' => 0), 'recursive' => -1));
|
||||
|
||||
|
|
@ -47,21 +89,69 @@ class UsageDataWidget
|
|||
|
||||
//Monhtly data is not added to the widget at the moment, could optionally add these later and give user choice?
|
||||
|
||||
$statistics = array(
|
||||
array('title' => 'Events', 'value' => $eventsCount),
|
||||
array('title' => 'Attributes', 'value' => $attributesCount),
|
||||
array('title' => 'Attributes / event', 'value' => $attributesPerEvent),
|
||||
array('title' => 'Correlations', 'value' => $correlationsCount),
|
||||
array('title' => 'Active proposals', 'value' => $proposalsCount),
|
||||
array('title' => 'Users', 'value' => $usersCount),
|
||||
array('title' => 'Users with PGP keys', 'value' => $usersCountPgp . ' (' . $usersCountPgpPercentage . '%)'),
|
||||
array('title' => 'Organisations', 'value' => $orgsCount),
|
||||
array('title' => 'Local organisations', 'value' => $localOrgsCount),
|
||||
array('title' => 'Event creator orgs', 'value' => $contributingOrgsCount),
|
||||
array('title' => 'Average users / org', 'value' => $averageUsersPerOrg),
|
||||
array('title' => 'Discussions threads', 'value' => $threadCount),
|
||||
array('title' => 'Discussion posts', 'value' => $postCount)
|
||||
);
|
||||
$statistics = [
|
||||
'Events' => [
|
||||
'title' => 'Events',
|
||||
'value' => $eventsCount,
|
||||
'change' => $this->getEventsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Attributes' => [
|
||||
'title' => 'Attributes',
|
||||
'value' => $attributesCount,
|
||||
'change' => $this->getAttributesCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Attributes / event' => [
|
||||
'title' => 'Attributes / event',
|
||||
'value' => $eventsCount ? round($attributesCount / $eventsCount) : 0
|
||||
],
|
||||
'Correlations' => [
|
||||
'title' => 'Correlations',
|
||||
'value' => $this->getCorrelationsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Active proposals' => [
|
||||
'title' => 'Active proposals',
|
||||
'value' => $this->getProposalsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Users' => [
|
||||
'title' => 'Users',
|
||||
'value' => $usersCount,
|
||||
'change' => $this->getUsersCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Users with PGP keys' => [
|
||||
'title' => 'Users with PGP keys',
|
||||
'value' => sprintf(
|
||||
'%s (%s %%)',
|
||||
$usersCountPgp,
|
||||
$usersCount ? round(100* ($usersCountPgp / $usersCount), 1) : 0
|
||||
)
|
||||
],
|
||||
'Organisations' => [
|
||||
'title' => 'Organisations',
|
||||
'value' => $this->getOrgsCount($orgConditions, $orgIdList, $thisMonth),
|
||||
'change' => $this->getOrgsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Local organisations' => [
|
||||
'title' => 'Local organisations',
|
||||
'value' => $localOrgsCount,
|
||||
'change' => $this->getLocalOrgsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Event creator orgs' => [
|
||||
'title' => 'Event creator orgs', 'value' => $this->getContributingOrgsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Average users / org' => [
|
||||
'title' => 'Average users / org', 'value' => round($usersCount / $localOrgsCount, 1)
|
||||
],
|
||||
'Discussion threads' => [
|
||||
'title' => 'Discussions threads',
|
||||
'value' => $this->getThreadsCount($orgConditions, $orgIdList, $thisMonth),
|
||||
'change' => $this->getThreadsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
],
|
||||
'Discussion posts' => [
|
||||
'title' => 'Discussion posts',
|
||||
'value' => $this->getPostsCount($orgConditions, $orgIdList, $thisMonth),
|
||||
'change' => $this->getPostsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
]
|
||||
];
|
||||
if(!empty(Configure::read('Security.advanced_authkeys'))){
|
||||
$this->AuthKey = ClassRegistry::init('AuthKey');
|
||||
$authkeysCount = $this->AuthKey->find('count', array('recursive' => -1));
|
||||
|
|
@ -70,6 +160,233 @@ class UsageDataWidget
|
|||
return $statistics;
|
||||
}
|
||||
|
||||
private function getEventsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Event->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getCorrelationsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['AND']['OR'][] = ['Correlation.org_id IN' => $orgIdList];
|
||||
$conditions['AND']['OR'][] = ['Correlation.1_org_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Correlation->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getEventsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['Event.timestamp >' => $thisMonth];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Event->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getAttributesCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['Attribute.deleted' => 0];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Event->Attribute->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'contain' => ['Event'],
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getAttributesCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['Attribute.timestamp >' => $thisMonth, 'Attribute.deleted' => 0];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Event->Attribute->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'contain' => 'Event.orgc_id',
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getOrgsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
return $this->User->Organisation->find('count', [
|
||||
'conditions' => [
|
||||
'AND' => $orgConditions
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
private function getOrgsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$datetime = new DateTime();
|
||||
$datetime->setTimestamp($thisMonth);
|
||||
$thisMonth = $datetime->format('Y-m-d H:i:s');
|
||||
return $this->User->Organisation->find('count', [
|
||||
'conditions' => [
|
||||
'AND' => $orgConditions,
|
||||
'Organisation.date_created >' => $thisMonth
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
private function getLocalOrgsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
return $this->User->Organisation->find('count', [
|
||||
'conditions' => [
|
||||
'Organisation.local' => 1,
|
||||
'AND' => $orgConditions
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
private function getLocalOrgsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$datetime = new DateTime();
|
||||
$datetime->setTimestamp($thisMonth);
|
||||
$thisMonth = $datetime->format('Y-m-d H:i:s');
|
||||
return $this->User->Organisation->find('count', [
|
||||
'conditions' => [
|
||||
'Organisation.local' => 1,
|
||||
'AND' => $orgConditions,
|
||||
'Organisation.date_created >' => $thisMonth
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
private function getProposalsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['deleted' => 0];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['ShadowAttribute.org_id IN'] = $orgIdList;
|
||||
}
|
||||
return $this->Event->ShadowAttribute->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getUsersCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['User.org_id IN'] = $orgIdList;
|
||||
}
|
||||
return $this->User->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getUsersCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['User.date_created >' => $thisMonth];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['User.org_id IN'] = $orgIdList;
|
||||
}
|
||||
return $this->User->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getUsersCountPgp($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['User.gpgkey !=' => ''];
|
||||
if (!empty($orgIdList)) {
|
||||
$conditions['User.org_id IN'] = $orgIdList;
|
||||
}
|
||||
return $this->User->find('count', [
|
||||
'recursive' => -1,
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getContributingOrgsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [];
|
||||
if ($orgConditions) {
|
||||
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Event->find('count', [
|
||||
'recursive' => -1,
|
||||
'group' => ['Event.orgc_id'],
|
||||
'conditions' => $conditions
|
||||
]);
|
||||
}
|
||||
|
||||
private function getThreadsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = ['Thread.post_count >' => 0];
|
||||
if ($orgConditions) {
|
||||
$conditions['AND'][] = ['Thread.org_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Thread->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getThreadsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [
|
||||
'Thread.post_count >' => 0,
|
||||
'Thread.date_created >=' => $thisMonth
|
||||
];
|
||||
if ($orgConditions) {
|
||||
$conditions['AND'][] = ['Thread.org_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Thread->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getPostsCount($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [];
|
||||
if ($orgConditions) {
|
||||
$conditions['AND'][] = ['User.org_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Thread->Post->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'contain' => ['User.org_id'],
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
private function getPostsCountMonth($orgConditions, $orgIdList, $thisMonth)
|
||||
{
|
||||
$conditions = [
|
||||
'Post.date_created >=' => $thisMonth
|
||||
];
|
||||
if ($orgConditions) {
|
||||
$conditions['AND'][] = ['User.org_id IN' => $orgIdList];
|
||||
}
|
||||
return $this->Thread->Post->find('count', [
|
||||
'conditions' => $conditions,
|
||||
'contain' => ['User.org_id'],
|
||||
'recursive' => -1
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
/* There is nothing sensitive in here.
|
||||
public function checkPermissions($user)
|
||||
{
|
||||
if (empty($user['Role']['perm_site_admin'])) {
|
||||
|
|
@ -77,4 +394,5 @@ class UsageDataWidget
|
|||
}
|
||||
return true;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue