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

fixed cas, thanks Yari

Browse Source
This commit is contained in:
Massimo Di Pierro
2011-12-05 13:00:39 -06:00
parent d281acb421
commit 0304233840
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.3 (2011-12-05 11:39:10) dev Version 1.99.3 (2011-12-05 13:00:28) dev
gluon/tools.py
+3 -4
View File
@@ -1143,7 +1143,7 @@ class Auth(object):
if args(1) == self.settings.cas_actions['login']: if args(1) == self.settings.cas_actions['login']:
return self.cas_login(version=2) return self.cas_login(version=2)
elif args(1) == self.settings.cas_actions['validate']: elif args(1) == self.settings.cas_actions['validate']:
return self.cas_validate(version=2) return self.cas_validate(version=1)
elif args(1) == self.settings.cas_actions['servicevalidate']: elif args(1) == self.settings.cas_actions['servicevalidate']:
return self.cas_validate(version=2, proxy=False) return self.cas_validate(version=2, proxy=False)
elif args(1) == self.settings.cas_actions['proxyvalidate']: elif args(1) == self.settings.cas_actions['proxyvalidate']:
@@ -1411,7 +1411,7 @@ class Auth(object):
maps['registration_id'] = \ maps['registration_id'] = \
lambda v,p=settings.cas_provider:'%s/%s' % (p,v['user']) lambda v,p=settings.cas_provider:'%s/%s' % (p,v['user'])
actions = [self.settings.cas_actions['login'], actions = [self.settings.cas_actions['login'],
self.settings.cas_actions['validate'], self.settings.cas_actions['servicevalidate'],
self.settings.cas_actions['logout']] self.settings.cas_actions['logout']]
settings.login_form = CasAuth( settings.login_form = CasAuth(
casversion = 2, casversion = 2,
@@ -1527,7 +1527,6 @@ class Auth(object):
def allow_access(interactivelogin=False): def allow_access(interactivelogin=False):
row = table(service=session._cas_service,user_id=self.user.id) row = table(service=session._cas_service,user_id=self.user.id)
if row: if row:
row.update_record(created_on=request.now)
ticket = row.ticket ticket = row.ticket
else: else:
ticket = 'ST-'+web2py_uuid() ticket = 'ST-'+web2py_uuid()
@@ -1538,7 +1537,7 @@ class Auth(object):
renew=interactivelogin) renew=interactivelogin)
service = session._cas_service service = session._cas_service
del session._cas_service del session._cas_service
if request.vars.has_key('warn'): if request.vars.has_key('warn') and not interactivelogin:
response.headers['refresh'] = "5;URL=%s"%service+"?ticket="+ticket response.headers['refresh'] = "5;URL=%s"%service+"?ticket="+ticket
return A("Continue to %s"%service, return A("Continue to %s"%service,
_href=service+"?ticket="+ticket) _href=service+"?ticket="+ticket)