|
@@ -26,6 +26,8 @@ import org.acegisecurity.context.SecurityContextHolder;
|
|
|
import org.acegisecurity.providers.TestingAuthenticationToken;
|
|
|
|
|
|
import org.acegisecurity.userdetails.User;
|
|
|
+import org.acegisecurity.util.PortResolver;
|
|
|
+import org.acegisecurity.util.PortResolverImpl;
|
|
|
|
|
|
import org.acegisecurity.wrapper.SecurityContextHolderAwareRequestWrapper;
|
|
|
|
|
@@ -68,7 +70,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
|
|
|
MockHttpServletRequest request = new MockHttpServletRequest();
|
|
|
request.setRequestURI("/");
|
|
|
|
|
|
- SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
|
|
|
+ SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, new PortResolverImpl());
|
|
|
|
|
|
assertEquals("marissa", wrapper.getRemoteUser());
|
|
|
assertTrue(wrapper.isUserInRole("ROLE_FOO"));
|
|
@@ -88,7 +90,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
|
|
|
MockHttpServletRequest request = new MockHttpServletRequest();
|
|
|
request.setRequestURI("/");
|
|
|
|
|
|
- SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
|
|
|
+ SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, new PortResolverImpl());
|
|
|
|
|
|
assertEquals("marissaAsUserDetails", wrapper.getRemoteUser());
|
|
|
assertFalse(wrapper.isUserInRole("ROLE_FOO"));
|
|
@@ -106,7 +108,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
|
|
|
MockHttpServletRequest request = new MockHttpServletRequest();
|
|
|
request.setRequestURI("/");
|
|
|
|
|
|
- SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
|
|
|
+ SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request,new PortResolverImpl());
|
|
|
assertNull(wrapper.getRemoteUser());
|
|
|
assertFalse(wrapper.isUserInRole("ROLE_ANY"));
|
|
|
assertNull(wrapper.getUserPrincipal());
|
|
@@ -122,7 +124,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
|
|
|
MockHttpServletRequest request = new MockHttpServletRequest();
|
|
|
request.setRequestURI("/");
|
|
|
|
|
|
- SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request);
|
|
|
+ SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, new PortResolverImpl());
|
|
|
|
|
|
assertNull(wrapper.getRemoteUser());
|
|
|
assertFalse(wrapper.isUserInRole("ROLE_HELLO")); // principal is null, so reject
|