engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auth: Change login url generation in auth decorators.

Browse source 
Use pyramid to generate login URLs.
This commit is contained in:
Johannes Bornhold 2016-05-25 10:44:26 +02:00
parent 9ea67b415c
commit 7beea8e959
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rhodecode/lib/auth.py
View file

@ -1099,6 +1099,7 @@ class LoginRequired(object):
return get_cython_compat_decorator(self.__wrapper, func)
def __wrapper(self, func, *fargs, **fkwargs):
from rhodecode.lib import helpers as h
cls = fargs[0]
user = cls._rhodecode_user
loc = "%s:%s" % (cls.__class__.__name__, func.__name__)
@ -1106,7 +1107,6 @@ class LoginRequired(object):
# check if our IP is allowed
ip_access_valid = True
if not user.ip_allowed:
from rhodecode.lib import helpers as h
h.flash(h.literal(_('IP %s not allowed' % (user.ip_addr,))),
category='warning')
ip_access_valid = False
@ -1158,7 +1158,7 @@ class LoginRequired(object):
log.debug('redirecting to login page with %s' % (came_from,))
return redirect(
url('login_home', came_from=came_from))
h.route_path('login', _query={'came_from': came_from}))
class NotAnonymous(object):
@ -1184,7 +1184,8 @@ class NotAnonymous(object):
h.flash(_('You need to be a registered user to '
'perform this action'),
category='warning')
return redirect(url('login_home', came_from=came_from))
return redirect(
h.route_path('login', _query={'came_from': came_from}))
else:
return func(*fargs, **fkwargs)
@ -1267,7 +1268,8 @@ class PermsDecorator(object):
import rhodecode.lib.helpers as h
h.flash(_('You need to be signed in to view this page'),
category='warning')
return redirect(url('login_home', came_from=came_from))
return redirect(
h.route_path('login', _query={'came_from': came_from}))
else:
# redirect with forbidden ret code