diff options
Diffstat (limited to 'juick-server')
-rw-r--r-- | juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java (renamed from juick-server/src/main/java/com/juick/service/security/SimpleRememberMeServices.java) | 27 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java | 71 | ||||
-rw-r--r-- | juick-server/src/main/resources/juick.conf.example | 3 |
3 files changed, 93 insertions, 8 deletions
diff --git a/juick-server/src/main/java/com/juick/service/security/SimpleRememberMeServices.java b/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java index aef133d3..ec44baa0 100644 --- a/juick-server/src/main/java/com/juick/service/security/SimpleRememberMeServices.java +++ b/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java @@ -1,8 +1,9 @@ -package com.juick.service.security; +package com.juick.service.security.deprecated; import com.juick.User; import com.juick.server.security.entities.JuickUser; import com.juick.service.UserService; +import com.juick.service.security.NullUserDetailsService; import com.juick.util.UserUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -23,13 +24,18 @@ import java.util.Optional; /** * Created by aalexeev on 11/28/16. + * + * @deprecated not recommended use for secure reasons */ -public class SimpleRememberMeServices extends AbstractRememberMeServices implements RememberMeServices { - private static final Logger logger = LoggerFactory.getLogger(SimpleRememberMeServices.class); +@Deprecated +public class CookieSimpleHashRememberMeServices extends AbstractRememberMeServices implements RememberMeServices { + private static final Logger logger = LoggerFactory.getLogger(CookieSimpleHashRememberMeServices.class); + + private static final String COOKIE_PARAM_NAME = "hash"; private final UserService userService; - public SimpleRememberMeServices( + public CookieSimpleHashRememberMeServices( final String key, final UserService userService, final Environment environment) { super(key, new NullUserDetailsService()); @@ -38,8 +44,9 @@ public class SimpleRememberMeServices extends AbstractRememberMeServices impleme this.userService = userService; - setCookieName(environment.getProperty("auth_cookie_name", "hash")); + setCookieName(COOKIE_PARAM_NAME); setCookieDomain(environment.getProperty("web_domain", "juick.com")); + setAlwaysRemember(true); } @Override @@ -89,4 +96,14 @@ public class SimpleRememberMeServices extends AbstractRememberMeServices impleme return new JuickUser(userOptional.get()); } + + @Override + protected String[] decodeCookie(String cookieValue) throws InvalidCookieException { + return new String[]{cookieValue}; + } + + @Override + protected String encodeCookie(String[] cookieTokens) { + return cookieTokens != null && cookieTokens.length > 0 ? cookieTokens[0] : ""; + } } diff --git a/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java new file mode 100644 index 00000000..0e635927 --- /dev/null +++ b/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java @@ -0,0 +1,71 @@ +package com.juick.service.security.deprecated; + +import com.juick.User; +import com.juick.server.security.entities.JuickUser; +import com.juick.service.UserService; +import com.juick.service.security.NullUserDetailsService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.web.authentication.RememberMeServices; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException; +import org.springframework.util.Assert; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * Created by aalexeev on 11/30/16. + * + * @deprecated for security reasons + */ +@Deprecated +public class RequestParamHashRememberMeServices extends AbstractRememberMeServices implements RememberMeServices { + private static final String PARAM_NAME = "hash"; + + private final UserService userService; + + public RequestParamHashRememberMeServices(String key, UserService userService) { + super(key, new NullUserDetailsService()); + + Assert.notNull(userService); + this.userService = userService; + setAlwaysRemember(false); + } + + @Override + protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { + // do nothing + } + + @Override + protected boolean rememberMeRequested(HttpServletRequest request, String parameter) { + return false; // always false + } + + @Override + protected void cancelCookie(HttpServletRequest request, HttpServletResponse response) { + // do nothing + } + + @Override + protected String extractRememberMeCookie(HttpServletRequest request) { + return PARAM_NAME; // return any not blank value + } + + @Override + protected UserDetails processAutoLoginCookie( + String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) + throws RememberMeAuthenticationException, UsernameNotFoundException { + String hash = request.getParameter(PARAM_NAME); + + if (StringUtils.isNotBlank(hash)) { + User user = userService.getUserByHash(hash); + if (user.getUid() > 0) + return new JuickUser(user); + } + throw new UsernameNotFoundException("User not found by hash " + hash); + } +} diff --git a/juick-server/src/main/resources/juick.conf.example b/juick-server/src/main/resources/juick.conf.example index 6a931ab5..7c39ef16 100644 --- a/juick-server/src/main/resources/juick.conf.example +++ b/juick-server/src/main/resources/juick.conf.example @@ -29,9 +29,6 @@ sphinx_password= # The domain name for Web (default value - "juick.com") web_domain=juick.com -# Authority cookie name (default value - "hash") -auth_cookie_name=hash - # Authority remember-me key auth_remember_me_key=3vHcy3OUDQlkpRDm |