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

update: Clear separation between login and contribution to have 

meaningful query and contribution/login score.
pull/24/head
Sami Mokaddem 2017-12-05 16:31:08 +01:00
parent 2e74c418fb
commit a52bf6ced5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpers/contributor_helper.py
View File

@ -124,8 +124,8 @@ class Contributor_helper:
nowSec = int(time.time()) nowSec = int(time.time())
pnts_to_add = self.default_pnts_per_contribution pnts_to_add = self.default_pnts_per_contribution
# if there is a contribution, there is a login (even if it comes from the API) # Do not consider contribution as login anymore
self.users_helper.add_user_login(nowSec, org) #self.users_helper.add_user_login(nowSec, org)
# is a valid contribution # is a valid contribution
if categ is not None: if categ is not None:

16
helpers/users_helper.py
View File

@ -66,11 +66,11 @@ class Users_helper:
# return: All dates for all orgs, if date is not supplied, return for all dates # return: All dates for all orgs, if date is not supplied, return for all dates
def getUserLogins(self, date=None): def getUserLogins(self, date=None):
# get all orgs and retreive their timestamps # get all orgs and retreive their timestamps
timestamps = [] dates = []
for org in self.getAllOrg(): for org in self.getAllOrg():
keyname = "{}:{}".format(self.keyOrgLog, org) keyname = "{}:{}".format(self.keyOrgLog, org)
timestamps += self.getDates(org, date) dates += self.getDates(org, date)
return timestamps return dates
# return: All orgs that logged in for the time spanned # return: All orgs that logged in for the time spanned
def getAllLoggedInOrgs(self, date, prev_days=31): def getAllLoggedInOrgs(self, date, prev_days=31):
@ -91,7 +91,7 @@ class Users_helper:
log = self.serv_redis_db.zscore(keyname_log.format(self.keyOrgLog, util.getDateStrFormat(curDate)), org) log = self.serv_redis_db.zscore(keyname_log.format(self.keyOrgLog, util.getDateStrFormat(curDate)), org)
log = 0 if log is None else 1 log = 0 if log is None else 1
contrib = self.serv_redis_db.zscore(keyname_contrib.format(self.keyContribDay, util.getDateStrFormat(curDate)), org) contrib = self.serv_redis_db.zscore(keyname_contrib.format(self.keyContribDay, util.getDateStrFormat(curDate)), org)
contrib = 0 if contrib is None else 1 contrib = 0 if contrib is None else contrib
data.append([log, contrib]) data.append([log, contrib])
return data return data
@ -184,11 +184,13 @@ class Users_helper:
keyname = "{}:{}".format(self.keyContribDay, util.getDateStrFormat(curDate)) keyname = "{}:{}".format(self.keyContribDay, util.getDateStrFormat(curDate))
if org is None: if org is None:
orgs_contri = self.serv_redis_db.zrange(keyname, 0, -1, desc=True, withscores=False) orgs_contri = self.serv_redis_db.zrange(keyname, 0, -1, desc=True, withscores=True)
orgs_contri_num = len(orgs_contri) orgs_contri_num = 0
for org, count in orgs_contri:
orgs_contri_num += count
else: else:
orgs_contri_num = self.serv_redis_db.zscore(keyname, org) orgs_contri_num = self.serv_redis_db.zscore(keyname, org)
orgs_contri_num = 1 if orgs_contri_num is not None else 0 orgs_contri_num = orgs_contri_num if orgs_contri_num is not None else 0
for curDate in util.getHoursSpanOfDate(curDate, adaptToFitCurrentTime=True): #fill hole day for curDate in util.getHoursSpanOfDate(curDate, adaptToFitCurrentTime=True): #fill hole day
dico_hours_contrib[util.getTimestamp(curDate)] = orgs_contri_num dico_hours_contrib[util.getTimestamp(curDate)] = orgs_contri_num