diff --git a/gestion/gen_confs/firewall.py b/gestion/gen_confs/firewall.py index d578214f..09ae8c44 100755 --- a/gestion/gen_confs/firewall.py +++ b/gestion/gen_confs/firewall.py @@ -838,7 +838,6 @@ class firewall_komaz(firewall_crans) : def blacklist(self): """ Construit les chaînes de blackliste (BLACKLIST_{DST,SRC}) """ - self.anim = anim("\tBlackliste") iptables('-F BLACKLIST_DST') iptables('-F BLACKLIST_SRC') @@ -849,6 +848,7 @@ class firewall_komaz(firewall_crans) : # Recherche sur le champ ablacklist (clubs compris) search = db.search('ablacklist=*&paiement=%s' % ann_scol) + self.anim = anim("\tBlackliste machines", len(search['adherent']+search['club'])) for entite in search['adherent'] + search['club']: self.anim.cycle() sanctions = entite.blacklist_actif() @@ -856,9 +856,12 @@ class firewall_komaz(firewall_crans) : if s in sanctions: blacklist.extend(entite.machines()) break - + self.anim.reinit() + print OK + # Recherche sur le champ mblacklist search = db.search('mblacklist=*&paiement=%s' % ann_scol) + self.anim = anim("\tBlackliste adhérents", len(search['machine'])) for entite in search['machine']: self.anim.cycle() sanctions = entite.blacklist_actif() @@ -866,11 +869,14 @@ class firewall_komaz(firewall_crans) : if s in sanctions: blacklist.append(entite) break + self.anim.reinit() + print OK + self.anim = anim("\tChaînes BLACKLISTE", len(blacklist)) for machine in blacklist: + self.anim.cycle() iptables("-A BLACKLIST_DST -d %s -j REJECT --reject-with icmp-host-prohibited" % machine.ip()) iptables("-A BLACKLIST_SRC -s %s -j REJECT --reject-with icmp-host-prohibited" % machine.ip()) - self.anim.reinit() print OK