Merge branch 'stretch-unstable' into more-accurate-tests

locales/en.json

@@ -514,8 +514,6 @@
     "service_unknown": "Unknown service '{service:s}'",
     "ssowat_conf_generated": "SSOwat configuration generated",
     "ssowat_conf_updated": "SSOwat configuration updated",
-    "ssowat_persistent_conf_read_error": "Could not read persistent SSOwat configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
-    "ssowat_persistent_conf_write_error": "Could not save persistent SSOwat configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
     "system_upgraded": "System upgraded",
     "system_username_exists": "Username already exists in the list of system users",
     "this_action_broke_dpkg": "This action broke dpkg/APT (the system package managers)… You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.",

src/yunohost/app.py

@@ -41,7 +41,7 @@ from datetime import datetime
 
 from moulinette import msignals, m18n, msettings
 from moulinette.utils.log import getActionLogger
-from moulinette.utils.filesystem import read_json, read_toml, read_yaml
+from moulinette.utils.filesystem import read_json, read_toml, read_yaml, write_to_json
 
 from yunohost.service import service_log, service_status, _run_service_command
 from yunohost.utils import packages
@@ -1302,25 +1302,21 @@ def app_makedefault(operation_logger, app, domain=None):
         raise YunohostError('app_make_default_location_already_used', app=app, domain=app_domain,
                             other_app=app_map(raw=True)[domain]["/"]["id"])
 
-    try:
+    # TODO / FIXME : current trick is to add this to conf.json.persisten
-        with open('/etc/ssowat/conf.json.persistent') as json_conf:
+    # This is really not robust and should be improved
-            ssowat_conf = json.loads(str(json_conf.read()))
+    # e.g. have a flag in /etc/yunohost/apps/$app/ to say that this is the
-    except ValueError as e:
+    # default app or idk...
-        raise YunohostError('ssowat_persistent_conf_read_error', error=e)
+    if not os.path.exists('/etc/ssowat/conf.json.persistent'):
-    except IOError:
         ssowat_conf = {}
+    else:
+        ssowat_conf = read_json('/etc/ssowat/conf.json.persistent')
 
     if 'redirected_urls' not in ssowat_conf:
         ssowat_conf['redirected_urls'] = {}
 
     ssowat_conf['redirected_urls'][domain + '/'] = app_domain + app_path
 
-    try:
+    write_to_json('/etc/ssowat/conf.json.persistent', ssowat_conf)
-        with open('/etc/ssowat/conf.json.persistent', 'w+') as f:
-            json.dump(ssowat_conf, f, sort_keys=True, indent=4)
-    except IOError as e:
-        raise YunohostError('ssowat_persistent_conf_write_error', error=e)
-
     os.system('chmod 644 /etc/ssowat/conf.json.persistent')
 
     logger.success(m18n.n('ssowat_conf_updated'))

src/yunohost/backup.py

@@ -602,10 +602,10 @@ class BackupManager():
                             env=env_dict,
                             chdir=self.work_dir)
 
-        ret_succeed = {hook: {path:result["state"] for path, result in infos.items()}
+        ret_succeed = {hook: [path for path, result in infos.items() if result["state"] == "succeed"]
                        for hook, infos in ret.items()
                        if any(result["state"] == "succeed" for result in infos.values())}
-        ret_failed = {hook: {path:result["state"] for path, result in infos.items.items()}
+        ret_failed = {hook: [path for path, result in infos.items.items() if result["state"] == "failed"]
                       for hook, infos in ret.items()
                       if any(result["state"] == "failed" for result in infos.values())}
 
@@ -2373,6 +2373,13 @@ def backup_info(name, with_details=False, human_readable=False):
         if "size_details" in info.keys():
             for category in ["apps", "system"]:
                 for name, key_info in info[category].items():
+
+                    # Stupid legacy fix for weird format between 3.5 and 3.6
+                    if isinstance(key_info, dict):
+                        key_info = key_info.keys()
+
+                    info[category][name] = key_info = {"paths": key_info}
+
                     if name in info["size_details"][category].keys():
                         key_info["size"] = info["size_details"][category][name]
                         if human_readable:

src/yunohost/log.py

@@ -502,7 +502,10 @@ class OperationLogger(object):
         The missing of the message below could help to see an electrical
         shortage.
         """
-        self.error(m18n.n('log_operation_unit_unclosed_properly'))
+        if self.ended_at is not None or self.started_at is None:
+            return
+        else:
+            self.error(m18n.n('log_operation_unit_unclosed_properly'))
 
 
 def _get_description_from_name(name):

src/yunohost/tests/test_permission.py

@@ -350,6 +350,16 @@ def test_permission_reset_idempotency():
     assert set(res['blog.main']['corresponding_users']) == set(["alice", "bob"])
 
 
+def test_permission_reset_idempotency():
+    # Reset permission
+    user_permission_reset("blog.main")
+    user_permission_reset("blog.main")
+
+    res = user_permission_list(full=True)['permissions']
+    assert res['blog.main']['allowed'] == ["all_users"]
+    assert set(res['blog.main']['corresponding_users']) == set(["alice", "bob"])
+
+
 #
 # Error on update function
 #
@@ -368,6 +378,7 @@ def test_permission_update_permission_that_doesnt_exist(mocker):
     with raiseYunohostError(mocker, "permission_not_found"):
         user_permission_update("doesnt.exist", add="alice")
 
+
 # Permission url management
 
 def test_permission_redefine_url():

src/yunohost/tools.py

@@ -350,25 +350,17 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
         os.system('hostname yunohost.yunohost.org')
 
     # Add a temporary SSOwat rule to redirect SSO to admin page
-    try:
+    if not os.path.exists('/etc/ssowat/conf.json.persistent'):
-        with open('/etc/ssowat/conf.json.persistent') as json_conf:
-            ssowat_conf = json.loads(str(json_conf.read()))
-    except ValueError as e:
-        raise YunohostError('ssowat_persistent_conf_read_error', error=str(e))
-    except IOError:
         ssowat_conf = {}
+    else:
+        ssowat_conf = read_json('/etc/ssowat/conf.json.persistent')
 
     if 'redirected_urls' not in ssowat_conf:
         ssowat_conf['redirected_urls'] = {}
 
     ssowat_conf['redirected_urls']['/'] = domain + '/yunohost/admin'
 
-    try:
+    write_to_json('/etc/ssowat/conf.json.persistent', ssowat_conf)
-        with open('/etc/ssowat/conf.json.persistent', 'w+') as f:
-            json.dump(ssowat_conf, f, sort_keys=True, indent=4)
-    except IOError as e:
-        raise YunohostError('ssowat_persistent_conf_write_error', error=str(e))
-
     os.system('chmod 644 /etc/ssowat/conf.json.persistent')
 
     # Create SSL CA
@@ -616,8 +608,8 @@ def tools_upgrade(operation_logger, apps=None, system=False):
         # randomly from yunohost itself... upgrading them is likely to
         critical_packages = ("moulinette", "yunohost", "yunohost-admin", "ssowat", "python")
 
-        critical_packages_upgradable = [p for p in upgradables if p["name"] in critical_packages]
+        critical_packages_upgradable = [p["name"] for p in upgradables if p["name"] in critical_packages]
-        noncritical_packages_upgradable = [p for p in upgradables if p["name"] not in critical_packages]
+        noncritical_packages_upgradable = [p["name"] for p in upgradables if p["name"] not in critical_packages]
 
         # Prepare dist-upgrade command
         dist_upgrade = "DEBIAN_FRONTEND=noninteractive"

src/yunohost/user.py

@@ -35,8 +35,10 @@ import subprocess
 import copy
 
 from moulinette import m18n
-from yunohost.utils.error import YunohostError
 from moulinette.utils.log import getActionLogger
+from moulinette.utils.filesystem import read_json, write_to_json, read_yaml, write_to_yaml
+
+from yunohost.utils.error import YunohostError
 from yunohost.service import service_status
 from yunohost.log import is_unit_operation
 
@@ -195,21 +197,16 @@ def user_create(operation_logger, username, firstname, lastname, mail, password,
         attr_dict['mail'] = [attr_dict['mail']] + aliases
 
         # If exists, remove the redirection from the SSO
-        try:
+        if not os.path.exists('/etc/ssowat/conf.json.persistent'):
-            with open('/etc/ssowat/conf.json.persistent') as json_conf:
-                ssowat_conf = json.loads(str(json_conf.read()))
-        except ValueError as e:
-            raise YunohostError('ssowat_persistent_conf_read_error', error=str(e))
-        except IOError:
             ssowat_conf = {}
+        else:
+            ssowat_conf = read_json('/etc/ssowat/conf.json.persistent')
 
         if 'redirected_urls' in ssowat_conf and '/' in ssowat_conf['redirected_urls']:
             del ssowat_conf['redirected_urls']['/']
-            try:
+
-                with open('/etc/ssowat/conf.json.persistent', 'w+') as f:
+            write_to_json('/etc/ssowat/conf.json.persistent', ssowat_conf)
-                    json.dump(ssowat_conf, f, sort_keys=True, indent=4)
+            os.system('chmod 644 /etc/ssowat/conf.json.persistent')
-            except IOError as e:
-                raise YunohostError('ssowat_persistent_conf_write_error', error=str(e))
 
     try:
         ldap.add('uid=%s,ou=users' % username, attr_dict)