SEC-565: Refactoring of TokenBasedRememberMeServices. Changed arguments to makeValidSignature so that it could be used from both places where a signature is required and refactored the class to extend AbstractRememberMeServices. The method processAutoLoginCookie now returns a UserDetails, rather than username, as the UserDetails is needed in TokenBasedRememberMeServices.
@ -75,8 +79,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@@ -75,8 +79,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@ -172,22 +175,23 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@@ -172,22 +175,23 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
logger.debug("Interactive login attempt was unsuccessful.");
cancelCookie(request,response);
onLoginFail(request,response);
}
@ -202,6 +206,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@@ -202,6 +206,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
AuthenticationsuccessfulAuthentication){
if(!rememberMeRequested(request,parameter)){
logger.debug("Remember-me login not requested.");
return;
}
@ -250,12 +255,14 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@@ -250,12 +255,14 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@ -315,6 +322,10 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@@ -315,6 +322,10 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
@ -61,7 +63,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
@@ -61,7 +63,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
thrownewInvalidCookieException("Cookie token did not contain "+2+
@ -108,7 +110,11 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
@@ -108,7 +110,11 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
thrownewRememberMeAuthenticationException("Autologin failed due to data access problem");
@ -20,6 +22,8 @@ public class PersistentTokenBasedRememberMeServicesTests {
@@ -20,6 +22,8 @@ public class PersistentTokenBasedRememberMeServicesTests {
@ -53,7 +53,6 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -53,7 +53,6 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -85,10 +84,6 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -85,10 +84,6 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -105,7 +100,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -105,7 +100,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
assertNull(returnedCookie);// shouldn't try to invalidate our cookie
}
@ -126,7 +121,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -126,7 +121,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
assertNull(returnedCookie);// shouldn't try to invalidate our cookie
}
@ -139,7 +134,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -139,7 +134,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -150,7 +145,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -150,7 +145,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -165,7 +160,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -165,7 +160,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -176,7 +171,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -176,7 +171,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -190,7 +185,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -190,7 +185,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -201,7 +196,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -201,7 +196,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -216,7 +211,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -216,7 +211,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -228,7 +223,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -228,7 +223,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -243,7 +238,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -243,7 +238,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -254,7 +249,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -254,7 +249,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -265,7 +260,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -265,7 +260,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -276,7 +271,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -276,7 +271,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -290,7 +285,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -290,7 +285,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -330,7 +325,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -330,7 +325,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -346,7 +341,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -346,7 +341,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -361,7 +356,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -361,7 +356,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@ -381,7 +376,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {
@@ -381,7 +376,7 @@ public class TokenBasedRememberMeServicesTests extends TestCase {