Commit dd83999d authored by Valentin Samir's avatar Valentin Samir
Browse files

[firewall4] La liste d'ip donnée par générate est incomplète

parent d447b954
......@@ -282,7 +282,8 @@ class firewall_base(object) :
def blacklist_maj(self, ips):
"""Met à jours les blacklists pour les ip présentent dans la liste ``ips``"""
self.blacklist_hard_maj(ips)
#self.blacklist_hard_maj(ips)
self.reload('blacklist_hard')
def raw_table(self):
"""Génère les règles pour la table ``raw`` et remplis les chaines de la table"""
......@@ -500,8 +501,12 @@ class firewall_komaz(firewall_base_routeur):
})
def blacklist_maj(self, ips):
self.blacklist_hard_maj(ips)
self.blacklist_soft_maj(ips)
#self.blacklist_hard_maj(ips)
#self.blacklist_soft_maj(ips)
#self.blacklist_upload_maj(ips)
self.reload('blacklist_hard')
self.reload('blacklist_soft')
self.reload('blacklist_upload')
def raw_table(self):
return
......@@ -1061,7 +1066,8 @@ class firewall_zamok(firewall_base):
def blacklist_maj(self, ips):
anim('\tMise à jour des blacklists')
self.blacklist_output('filter', apply=True)
self.blacklist_hard_maj(ips)
#self.blacklist_hard_maj(ips)
self.reload('blacklist_hard')
print OK
def blacklist_output(self, table=None, apply=False):
......
......@@ -96,7 +96,7 @@ class Ipset(object):
self.flush()
if self.squeeze:
self.destroy()
except IpsetError: pass
except IpsetError as error: sys.stderr.write("%s\n" % error)
cmd="cat %s | %s -R" % (path,self.ipset)
status,output=commands.getstatusoutput(cmd)
if status:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment