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

reload without upnp if upnp fail (back to origin firewall situation)

Browse source
This commit is contained in:
Titoko 2013-03-04 11:30:46 +01:00
parent 1c1722e19f
commit 945897345b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
yunohost_firewall.py
View file

@ -50,7 +50,6 @@ def firewall_allow(protocol=None,port=None,ipv6=None,upnp=False):
return firewall_reload(upnp) return firewall_reload(upnp)
def firewall_disallow(protocol=None,port=None,ipv6=None,upnp=False): def firewall_disallow(protocol=None,port=None,ipv6=None,upnp=False):
""" """
Disallow port in iptables Disallow port in iptables
@ -90,6 +89,7 @@ def firewall_list():
with open ('firewall.yml') as f: with open ('firewall.yml') as f:
firewall = yaml.load(f) firewall = yaml.load(f)
return firewall return firewall
def firewall_reload(upnp=False): def firewall_reload(upnp=False):
''' '''
Reload iptables configuration Reload iptables configuration
@ -155,8 +155,7 @@ def firewall_reload(upnp=False):
win_msg(_("Firewall successfully reloaded")) win_msg(_("Firewall successfully reloaded"))
return firewall_list() return firewall_list
def update_yml(port=None,protocol=None,mode=None,ipv6=None): def update_yml(port=None,protocol=None,mode=None,ipv6=None):
""" """
@ -199,7 +198,6 @@ 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)
def add_portmapping(protocol=None,upnp=False,ipv6=None): def add_portmapping(protocol=None,upnp=False,ipv6=None):
""" """
@ -221,8 +219,10 @@ def add_portmapping(protocol=None,upnp=False,ipv6=None):
try: try:
upnp.selectigd() upnp.selectigd()
except: except:
firewall_reload(False)
raise YunoHostError(167,_("No upnp devices found")) raise YunoHostError(167,_("No upnp devices found"))
else: else:
firewall_reload(False)
raise YunoHostError(22,_("Can't connect to the igd device")) raise YunoHostError(22,_("Can't connect to the igd device"))
# list the redirections : # list the redirections :