YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix indentation

Browse source
This commit is contained in:
titoko 2012-12-18 00:40:13 +01:00
parent ad223a6373
commit 993815181d
1 changed files with 39 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
yunohost_firewall.py
View file

@ -25,22 +25,22 @@ def firewall_allow(protocol=None,port=None,ipv6=None):
Dict Dict
""" """
if int(port)<65536 and int(port)>0:
if protocol == "Both":
update_yml(port,'tcp','a',ipv6) if int(port)<65536 and int(port)>0:
update_yml(port,'udp','a',ipv6) if protocol == "Both":
update_yml(port,'tcp','a',ipv6)
update_yml(port,'udp','a',ipv6)
else: else:
update_yml(port,protocol,'a',ipv6)
update_yml(port,protocol,'a',ipv6) win_msg(_("Port successfully openned"))
win_msg(_("Port successfully openned")) else:
else: raise YunoHostError(22,_("Port not between 1 and 65535 : ")+port)
raise YunoHostError(22,_("Port not between 1 and 65535 : ")+port)
firewall_reload() firewall_reload()
return firewall_list() return firewall_list()
@ -65,7 +65,7 @@ def firewall_disallow(protocol=None,port=None,ipv6=None):
update_yml(port,protocol,'r',ipv6) update_yml(port,protocol,'r',ipv6)
win_msg(_("Port successfully closed")) win_msg(_("Port successfully closed"))
firewall_reload() firewall_reload()
return firewall_list return firewall_list
@ -92,7 +92,7 @@ def firewall_reload():
Reload iptables configuration Reload iptables configuration
Keyword arguments: Keyword arguments:
None None
Return Return
Dict Dict
@ -103,15 +103,15 @@ def firewall_reload():
os.system ("iptables -P INPUT ACCEPT") os.system ("iptables -P INPUT ACCEPT")
os.system ("iptables -F") os.system ("iptables -F")
os.system ("iptables -X") os.system ("iptables -X")
if '22' not in firewall['ipv4']['TCP']: if '22' not in firewall['ipv4']['TCP']:
update_yml('22','TCP','a',False) update_yml('22','TCP','a',False)
os.system ("ip6tables -P INPUT ACCEPT") os.system ("ip6tables -P INPUT ACCEPT")
os.system ("ip6tables -F") os.system ("ip6tables -F")
os.system ("ip6tables -X") os.system ("ip6tables -X")
if '22' not in firewall['ipv6']['TCP']: if '22' not in firewall['ipv6']['TCP']:
update_yml('22','TCP','a',True) update_yml('22','TCP','a',True)
for i,port in enumerate (firewall['ipv4']['TCP']): for i,port in enumerate (firewall['ipv4']['TCP']):
os.system ("iptables -A INPUT -p tcp -i eth0 --dport "+ str(port) +" -j ACCEPT") os.system ("iptables -A INPUT -p tcp -i eth0 --dport "+ str(port) +" -j ACCEPT")
@ -138,18 +138,16 @@ def firewall_reload():
def update_yml(port=None,protocol=None,mode=None,ipv6=None): def update_yml(port=None,protocol=None,mode=None,ipv6=None):
""" """
Update firewall.yml Update firewall.yml
Keyword arguments: Keyword arguments:
protocol -- Protocol used protocol -- Protocol used
port -- Port to open port -- Port to open
mode -- a=append r=remove mode -- a=append r=remove
ipv6 -- Boolean ipv6 ipv6 -- Boolean ipv6
Return Return
None None
""" """
if ipv6: if ipv6:
ip = 'ipv6' ip = 'ipv6'
@ -179,6 +177,3 @@ def update_yml(port=None,protocol=None,mode=None,ipv6=None):
with open('firewall.yml','w') as f: with open('firewall.yml','w') as f:
yaml.dump(firewall,f) yaml.dump(firewall,f)