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

Merge remote-tracking branch 'origin/master' into testing 

Conflicts:
	bin/ZMQ_Sub_Urls.py
pull/20/head
Raphaël Vinot 2014-08-20 15:24:10 +02:00
parent cf814468e7 a84ffc9ef7
commit 2485ba5df2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/ZMQ_Sub_Urls.py
View File

@ -97,16 +97,15 @@ if __name__ == "__main__":
print hostl, asn, cc, \ print hostl, asn, cc, \
pycountry.countries.get(alpha2=cc).name pycountry.countries.get(alpha2=cc).name
if cc == cc_critical: if cc == cc_critical:
# FIXME: That's going to fail.
publisher.warning( publisher.warning(
'Url;{};{};{};Detected {} {} {}'.format( 'Url;{};{};{};Detected {} {}'.format(
PST.p_source, PST.p_date, PST.p_name, PST.p_source, PST.p_date, PST.p_name,
A_values[0], hostl, cc)) hostl, cc))
else: else:
print hostl, asn, cc print hostl, asn, cc
A_values = lib_refine.checking_A_record(r_serv2, A_values = lib_refine.checking_A_record(r_serv2,
domains_list) domains_list)
if A_values[0] >= 1: if A_values[0] >= 1:
PST.__setattr__(channel, A_values) PST.__setattr__(channel, A_values)
PST.save_attribute_redis(r_serv1, channel, PST.save_attribute_redis(r_serv1, channel,

6
bin/packages/Paste.py
View File

@ -117,6 +117,7 @@ class Paste(object):
if self.p_nb_lines is None or self.p_max_length_line is None: if self.p_nb_lines is None or self.p_max_length_line is None:
max_length_line = 0 max_length_line = 0
f = self.get_p_content_as_file() f = self.get_p_content_as_file()
line_id = 0
for line_id, line in enumerate(f): for line_id, line in enumerate(f):
length = len(line) length = len(line)
if length >= max_length_line: if length >= max_length_line:
@ -133,10 +134,7 @@ class Paste(object):
:Example: PST._set_p_encoding() :Example: PST._set_p_encoding()
""" """
try: return self.p_mime
return magic.Magic(mime_encoding=True).from_buffer(self.get_p_content())
except magic.MagicException:
pass
def _set_p_hash_kind(self, hashkind): def _set_p_hash_kind(self, hashkind):
""" """