diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index a351e41d..61f31b9d 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -438,7 +438,8 @@ for ip, id_p2p, nombre in fraudeurs : machine = ldap.search('ipHostNumber=%s' % ip,'w' )['machine'][0] hostname = machine.nom() proprio = machine.proprietaire() - + blacklist = proprio.blacklist() + # Envoie du mail à disconnect if p2p.disconnect_mail : corps = p2p.avertissement % { 'From': upload.expediteur, 'To': upload.expediteur, 'protocole': protocole, 'hostname':hostname} @@ -453,12 +454,19 @@ for ip, id_p2p, nombre in fraudeurs : ################################ corps = p2p.deconnection % {'From':upload.expediteur, 'To':proprio.email(), 'protocole': protocole, 'hostname':hostname} corps = corps.encode('iso 8859-15') - #mail.sendmail(upload.expediteur,proprio.email(),corps) + mail.sendmail(upload.expediteur,proprio.email(),corps) + + + index = [blacklist.index(x) for x in blacklist if 'P2P' in x ] + if index : + # adhérent déja blacklisté + fin = localtime(time()+60*60*24) + proprio.blacklist(( index[0] , ['now',"%d/%d/%d %d:%d" % (fin[2],fin[1],fin[0],fin[3],fin[4]),'virus',hostname] )) + proprio.save() + else : + # adhérent non blacklisté + proprio.blacklist(['now',"%d/%d/%d %d:%d" % (fin[2],fin[1],fin[0],fin[3],fin[4]),'virus',hostname]) + proprio.save() + + - # Blacklistage - debut = localtime(time()) - #7 jours - fin = localtime(time()+60*60*24) - # proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),"%d/%d/%d %d:%d" % (fin[2],fin[1],fin[0],fin[3],fin[4]),'p2p',"P2P %s (auto)" % protocole]) - proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),"%d/%d/%d %d:%d" % (fin[2],fin[1],fin[0],fin[3],fin[4]),'autodisc',"P2P %s (auto)" % protocole]) - proprio.save()