From e5bcf41e2c759514df33c72738c3daa9910582cc Mon Sep 17 00:00:00 2001 From: SvenDowideit Date: Mon, 27 Aug 2012 11:35:42 +0000 Subject: [PATCH] Item12054: recursion in CasLogin if access is denied to the user that has just logged in git-svn-id: http://svn.foswiki.org/trunk/CasLoginContrib@15331 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- data/System/CasLoginContrib.txt | 4 ++-- lib/Foswiki/Contrib/CasLoginContrib.pm | 2 +- lib/Foswiki/LoginManager/CasLogin.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/System/CasLoginContrib.txt b/data/System/CasLoginContrib.txt index 53d698c..af34ce3 100644 --- a/data/System/CasLoginContrib.txt +++ b/data/System/CasLoginContrib.txt @@ -40,7 +40,6 @@ If you successfully log into the CAS server, and then get returned to the foswik ={CAS}{SSL_version}=. Set the value to =SSLv3=. - ---++ Installation Instructions %$INSTALL_INSTRUCTIONS% @@ -52,7 +51,8 @@ This is a re-write of the TWiki CASLogin work done by Greg Abbas, Charlie Reitsm | Author(s): | Foswiki:Main.SvenDowideit | | Copyright: | © SvenDowideit@fosiki.com | | License: | [[http://www.gnu.org/licenses/gpl.html][GPL 3 (Gnu General Public License)]] | - Aug 2012 | initial release of the third re-implementation | +| Aug 2012 | 1.6.1 - quick fix for Foswiki::Tasks.Item12054: recursion in CasLogin if access is denied to the user that has just logged in | +| Aug 2012 | initial release of the third re-implementation | | Release: | %$RELEASE% | | Version: | %$VERSION% | | Change History: |   | diff --git a/lib/Foswiki/Contrib/CasLoginContrib.pm b/lib/Foswiki/Contrib/CasLoginContrib.pm index dadbb5f..e24fc61 100644 --- a/lib/Foswiki/Contrib/CasLoginContrib.pm +++ b/lib/Foswiki/Contrib/CasLoginContrib.pm @@ -31,7 +31,7 @@ our $VERSION = '$Rev$'; # version of *this file*. # date - a date in 1 Jun 2009 format. Three letter English month names only. # Note: it's important that this string is exactly the same in the extension # topic - if you use %$RELEASE% with BuildContrib this is done automatically. -our $RELEASE = '1.6.0'; +our $RELEASE = '1.6.1'; our $SHORTDESCRIPTION = 'CAS SSO Login for foswiki'; diff --git a/lib/Foswiki/LoginManager/CasLogin.pm b/lib/Foswiki/LoginManager/CasLogin.pm index e447e3d..0e214bd 100644 --- a/lib/Foswiki/LoginManager/CasLogin.pm +++ b/lib/Foswiki/LoginManager/CasLogin.pm @@ -134,7 +134,7 @@ sub forceAuthentication { my $this = shift; my $session = $this->{session}; - unless ( $session->inContext('authenticated') ) { + if ( !$session->inContext('authenticated') && !defined($query->param('ticket'))) { $session->redirect( $this->loginUrl(), 0 ); return 1; }