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

[firewall4, generate, config] Ajout du firewall pour routeur, on ajoute une methode macip à zamok sur generate pour utiliser celle de firewall4

Browse source
This commit is contained in:
Valentin Samir 2013-04-07 18:20:53 +02:00
parent 24ff398376
commit 6f44de3e4d
3 changed files with 139 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

53
gestion/gen_confs/generate.py
View file

@ -38,22 +38,23 @@ db = crans_ldap()
make_lock('auto_generate', 'Big lock', nowait=1)
class base_reconfigure:
__blacklist_servers = [ 'komaz-blacklist', 'zamok-blacklist', 'routeur-blacklist' ]
__service_develop = {
'macip': [ 'redisdead-macip', 'zamok-macip', 'sable-macip', 'komaz-macip', 'gordon-macip',
'routeur-macip' ],
# 'droits': [ 'rouge-droits', 'ragnarok-droits' ],
'bl_carte_etudiant': [ 'komaz-blacklist', 'zamok-blacklist' ],
'bl_chbre_invalide': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_mail_invalide': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_virus': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_warez': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_ipv6_ra': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_upload': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_p2p': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_autodisc_virus': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_autodisc_upload': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_autodisc_p2p': [ 'komaz-blacklist', 'zamok-blacklist' ],
'blacklist_bloq': [ 'komaz-blacklist', 'zamok-blacklist' ],
'bl_carte_etudiant': __blacklist_servers,
'bl_chbre_invalide': __blacklist_servers,
'blacklist_mail_invalide': __blacklist_servers,
'blacklist_virus': __blacklist_servers,
'blacklist_warez': __blacklist_servers,
'blacklist_ipv6_ra': __blacklist_servers,
'blacklist_upload': __blacklist_servers,
'blacklist_p2p': __blacklist_servers,
'blacklist_autodisc_virus': __blacklist_servers,
'blacklist_autodisc_upload': __blacklist_servers,
'blacklist_autodisc_p2p': __blacklist_servers,
'blacklist_bloq': __blacklist_servers,
'del_user': [ 'daath-del_user', 'owl-del_user', 'zamok-del_user' ]
}
#Y R U Aliasing !
@ -215,9 +216,19 @@ class zamok(base_reconfigure):
from adherents import del_user
self._do(del_user(args))
def __fw(self):
if not hasattr(self, '__real_fw'):
from firewall4 import firewall_zamok
self.__real_fw = firewall_zamok()
return self.__real_fw
def blacklist(self, ips):
from firewall4 import firewall_zamok
firewall_zamok().blacklist_maj(ips)
cprint(u"Mise a jour des blacklists", 'gras')
self.__fw().blacklist_maj(ips)
def macip(self, ips):
cprint(u"Mise a jour correspondance MAC-IP", 'gras')
self.__fw().mac_ip_maj(ips)
class daath(base_reconfigure):
def home(self, args):
@ -293,7 +304,19 @@ class charybde(base_reconfigure):
pass
class routeur(base_reconfigure):
pass
def __fw(self):
if not hasattr(self, '__real_fw'):
from firewall4 import firewall_routeur
self.__real_fw = firewall_routeur()
return self.__real_fw
def blacklist(self, ips):
cprint(u"Mise a jour des blacklists", 'gras')
self.__fw().blacklist_maj(ips)
def macip(self, ips):
cprint(u"Mise a jour correspondance MAC-IP", 'gras')
self.__fw().mac_ip_maj(ips)
class gordon(base_reconfigure) :
def dhcp(self):