1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00

Indentation

This commit is contained in:
Titoko 2012-12-12 17:15:12 +01:00
parent a7a3db1eaa
commit 11cdbe3245

View file

@ -10,11 +10,12 @@ except ImportError:
sys.exit(1)
def firewall_allow(protocol=None,port=None,ip=None):
if ip == true:
ip = 'ipv6'
iptables="ip6tables"
else
else:
ip = 'ipv4'
iptables="iptables"
@ -32,11 +33,12 @@ def firewall_allow(protocol=None,port=None,ip=None):
os.system(rule)
def firewall_disallow(protocol=None,port=None,ip=None):
if ip == true:
ip = 'ipv6'
else
else:
ip = 'ipv4'
if protocol == "Both":
@ -52,6 +54,7 @@ def firewall_disallow(protocol=None,port=None,ip=None):
os.system(rule)
def firewall_list():
'''
Parse and display firwall.yml
@ -63,20 +66,25 @@ def firewall_list():
TCP_port_list_ipv6 = firewall['ipv6']['TCP']
UDP_port_list_ipv6 = firewall['ipv6']['UDP']
print("Port TCP Open for ipv4:")
for i,port in enumerate (TCP_port_list_ipv4):
print("-"+str(port))
print("Port UDP Open for ipv4 :")
for i,port in enumerate (UDP_port_list_ipv4):
print("-"+str(port))
print("Port TCP Open for ipv6:")
for i,port in enumerate (TCP_port_list_ipv6):
print("-"+str(port))
print("Port UDP Open for ipv6 :")
for i,port in enumerate (UDP_port_list_ipv6):
print("-"+str(port))
f.close()
def firewall_reload():
'''
Clear filter IPTABLE's table
@ -87,8 +95,10 @@ def firewall_reload():
'''
with open('firewall.yml','r') as f:
firewall = yaml.load(f)
TCP_port_list_ipv4 = firewall['ipv4']['TCP']
UDP_port_list_ipv4 = firewall['ipv4']['UDP']
TCP_port_list_ipv6 = firewall['ipv6']['TCP']
UDP_port_list_ipv6 = firewall['ipv6']['UDP']
f.close()
@ -97,6 +107,7 @@ def firewall_reload():
os.system ("iptables -F")
os.system ("iptables -X")
os.system ("iptables -A INPUT -p tcp -i eth0 --dport 22 -j ACCEPT")
os.system ("ip6tables -P INPUT ACCEPT")
os.system ("ip6tables -F")
os.system ("ip6tables -X")
@ -117,6 +128,8 @@ def firewall_reload():
os.system ("iptables -P INPUT DROP")
os.system ("ip6tables -P INPUT DROP")
def append_remove_port(port=None,protocol=None,mode=None,ip=None):
'''
Append port in firewall.yml
@ -130,6 +143,7 @@ def append_remove_port(port=None,protocol=None,mode=None,ip=None):
firewall[ip][protocol].remove(int(port))
firewall[ip][protocol].sort()
f.close
os.system("mv firewall.yml firewall.yml.old")
with open('firewall.yml','w') as f:
yaml.dump(firewall,f)