# HG changeset patch # User RhodeCode Admin # Date 2022-10-27 20:54:02 # Node ID 6ebd323b9f546da0c1a2c5ae0e17a736dec136b8 # Parent 753f56fc6432dff9eb65fa61f72d06cf00e35228 logging: changed module in logs extra as it is a reserved keyword diff --git a/rhodecode/authentication/plugins/auth_headers.py b/rhodecode/authentication/plugins/auth_headers.py --- a/rhodecode/authentication/plugins/auth_headers.py +++ b/rhodecode/authentication/plugins/auth_headers.py @@ -223,7 +223,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExter } log.info('user `%s` authenticated correctly', user_attrs['username'], - extra={"action": "user_auth_ok", "module": "auth_headers", "username": user_attrs["username"]}) + extra={"action": "user_auth_ok", "auth_module": "auth_headers", "username": user_attrs["username"]}) return user_attrs diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py --- a/rhodecode/authentication/plugins/auth_ldap.py +++ b/rhodecode/authentication/plugins/auth_ldap.py @@ -535,7 +535,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExter log.debug('ldap user: %s', user_attrs) log.info('user `%s` authenticated correctly', user_attrs['username'], - extra={"action": "user_auth_ok", "module": "auth_ldap", "username": user_attrs["username"]}) + extra={"action": "user_auth_ok", "auth_module": "auth_ldap", "username": user_attrs["username"]}) return user_attrs diff --git a/rhodecode/authentication/plugins/auth_pam.py b/rhodecode/authentication/plugins/auth_pam.py --- a/rhodecode/authentication/plugins/auth_pam.py +++ b/rhodecode/authentication/plugins/auth_pam.py @@ -163,7 +163,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExter log.debug("pamuser: %s", user_attrs) log.info('user `%s` authenticated correctly', user_attrs['username'], - extra={"action": "user_auth_ok", "module": "auth_pam", "username": user_attrs["username"]}) + extra={"action": "user_auth_ok", "auth_module": "auth_pam", "username": user_attrs["username"]}) return user_attrs diff --git a/rhodecode/authentication/plugins/auth_rhodecode.py b/rhodecode/authentication/plugins/auth_rhodecode.py --- a/rhodecode/authentication/plugins/auth_rhodecode.py +++ b/rhodecode/authentication/plugins/auth_rhodecode.py @@ -168,12 +168,12 @@ class RhodeCodeAuthPlugin(RhodeCodeAuthP if userobj.username == User.DEFAULT_USER and userobj.active: log.info('user `%s` authenticated correctly as anonymous user', userobj.username, - extra={"action": "user_auth_ok", "module": "auth_rhodecode_anon", "username": userobj.username}) + extra={"action": "user_auth_ok", "auth_module": "auth_rhodecode_anon", "username": userobj.username}) return user_attrs elif userobj.username == username and password_match: log.info('user `%s` authenticated correctly', userobj.username, - extra={"action": "user_auth_ok", "module": "auth_rhodecode", "username": userobj.username}) + extra={"action": "user_auth_ok", "auth_module": "auth_rhodecode", "username": userobj.username}) return user_attrs log.warning("user `%s` used a wrong password when " "authenticating on this plugin", userobj.username)