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 2016/08/30 14:18:30 UTC
[4/8] allura git commit: [#8117] remove an unnecessary
try/except/re-raise
[#8117] remove an unnecessary try/except/re-raise
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8649faae
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8649faae
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8649faae
Branch: refs/heads/db/8117
Commit: 8649faae1a7bd183651898c339f5137a95d71cca
Parents: b1b2e58
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Aug 23 14:51:42 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Aug 26 13:29:25 2016 -0400
----------------------------------------------------------------------
Allura/allura/lib/plugin.py | 49 ++++++++++++--------------
Allura/allura/lib/widgets/auth_widgets.py | 2 +-
Allura/allura/templates/login.html | 2 +-
3 files changed, 25 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8649faae/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index f74dc62..cd4f336 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -147,33 +147,30 @@ class AuthenticationProvider(object):
raise NotImplementedError('_login')
def login(self, user=None):
- try:
- if user is None:
- user = self._login()
- if self.is_password_expired(user):
- self.session['pwd-expired'] = True
- self.session['expired-username'] = user.username
- h.auditlog_user('Password expired', user=user)
- else:
- self.session['username'] = user.username
+ if user is None:
+ user = self._login() # raises exception if auth fails
- if 'rememberme' in self.request.params:
- remember_for = int(config.get('auth.remember_for', 365))
- self.session['login_expires'] = datetime.utcnow() + timedelta(remember_for)
- else:
- self.session['login_expires'] = True
- self.session.save()
- g.statsUpdater.addUserLogin(user)
- user.track_login(self.request)
- # set a non-secure cookie with same expiration as session,
- # so an http request can know if there is a related session on https
- response.set_cookie('allura-loggedin', value='true',
- expires=None if self.session['login_expires'] is True else self.session['login_expires'],
- secure=False, httponly=True)
- return user
- except exc.HTTPUnauthorized:
- self.logout()
- raise
+ if self.is_password_expired(user):
+ self.session['pwd-expired'] = True
+ self.session['expired-username'] = user.username
+ h.auditlog_user('Password expired', user=user)
+ else:
+ self.session['username'] = user.username
+
+ if 'rememberme' in self.request.params:
+ remember_for = int(config.get('auth.remember_for', 365))
+ self.session['login_expires'] = datetime.utcnow() + timedelta(remember_for)
+ else:
+ self.session['login_expires'] = True
+ self.session.save()
+ g.statsUpdater.addUserLogin(user)
+ user.track_login(self.request)
+ # set a non-secure cookie with same expiration as session,
+ # so an http request can know if there is a related session on https
+ response.set_cookie('allura-loggedin', value='true',
+ expires=None if self.session['login_expires'] is True else self.session['login_expires'],
+ secure=False, httponly=True)
+ return user
def logout(self):
self.session.invalidate()
http://git-wip-us.apache.org/repos/asf/allura/blob/8649faae/Allura/allura/lib/widgets/auth_widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/auth_widgets.py b/Allura/allura/lib/widgets/auth_widgets.py
index 22f4429..f2ba4e7 100644
--- a/Allura/allura/lib/widgets/auth_widgets.py
+++ b/Allura/allura/lib/widgets/auth_widgets.py
@@ -58,7 +58,7 @@ class LoginForm(ForgeForm):
@validator
def validate(self, value, state=None):
try:
- value['username'] = plugin.AuthenticationProvider.get(request).login()
+ plugin.AuthenticationProvider.get(request).login()
except exc.HTTPUnauthorized:
msg = 'Invalid login'
raise Invalid(
http://git-wip-us.apache.org/repos/asf/allura/blob/8649faae/Allura/allura/templates/login.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/login.html b/Allura/allura/templates/login.html
index 4037878..7fa5c3e 100644
--- a/Allura/allura/templates/login.html
+++ b/Allura/allura/templates/login.html
@@ -19,7 +19,7 @@
{% set hide_left_bar = True %}
{% extends g.theme.master %}
-{% block title %}Login Form{% endblock %}
+{% block title %}{{ config['site_name'] }} Login{% endblock %}
{% block header %}Login{% endblock %}