allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [1/2] allura git commit: Also fire after_login() for expired pwds; clarify audit log message
Date Mon, 17 Jul 2017 16:11:44 GMT
Repository: allura
Updated Branches:
  refs/heads/master bdcdcbf5a -> 3470ed196


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/3470ed19
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3470ed19
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3470ed19

Branch: refs/heads/master
Commit: 3470ed19617175b1495cae348e9ca1efd0c2347c
Parents: e4cb795
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Jul 12 13:31:50 2017 -0400
Committer: Kenton Taylor <ktaylor@slashdotmedia.com>
Committed: Mon Jul 17 14:23:10 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/allura/blob/3470ed19/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))


Mime
View raw message