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

Merge branch 'hotfixes-4.1.7.3' into dev

Browse source
This commit is contained in:
Alexandre Aubin 2021-03-02 02:14:35 +01:00
commit 7ba08eb550
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
debian/changelog vendored
View file

@ -4,7 +4,20 @@ yunohost (4.2) unstable; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Wed, 20 Jan 2021 05:19:58 +0100 -- Alexandre Aubin <alex.aubin@mailoo.org> Wed, 20 Jan 2021 05:19:58 +0100
yunohost (4.1.7.2) testing; urgency=low yunohost (4.1.7.3) stable; urgency=low
- [fix] log: Some secrets were not redacted (0c172cd3)
- [fix] log: For some reason sometimes we were redacting 'empty string' which made everything explode (88b414c8)
- [fix] helpers: Various fixes for ynh_add_config / ynh_replace_vars (a43cd72c, 2728801d, 9bbc3b72, 2402a1db, 6ce02270)
- [fix] helpers: Fix permission helpers doc format (d12f403f)
- [fix] helpers: ynh_systemd_action did not properly clean the 'tail' process when service action failed (05969184)
- [fix] i18n: Translation typo in italian translation ... (bd8644a6)
Thanks to all contributors <3 ! (Kay0u, yalh76)
-- Alexandre Aubin <alex.aubin@mailoo.org> Tue, 02 Mar 2021 02:03:35 +0100
yunohost (4.1.7.2) stable; urgency=low
- [fix] When migration legacy protected permissions, all users were allowed on the new perm (29bd3c4a) - [fix] When migration legacy protected permissions, all users were allowed on the new perm (29bd3c4a)
- [fix] Mysql is a fucking joke (... trying to fix the mysql issue on RPi ...) (cd4fdb2b) - [fix] Mysql is a fucking joke (... trying to fix the mysql issue on RPi ...) (cd4fdb2b)

10
src/yunohost/log.py
View file

@ -414,14 +414,8 @@ class RedactingFormatter(Formatter):
# This matches stuff like db_pwd=the_secret or admin_password=other_secret # This matches stuff like db_pwd=the_secret or admin_password=other_secret
# (the secret part being at least 3 chars to avoid catching some lines like just "db_pwd=") # (the secret part being at least 3 chars to avoid catching some lines like just "db_pwd=")
# Some names like "key" or "manifest_key" are ignored, used in helpers like ynh_app_setting_set or ynh_read_manifest # Some names like "key" or "manifest_key" are ignored, used in helpers like ynh_app_setting_set or ynh_read_manifest
match = re.search( match = re.search(r'(pwd|pass|password|secret\w*|\w+key|token)=(\S{3,})$', record.strip())
r"(pwd|pass|password|secret\w*|\w+key|token)=(\S{3,})$", record.strip() if match and match.group(2) not in self.data_to_redact and match.group(1) not in ["key", "manifest_key"]:
)
if (
match
and match.group(2) not in self.data_to_redact
and match.group(1) not in ["key", "manifest_key"]
):
self.data_to_redact.append(match.group(2)) self.data_to_redact.append(match.group(2))
except Exception as e: except Exception as e:
logger.warning( logger.warning(