Merge branch 'privacy-hotfix' into dev

debian/changelog

@@ -2,6 +2,32 @@ yunohost (4.1.0) testing; urgency=low
 
   - Tmp bump of the version number to fix CI (c.f. Breaks: yunohost(<<4.1) in moulinette)
 
+yunohost (4.0.8.1) stable; urgency=low
+
+  - [fix] App installs logs were still disclosing secrets when shared sometimes ...
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 04 Nov 2020 17:24:52 +0100
+
+yunohost (4.0.8) stable; urgency=low
+
+  - [fix] Diagnose ssl libs installed from sury (#1053)
+  - [enh] Better problematic apt dependencies auto-investigation mechanism (#1051, 8d4f36e1)
+  - [fix] Force locale to C during postgresql migration to avoid some stupid issue related to locale (d532cd5e)
+  - [fix] Use php7.3 by default in CLI (82c0cc92)
+  - [fix] Typo in fpm_config helper led to install process hanging forever (7dcf4b00)
+
+  Thanks to all contributors <3 ! (Kayou)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 16 Sep 2020 16:23:04 +0200
+
+yunohost (4.0.7.1) stable; urgency=low
+
+  - Forbid users from using SSH as a VPN (even if SSH login is disabled) (#1050)
+
+  Thanks to all contributors <3 ! (ljf)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Fri, 11 Sep 2020 21:06:09 +0200
+
 yunohost (4.0.7) stable; urgency=low
 
   - [fix] Require explicitly php7.3-foo packages because in some cases Sury's php7.4- packages are installed and php7.3-fpm doesn't get installed ... (1288159a)

locales/en.json

@@ -300,7 +300,6 @@
     "dyndns_registration_failed": "Could not register DynDNS domain: {error:s}",
     "dyndns_domain_not_provided": "DynDNS provider {provider:s} cannot provide domain {domain:s}.",
     "dyndns_unavailable": "The domain '{domain:s}' is unavailable.",
-    "executing_command": "Executing command '{command:s}'...",
     "executing_script": "Executing script '{script:s}'...",
     "extracting": "Extracting...",
     "experimental_feature": "Warning: This feature is experimental and not considered stable, you should not use it unless you know what you are doing.",

src/yunohost/app.py

@@ -769,8 +769,12 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
     env_dict["YNH_APP_MANIFEST_VERSION"] = manifest.get("version", "?")
 
-    # Start register change on system
+    env_dict_for_logging = env_dict.copy()
-    operation_logger.extra.update({'env': env_dict})
+    for arg_name, arg_value_and_type in args_odict.items():
+        if arg_value_and_type[1] == "password":
+            del env_dict_for_logging["YNH_APP_ARG_%s" % arg_name.upper()]
+
+    operation_logger.extra.update({'env': env_dict_for_logging})
 
     # We'll check that the app didn't brutally edit some system configuration
     manually_modified_files_before_install = manually_modified_files()

src/yunohost/hook.py

@@ -396,12 +396,7 @@ def _hook_exec_bash(path, args, no_trace, chdir, env, user, return_format, logge
                   for k, v in env.items()]), cmd)
     command.append(cmd.format(script=cmd_script, args=cmd_args))
 
-    if logger.isEnabledFor(log.DEBUG):
+    logger.debug("Executing command '%s'" % ' '.join(command))
-        logger.debug(m18n.n('executing_command', command=' '.join(command)))
-    else:
-        logger.debug(m18n.n('executing_script', script=path))
-
-    logger.debug("About to run the command '%s'" % command)
 
     returncode = call_async_output(
         command, loggers, shell=False, cwd=chdir,

src/yunohost/log.py

@@ -565,6 +565,7 @@ class OperationLogger(object):
             'operation': self.operation,
             'parent': self.parent,
             'yunohost_version': get_ynh_package_version("yunohost")["version"],
+            'interface': msettings.get('interface') == 'api',
         }
         if self.related_to is not None:
             data['related_to'] = self.related_to