You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2017/07/12 17:32:02 UTC

allura git commit: Also fire after_login() for expired pwds; clarify audit log message

Repository: allura
Updated Branches:
  refs/heads/db/after_login_hook 62be56636 -> 846d28d02


Also fire after_login() for expired pwds; clarify audit log message


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/846d28d0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/846d28d0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/846d28d0

Branch: refs/heads/db/after_login_hook
Commit: 846d28d0254efed62cd73bd96afbd253e7a3ce98
Parents: 62be566
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Jul 12 13:31:50 2017 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 12 13:31:50 2017 -0400

----------------------------------------------------------------------
 Allura/allura/lib/plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/846d28d0/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index ddb5f38..6e71dcb 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -189,11 +189,11 @@ class AuthenticationProvider(object):
         if self.is_password_expired(user):
             self.session['pwd-expired'] = True
             self.session['expired-username'] = user.username
-            h.auditlog_user('Password expired', user=user)
+            h.auditlog_user('Successful login; Password expired', user=user)
         else:
             self.session['username'] = user.username
             h.auditlog_user('Successful login', user=user)
-            self.after_login(user, self.request)
+        self.after_login(user, self.request)
 
         if 'rememberme' in self.request.params:
             remember_for = int(config.get('auth.remember_for', 365))