From 5b839ef541efdef55ee7021ff841f1f389227eed Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Fri, 31 Jan 2014 00:15:49 +0100 Subject: [PATCH] wiki/cas: redirect only if action=login_cas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Du coup, ça faisait encore merder la suppression de PJ. --- wiki/auth/cas.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wiki/auth/cas.py b/wiki/auth/cas.py index faed5139..b7c409ca 100644 --- a/wiki/auth/cas.py +++ b/wiki/auth/cas.py @@ -138,10 +138,6 @@ class CASAuth(BaseAuth): sys.stderr.write("Tentative de deconnexion du CAS : %s\n" % logoutRequest) self.cas.singlesignout(logout_user, logoutRequest) - # anonymous - if not ticket and not self.action == action: - return user_obj, True - # valid ticket on CAS if ticket and ticket.startswith('ST-'): valid, username = self.cas.validate_ticket(url, ticket) @@ -160,9 +156,10 @@ class CASAuth(BaseAuth): store_ticket(ticket, username) load_theme_fallback(request, u.theme_name) return u, True - - # login - request.http_redirect(self.cas.login_url(url)) + else: + request.http_redirect(self.cas.login_url(url)) + elif self.action == action: # Redirect login + request.http_redirect(self.cas.login_url(url)) return user_obj, True