From 31866640aca14808c6f0802eb57e08c75d260d11 Mon Sep 17 00:00:00 2001 From: M5oul Date: Sat, 21 Dec 2013 12:09:58 +0100 Subject: [PATCH 1/6] Update yunohost_app.py Correction --- yunohost_app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yunohost_app.py b/yunohost_app.py index 24a7299d..ead0ac45 100644 --- a/yunohost_app.py +++ b/yunohost_app.py @@ -609,7 +609,7 @@ def app_removeaccess(apps, users): def app_setting(app, key, value=None, delete=False): """ - Set ou get an app setting value + Set or get an app setting value Keyword argument: value -- Value to set From 494ce814d331844cac38390b7ed2abaad4815eb8 Mon Sep 17 00:00:00 2001 From: Alexis Gavoty Date: Wed, 25 Dec 2013 12:03:05 +0100 Subject: [PATCH 2/6] Correct yunohost-config-dspam mess --- yunohost_tools.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yunohost_tools.py b/yunohost_tools.py index 3cac46a6..7142b0ea 100644 --- a/yunohost_tools.py +++ b/yunohost_tools.py @@ -225,6 +225,7 @@ def tools_postinstall(domain, password, dyndns=False): os.system('service dspam stop') os.system('update-rc.d dspam remove') os.system('sed -i "s/yes/no/g" /etc/default/dspam') + os.system('sed -i "s/dspam=no/dspam=yes/" /etc/yunohost/yunohost.conf') os.system('apt-get install -y -qq yunohost-config-amavis') os.system('service amavis start') os.system('apt-get install --reinstall -y -qq yunohost-config-postfix yunohost-config-dovecot') From 5645737509a8b9349b769f06fc2f7f0637c9c61a Mon Sep 17 00:00:00 2001 From: Kload Date: Wed, 25 Dec 2013 15:16:24 +0100 Subject: [PATCH 3/6] Allow no arguments in manifest --- yunohost_hook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yunohost_hook.py b/yunohost_hook.py index 14b719ee..509fc44c 100644 --- a/yunohost_hook.py +++ b/yunohost_hook.py @@ -113,8 +113,8 @@ def hook_check(file): raise YunoHostError(22, _("Invalid app package")) action = file[file.index('scripts/') + 8:] - if action in manifest["arguments"]: - return manifest["arguments"][action] + if 'arguments' in manifest and action in manifest['arguments']: + return manifest['arguments'][action] else: return {} From eb265396b3477f23b492ccd4db74a82630f7d2c5 Mon Sep 17 00:00:00 2001 From: Alexis Gavoty Date: Thu, 26 Dec 2013 17:41:15 +0100 Subject: [PATCH 4/6] Update yunohost_firewall.py --- yunohost_firewall.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yunohost_firewall.py b/yunohost_firewall.py index 1e9844e0..13413111 100644 --- a/yunohost_firewall.py +++ b/yunohost_firewall.py @@ -137,10 +137,14 @@ def firewall_reload(upnp=False): add_portmapping('TCP', upnp, False, 'r') add_portmapping('UDP', upnp, False, 'r') + ipv6 = False if os.path.exists("/proc/net/if_inet6"): add_portmapping('TCP', upnp, True, 'r') add_portmapping('UDP', upnp, True, 'r') + ipv6 = True + + hook_callback('post_iptable_rules', [upnp, ipv6]) os.system("iptables -A INPUT -i lo -j ACCEPT") os.system("iptables -A INPUT -p icmp -j ACCEPT") From a1683dc4cd8a471cbaa98eb33f8ae99f9f3d77f2 Mon Sep 17 00:00:00 2001 From: Jerome Lebleu Date: Sat, 28 Dec 2013 18:13:43 +0100 Subject: [PATCH 5/6] Fix empty password breach --- yunohost.tac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yunohost.tac b/yunohost.tac index af917180..b3d1ac61 100755 --- a/yunohost.tac +++ b/yunohost.tac @@ -42,8 +42,10 @@ def http_exec(request, **kwargs): # Simple HTTP auth elif installed: - authorized = request.getUser() == 'admin' + authorized = False pwd = request.getPassword() + if request.getUser() == 'admin' and pwd != '': + authorized = True if dev and 'api_key' in request.args: pwd = request.args['api_key'][0] authorized = True From c74a1bdbf375075db17c670d6434ecc10d608eb9 Mon Sep 17 00:00:00 2001 From: abeudin Date: Mon, 6 Jan 2014 16:25:01 +0100 Subject: [PATCH 6/6] Update yunohost_tools.py --- yunohost_tools.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yunohost_tools.py b/yunohost_tools.py index 7142b0ea..5b3fc05b 100644 --- a/yunohost_tools.py +++ b/yunohost_tools.py @@ -223,6 +223,7 @@ def tools_postinstall(domain, password, dyndns=False): os.system('touch /etc/yunohost/light') else: os.system('service dspam stop') + os.system('chmod -x /etc/cron.daily/dspam') os.system('update-rc.d dspam remove') os.system('sed -i "s/yes/no/g" /etc/default/dspam') os.system('sed -i "s/dspam=no/dspam=yes/" /etc/yunohost/yunohost.conf')