crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ipt] Pas de modification en place de la liste de blacklist de config.py

Browse source
This commit is contained in:
Valentin Samir 2013-09-07 18:54:05 +02:00
parent b3b43c361a
commit 86e2012132
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gestion/ipt.py
View file

@ -31,8 +31,9 @@ from ridtools import Rid, find_rid_plage
import subprocess import subprocess
import netaddr import netaddr
blacklist_sanctions.extend(blacklist_sanctions_soft) blacklist_sanctions_ipv6 = list(blacklist_sanctions)
blacklist_sanctions.extend(blacklist_bridage_upload) blacklist_sanctions_ipv6.extend(blacklist_sanctions_soft)
blacklist_sanctions_ipv6.extend(blacklist_bridage_upload)
Mangle_policy = """ Mangle_policy = """
*mangle *mangle
@ -756,7 +757,7 @@ def blacklist(ipt):
for target in s['adherent'] + s['club']: for target in s['adherent'] + s['club']:
sanctions = target.blacklist_actif() sanctions = target.blacklist_actif()
if [x for x in sanctions if x in blacklist_sanctions]: if [x for x in sanctions if x in blacklist_sanctions_ipv6]:
blcklst.extend(target.machines()) blcklst.extend(target.machines())
s = db.search('mblacklist=*&paiement=%s' % ann_scol) s = db.search('mblacklist=*&paiement=%s' % ann_scol)
@ -765,7 +766,7 @@ def blacklist(ipt):
for target in s['machine']: for target in s['machine']:
sanctions = target.blacklist_actif() sanctions = target.blacklist_actif()
if [x for x in sanctions if x in blacklist_sanctions]: if [x for x in sanctions if x in blacklist_sanctions_ipv6]:
blcklst.append(target) blcklst.append(target)
if ipt.filter.blacklist_src.items: if ipt.filter.blacklist_src.items: