dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed CAS login for extra url fields, thanks efaisal

Browse Source
This commit is contained in:
mdipierro
2012-11-09 14:11:37 -06:00
parent 0001e35400
commit 180c508d83
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.2.1 (2012-11-08 16:19:37) stable Version 2.2.1 (2012-11-09 14:11:30) stable
gluon/tools.py
+4 -3
View File
@@ -1828,14 +1828,15 @@ class Auth(object):
created_on=request.now, created_on=request.now,
renew=interactivelogin) renew=interactivelogin)
service = session._cas_service service = session._cas_service
query_sep = '&' if '?' in service else '?'
del session._cas_service del session._cas_service
if 'warn' in request.vars and not interactivelogin: if 'warn' in request.vars and not interactivelogin:
response.headers[ response.headers[
'refresh'] = "5;URL=%s" % service + "?ticket=" + ticket 'refresh'] = "5;URL=%s" % service + query_sep + "ticket=" + ticket
return A("Continue to %s" % service, return A("Continue to %s" % service,
_href=service + "?ticket=" + ticket) _href=service + query_sep + "ticket=" + ticket)
else: else:
redirect(service + "?ticket=" + ticket) redirect(service + query_sep + "ticket=" + ticket)
if self.is_logged_in() and not 'renew' in request.vars: if self.is_logged_in() and not 'renew' in request.vars:
return allow_access() return allow_access()
elif not self.is_logged_in() and 'gateway' in request.vars: elif not self.is_logged_in() and 'gateway' in request.vars: