diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java index ad963a5030..b8e686f6d4 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java @@ -150,7 +150,6 @@ ApplicationEventPublisherAware, InitializingBean, ApplicationListener(); - authorities.addAll(request.getAuthorities()); // Get the subject principals and pass them to each of the AuthorityGranters Set principals = loginContext.getSubject().getPrincipals(); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index 83bdd6e759..fc6aea3fac 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -180,9 +180,8 @@ public class JaasAuthenticationProviderTests { @Test public void testFull() throws Exception { - List defaultAuths = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password", - defaultAuths); + AuthorityUtils.createAuthorityList("ROLE_ONE")); assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)); @@ -196,8 +195,7 @@ public class JaasAuthenticationProviderTests { Collection list = auth.getAuthorities(); Set set = AuthorityUtils.authorityListToSet(list); - assertTrue("GrantedAuthorities should contain ROLE_1", set.contains("ROLE_ONE")); - assertTrue("GrantedAuthorities should contain ROLE_2", set.contains("ROLE_TWO")); + assertFalse("GrantedAuthorities should not contain ROLE_1", set.contains("ROLE_ONE")); assertTrue("GrantedAuthorities should contain ROLE_TEST1", set.contains("ROLE_TEST1")); assertTrue("GrantedAuthorities should contain ROLE_TEST2", set.contains("ROLE_TEST2"));