crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wiki/cas: redirect only if action=login_cas

Browse source 
Du coup, ça faisait encore merder la suppression de PJ.
This commit is contained in:
Daniel STAN 2014-01-31 00:15:49 +01:00
parent 9e62ca402d
commit 5b839ef541
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wiki/auth/cas.py
View file

@ -138,10 +138,6 @@ class CASAuth(BaseAuth):
sys.stderr.write("Tentative de deconnexion du CAS : %s\n" % logoutRequest) sys.stderr.write("Tentative de deconnexion du CAS : %s\n" % logoutRequest)
self.cas.singlesignout(logout_user, logoutRequest) self.cas.singlesignout(logout_user, logoutRequest)
# anonymous
if not ticket and not self.action == action:
return user_obj, True
# valid ticket on CAS # valid ticket on CAS
if ticket and ticket.startswith('ST-'): if ticket and ticket.startswith('ST-'):
valid, username = self.cas.validate_ticket(url, ticket) valid, username = self.cas.validate_ticket(url, ticket)
@ -160,8 +156,9 @@ class CASAuth(BaseAuth):
store_ticket(ticket, username) store_ticket(ticket, username)
load_theme_fallback(request, u.theme_name) load_theme_fallback(request, u.theme_name)
return u, True return u, True
else:
# login request.http_redirect(self.cas.login_url(url))
elif self.action == action: # Redirect login
request.http_redirect(self.cas.login_url(url)) request.http_redirect(self.cas.login_url(url))
return user_obj, True return user_obj, True