CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Fixeed bug in Duplicate (The comparison value was not saved correctly in redis) + Modified to progression detection algo

pull/65/head
Mokaddem 2016-08-08 15:28:26 +02:00
parent aedb3198cd
commit 60512a30a2
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/Duplicate_ssdeep_v2.py
View File

@ -120,6 +120,7 @@ if __name__ == "__main__":
percent = 100-ssdeep.compare(dico_hash, paste_hash) if hash_type == 'ssdeep' else tlsh.diffxlen(dico_hash, paste_hash) percent = 100-ssdeep.compare(dico_hash, paste_hash) if hash_type == 'ssdeep' else tlsh.diffxlen(dico_hash, paste_hash)
threshold_duplicate = threshold_set[hash_type] threshold_duplicate = threshold_set[hash_type]
if percent < threshold_duplicate: if percent < threshold_duplicate:
percent = 100 - percent if hash_type == 'ssdeep' else percent #recovert the correct percent value for ssdeep
# Go throught the Database of the dico filter (month) # Go throught the Database of the dico filter (month)
r_serv_dico = dico_redis[curr_dico_name] r_serv_dico = dico_redis[curr_dico_name]

15
bin/WebStats.py
View File

@ -49,15 +49,24 @@ def compute_progression(server, field_name, num_day, url_parsed):
keyword = url_parsed[field_name] keyword = url_parsed[field_name]
if keyword is not None: if keyword is not None:
date_range = get_date_range(num_day) date_range = get_date_range(num_day)
# check if this keyword is eligible for progression # check if this keyword is eligible for progression
keyword_total_sum = 0 keyword_total_sum = 0
value_list = [] value_list = []
for date in date_range: for date in date_range: # get value up to date_range
curr_value = server.hget(keyword, date) curr_value = server.hget(keyword, date)
value_list.append(int(curr_value if curr_value is not None else 0)) value_list.append(int(curr_value if curr_value is not None else 0))
keyword_total_sum += int(curr_value) if curr_value is not None else 0 keyword_total_sum += int(curr_value) if curr_value is not None else 0
oldest_value = value_list[-1] if value_list[-1] != 0 else 1 #Avoid zero division oldest_value = value_list[-1] if value_list[-1] != 0 else 1 #Avoid zero division
keyword_increase = value_list[0] / oldest_value
# The progression is based on the ratio: value[i] / value[i-1]
keyword_increase = 0
value_list_reversed = value_list[:]
value_list_reversed.reverse()
for i in range(1, len(value_list_reversed)):
divisor = value_list_reversed[i-1] if value_list_reversed[i-1] != 0 else 1
keyword_increase += value_list_reversed[i] / divisor
# filter # filter
if (keyword_total_sum > threshold_total_sum) and (keyword_increase > threshold_increase): if (keyword_total_sum > threshold_total_sum) and (keyword_increase > threshold_increase):
@ -66,7 +75,7 @@ def compute_progression(server, field_name, num_day, url_parsed):
server.hset(redis_progression_name, keyword, keyword_increase) #update its value server.hset(redis_progression_name, keyword, keyword_increase) #update its value
elif (server.scard(redis_progression_name_set) < max_set_cardinality): elif (server.scard(redis_progression_name_set) < max_set_cardinality):
server.sadd(redis_progression_name_set, keyword) server.sadd(redis_progression_name_set, keyword)
else: #not in the set else: #not in the set
#Check value for all members #Check value for all members