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

[fix] Properly handle protocols

Browse source
This commit is contained in:
Alexis Gavoty 2014-06-06 11:48:58 +02:00
parent 34f2f61e76
commit b57d861cbe
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
firewall.py
View file

@ -39,10 +39,8 @@ from moulinette.core import MoulinetteError
If we don't find the ssh port we define 22""" If we don't find the ssh port we define 22"""
try: try:
with open('/etc/ssh/sshd_config') as ssh_config_file: with open('/etc/ssh/sshd_config') as ssh_config_file:
for line in ssh_config_file: for line in ssh_config_file:
line0 = line.split(" ")[0] line0 = line.split(" ")[0]
if line0 == 'Port': if line0 == 'Port':
@ -51,17 +49,15 @@ try:
ssh_config_file.close() ssh_config_file.close()
if ssh_port == '' : if ssh_port == '':
ssh_port = '22' ssh_port = '22'
except: except:
ssh_port = '22' ssh_port = '22'
ssh_port = int(ssh_port) ssh_port = int(ssh_port)
def firewall_allow(port=None, protocol='TCP', ipv6=False, no_upnp=False): def firewall_allow(port=None, protocol=['TCP'], ipv6=False, no_upnp=False):
""" """
Allow connection port/protocol Allow connection port/protocol
@ -74,7 +70,8 @@ def firewall_allow(port=None, protocol='TCP', ipv6=False, no_upnp=False):
""" """
port = int(port) port = int(port)
ipv = "ipv4" ipv = "ipv4"
protocols = [protocol] protocols = protocol
protocol = protocol[0]
firewall = firewall_list(raw=True) firewall = firewall_list(raw=True)
@ -100,7 +97,7 @@ def firewall_allow(port=None, protocol='TCP', ipv6=False, no_upnp=False):
return firewall_reload() return firewall_reload()
def firewall_disallow(port=None, protocol='TCP', ipv6=False): def firewall_disallow(port=None, protocol=['TCP'], ipv6=False):
""" """
Allow connection port/protocol Allow connection port/protocol
@ -112,7 +109,8 @@ def firewall_disallow(port=None, protocol='TCP', ipv6=False):
""" """
port = int(port) port = int(port)
ipv = "ipv4" ipv = "ipv4"
protocols = [protocol] protocols = protocol
protocol = protocol[0]
firewall = firewall_list(raw=True) firewall = firewall_list(raw=True)