TouchInstinct
/
java-cas-client
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #177 Every other request incorrectly gatewayed 

- ensure behavior of gateway is predictable (reentrant)
This commit is contained in:
Olivier Jaquemet 2016-08-09 10:27:27 +02:00
parent 7cb5380e75
commit b4d9570bdc
3 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cas-client-core/src/main/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImpl.java
View File

@ -33,7 +33,6 @@ public final class DefaultGatewayResolverImpl implements GatewayResolver {
}
final boolean result = session.getAttribute(CONST_CAS_GATEWAY) != null;
session.removeAttribute(CONST_CAS_GATEWAY);
return result;
}

7
cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java
View File

@ -177,8 +177,13 @@ public final class AuthenticationFilterTests {
final MockHttpServletResponse response2 = new MockHttpServletResponse();
this.filter.doFilter(request, response2, filterChain);
assertNull(session.getAttribute(DefaultGatewayResolverImpl.CONST_CAS_GATEWAY));
assertNotNull(session.getAttribute(DefaultGatewayResolverImpl.CONST_CAS_GATEWAY));
assertNull(response2.getRedirectedUrl());
final MockHttpServletResponse response3 = new MockHttpServletResponse();
this.filter.doFilter(request, response3, filterChain);
assertNotNull(session.getAttribute(DefaultGatewayResolverImpl.CONST_CAS_GATEWAY));
assertNull(response3.getRedirectedUrl());
}
@Test

72
cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultGatewayResolverImplTests.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Licensed to Jasig under one or more contributor license
* agreements. See the NOTICE file distributed with this work
* for additional information regarding copyright ownership.
* Jasig licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a
* copy of the License at the following location:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jasig.cas.client.authentication;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
public class DefaultGatewayResolverImplTests {
private DefaultGatewayResolverImpl resolver;
@Before
public void setUp() throws Exception {
this.resolver = new DefaultGatewayResolverImpl();
}
@Test
public void testReentrancy() throws Exception {
final MockHttpServletRequest request1 = new MockHttpServletRequest();
assertFalse(this.resolver.hasGatewayedAlready(request1, "foo"));
assertFalse(this.resolver.hasGatewayedAlready(request1, "foo"));
assertEquals("foo", this.resolver.storeGatewayInformation(request1, "foo"));
assertEquals("foo", this.resolver.storeGatewayInformation(request1, "foo"));
assertTrue(this.resolver.hasGatewayedAlready(request1, "foo"));
assertTrue(this.resolver.hasGatewayedAlready(request1, "foo"));
}
@Test
public void testSessionConcurrency() throws Exception {
final MockHttpSession session = new MockHttpSession();
final MockHttpServletRequest request1 = new MockHttpServletRequest();
final MockHttpServletRequest request2 = new MockHttpServletRequest();
request1.setSession(session);
request2.setSession(session);
assertFalse(this.resolver.hasGatewayedAlready(request1, "abc"));
assertFalse(this.resolver.hasGatewayedAlready(request2, "def"));
assertEquals("abc", this.resolver.storeGatewayInformation(request1, "abc"));
assertTrue(this.resolver.hasGatewayedAlready(request2, "def"));
assertTrue(this.resolver.hasGatewayedAlready(request1, "abc"));
assertEquals("def", this.resolver.storeGatewayInformation(request2, "def"));
assertTrue(this.resolver.hasGatewayedAlready(request1, "abc"));
assertTrue(this.resolver.hasGatewayedAlready(request2, "def"));
}
}