[trigger/firewall] Copier/coller foireux

gestion/trigger/services/firewall.py

@@ -19,132 +19,3 @@ import gestion.iptools as iptools
 
 logger = clogger.CLogger("trigger.firewall", "debug")
 hostname = socket.gethostname().split(".")[0] + ".adm.crans.org"
-dhcp_omapi_keyname = secrets_new.get("dhcp_omapi_keyname")
-dhcp_omapi_key = secrets_new.get("dhcp_omapi_keys")[hostname]
-ldap_conn = lc_ldap.shortcuts.lc_ldap_readonly()
-
-def add_dhcp_host(mac, ip, name=None):
-    """Adds a dhcp host using omapi
-
-    """
-
-    if '<automatique>' in [ip, mac]:
-        return
-    msg = OmapiMessage.open(b"host")
-    msg.message.append((b"create", struct.pack("!I", 1)))
-    msg.message.append((b"exclusive", struct.pack("!I", 1)))
-    msg.obj.append((b"hardware-address", pack_mac(mac)))
-    msg.obj.append((b"hardware-type", struct.pack("!I", 1)))
-    msg.obj.append((b"ip-address", pack_ip(ip)))
-    if name:
-        msg.obj.append((b"name", bytes(name)))
-    conn = Omapi(hostname, 9991, dhcp_omapi_keyname, dhcp_omapi_key)
-    response = conn.query_server(msg)
-    conn.close()
-
-def delete_dhcp_host(self, mac, ip):
-    """Deletes dhcp host using omapi
-
-    """
-
-    if '<automatique>' in [ip, mac]:
-        return
-    msg = OmapiMessage.open(b"host")
-    msg.obj.append((b"hardware-address", pack_mac(mac)))
-    msg.obj.append((b"hardware-type", struct.pack("!I", 1)))
-    msg.obj.append((b"ip-address", pack_ip(ip)))
-    conn = Omapi(hostname, 9991, dhcp_omapi_keyname, dhcp_omapi_key)
-    response = conn.query_server(msg)
-    if response.opcode == OMAPI_OP_UPDATE:
-        response = conn.query_server(OmapiMessage.delete(response.handle))
-    conn.close()
-
-def lease_clean():
-    """Clean the lease file
-
-    """
-    # TODO : use ConfigFile structure
-    leasefile = open(dhcp_config.dhcplease)
-    newleasefile = open(dhcp_config.dhcplease + '.new', 'w')
-    config = ""
-    line = leasefile.readline()
-    write = True
-    while line:
-        if line.strip().startswith('host'):
-            write = False
-        if write:
-            newleasefile.write(line)
-        if not write and line.strip().endswith('}'):
-            write = True
-        line = leasefile.readline()
-    leasefile.close()
-    newleasefile.close()
-    os.rename(dhcp_config.dhcplease+'.new', dhcp_config.dhcplease)
-
-@record
-def dhcp(body={}):
-    """Regenerates dhcp service taking body into account.
-
-    """
-    if body and isinstance(body, dict):
-        for (mac, ip, name) in body.get("add", ()):
-            add_dhcp_host(mac, ip, name)
-        for (mac, ip) in body.get("delete", ()):
-            delete_dhcp_host(mac, ip)
-        for (rmac, rip, mac, ip, name) in body.get("update", ()):
-            delete_dhcp_host(rmac, rip)
-            add_dhcp_host(mac, ip, name)
-    elif body == True:
-        hosts = {}
-        host_template = """
-    host %(nom)s {
-        hardware ethernet %(mac)s;
-        fixed-address %(ip)s;
-        option host-name "%(host)s";
-    }
-"""
-        affichage.prettyDoin("Chargement des machines", "...")
-        machines = ldap_conn.allMachines()
-        affichage.prettyDoin("Chargement des machines", "Ok")
-        animation = affichage.Animation(texte="Génération de la configuration",
-                                        nb_cycles=len(machines),
-                                        couleur=True,
-                                        kikoo=True)
-
-        for machine in machines:
-            for net in dhcp_config.reseaux.keys():
-                ip = str(machine['ipHostNumber'][0])
-                mac = str(machine['macAddress'][0])
-                nom = str(machine['host'][0])
-                if '<automatique>' not in [ip, mac] and iptools.AddrInNet(ip, net):
-                    d = {'nom' : nom,
-                         'host' : nom.split(".", 1)[0],
-                         'mac' : mac,
-                         'ip' : ip,
-                        }
-                    try:
-                        hosts[net] += host_template % d
-                    except:
-                        hosts[net] = host_template % d
-            animation.new_step()
-        # Put a \n after the last iteration.
-        animation.end()
-
-        step = "Enregistrement de la configuration dans les fichiers"
-        affichage.prettyDoin(step, "...")
-        for (net, fichier) in dhcp_config.reseaux.items():
-            with ConfFile(fichier) as configFile:
-                configFile.header("#")
-                if hosts.has_key(net):
-                    configFile.write(hosts[net])
-        affichage.prettyDoin(step, "Ok")
-
-        step = "Nettoyage des fichiers de leases"
-        affichage.prettyDoin(step, "...")
-        try:
-            lease_clean()
-            affichage.prettyDoin(step, "Ok")
-        except:
-            affichage.prettyDoin(step, "Erreur")
-            print "During lease clean, an error occured."
-            raise