firewall/celery: added fw.py

firewall/tasks.py

@@ -56,7 +56,7 @@ class ReloadTask(Task):
                 if not sleep:
                 if not sleep:
                     sleep = True
                     sleep = True
                     time.sleep(10)
                     time.sleep(10)
-                reload_blacklist_task(ipset())
+                reload_blacklist_task.delay(list(ipset()))
 
 
         print type
         print type
 
 

miscellaneous/celery/fw.py

+from celery import Celery, task
+import subprocess
+import time, re
+
+CELERY_CREATE_MISSING_QUEUES=True
+celery = Celery('tasks', broker='amqp://nyuszi:teszt@localhost:5672/django')
+
+@task(name="firewall.tasks.reload_firewall_task")
+def t(data4, data6):
+    print "fw"
+#    return
+#    print "\n".join(data6['filter']) + "\n"
+    process = subprocess.Popen(['/usr/bin/sudo', '/sbin/ip6tables-restore', '-c'], shell=False, stdin=subprocess.PIPE)
+    process.communicate("\n".join(data6['filter']) + "\n")
+    process = subprocess.Popen(['/usr/bin/sudo', '/sbin/iptables-restore', '-c'], shell=False, stdin=subprocess.PIPE)
+    process.communicate("\n".join(data4['filter']) + "\n" + "\n".join(data4['nat']) + "\n")
+
+@task(name="firewall.tasks.reload_dhcp_task")
+def t(data):
+    print "dhcp"
+#    return
+    with open('/tools/dhcp3/dhcpd.conf.generated', 'w') as f:
+        f.write("\n".join(data)+"\n")
+    subprocess.call(['sudo', '/etc/init.d/isc-dhcp-server', 'restart'], shell=False)
+
+@task(name="firewall.tasks.reload_blacklist_task")
+def t(data):
+    print "blacklist"
+    r = re.compile(r'^add blacklist ([0-9.]+)$')
+
+    data_new = data
+    data_old = []
+
+    p = subprocess.Popen(['/usr/bin/sudo', '/usr/sbin/ipset', 'save', 'blacklist'], shell=False, stdout=subprocess.PIPE)
+    for line in p.stdout:
+        x = r.match(line.rstrip())
+        if x:
+            data_old.append(x.group(1))
+
+    l_add = list(set(data).difference(set(data_old)))
+    l_del = list(set(data_old).difference(set(data)))
+
+    ipset = []
+    ipset.append('create blacklist hash:ip family inet hashsize 4096 maxelem 65536')
+    ipset = ipset + [ 'add blacklist %s' % x for x in l_add ]
+    ipset = ipset + [ 'del blacklist %s' % x for x in l_del ]
+
+    print "\n".join(ipset) + "\n"
+
+    p = subprocess.Popen(['/usr/bin/sudo', '/usr/sbin/ipset', 'restore', '-exist'], shell=False, stdin=subprocess.PIPE)
+    p.communicate("\n".join(ipset) + "\n")
+
+