From 03042338404e4792fa5aabd1d01b7ba24d4eef74 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Mon, 5 Dec 2011 13:00:39 -0600 Subject: [PATCH] fixed cas, thanks Yari --- VERSION | 2 +- gluon/tools.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 9b887f54..57b103da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.3 (2011-12-05 11:39:10) dev +Version 1.99.3 (2011-12-05 13:00:28) dev diff --git a/gluon/tools.py b/gluon/tools.py index 32ecc09b..a298494b 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1143,7 +1143,7 @@ class Auth(object): if args(1) == self.settings.cas_actions['login']: return self.cas_login(version=2) 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']: return self.cas_validate(version=2, proxy=False) elif args(1) == self.settings.cas_actions['proxyvalidate']: @@ -1411,7 +1411,7 @@ class Auth(object): maps['registration_id'] = \ lambda v,p=settings.cas_provider:'%s/%s' % (p,v['user']) actions = [self.settings.cas_actions['login'], - self.settings.cas_actions['validate'], + self.settings.cas_actions['servicevalidate'], self.settings.cas_actions['logout']] settings.login_form = CasAuth( casversion = 2, @@ -1527,7 +1527,6 @@ class Auth(object): def allow_access(interactivelogin=False): row = table(service=session._cas_service,user_id=self.user.id) if row: - row.update_record(created_on=request.now) ticket = row.ticket else: ticket = 'ST-'+web2py_uuid() @@ -1538,7 +1537,7 @@ class Auth(object): renew=interactivelogin) service = 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 return A("Continue to %s"%service, _href=service+"?ticket="+ticket)