aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2020-01-31 12:54:28 +0300
committerGravatar Vitaly Takmazov2020-01-31 12:54:28 +0300
commit0c4b148e0332fa6e9318a0d2333d1593cda8038d (patch)
tree4f4fef68b5126016ae6dfce180a3a1fb77a7dbf7 /src/main/java/com/juick
parent939fe49f4e6d2df559ee016b4f9ce4f78de8b323 (diff)
security: using standard NullRememberMeServices for API configuration
Diffstat (limited to 'src/main/java/com/juick')
-rw-r--r--src/main/java/com/juick/server/configuration/SecurityConfig.java8
-rw-r--r--src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java12
-rw-r--r--src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java88
3 files changed, 13 insertions, 95 deletions
diff --git a/src/main/java/com/juick/server/configuration/SecurityConfig.java b/src/main/java/com/juick/server/configuration/SecurityConfig.java
index dacb8a1c..2713cc56 100644
--- a/src/main/java/com/juick/server/configuration/SecurityConfig.java
+++ b/src/main/java/com/juick/server/configuration/SecurityConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2019, Juick
+ * Copyright (C) 2008-2020, Juick
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,6 @@ import com.juick.service.UserService;
import com.juick.service.security.HTTPSignatureAuthenticationFilter;
import com.juick.service.security.HashParamAuthenticationFilter;
import com.juick.service.security.JuickUserDetailsService;
-import com.juick.service.security.deprecated.RequestParamHashRememberMeServices;
import com.juick.service.security.entities.JuickUser;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
@@ -37,6 +36,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.authentication.NullRememberMeServices;
import org.springframework.security.web.authentication.RememberMeServices;
import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices;
import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
@@ -100,8 +100,8 @@ public class SecurityConfig {
super(true);
}
@Bean
- RememberMeServices apiTokenServices(){
- return new RequestParamHashRememberMeServices(rememberMeKey, userService);
+ RememberMeServices apiTokenServices() {
+ return new NullRememberMeServices();
}
@Bean
public HashParamAuthenticationFilter apiAuthenticationFilter() {
diff --git a/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
index 5715038e..3dc58782 100644
--- a/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2019, Juick
+ * Copyright (C) 2008-2020, Juick
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -23,8 +23,10 @@ import com.juick.service.security.entities.JuickUser;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.authentication.RememberMeAuthenticationToken;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.NullRememberMeServices;
import org.springframework.security.web.authentication.RememberMeServices;
import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
import org.springframework.util.Assert;
@@ -73,8 +75,12 @@ public class HashParamAuthenticationFilter extends OncePerRequestFilter {
if (!user.isAnonymous()) {
User userWithPassword = userService.getUserByName(user.getName());
userWithPassword.setAuthHash(userService.getHashByUID(userWithPassword.getUid()));
- Authentication authentication = new RememberMeAuthenticationToken(
- ((AbstractRememberMeServices)rememberMeServices).getKey(), new JuickUser(userWithPassword), JuickUser.USER_AUTHORITY);
+ Authentication authentication = rememberMeServices instanceof NullRememberMeServices
+ ? new UsernamePasswordAuthenticationToken(userWithPassword.getName(),
+ userWithPassword.getCredentials())
+ : new RememberMeAuthenticationToken(
+ ((AbstractRememberMeServices)rememberMeServices).getKey(),
+ new JuickUser(userWithPassword), JuickUser.USER_AUTHORITY);
SecurityContextHolder.getContext().setAuthentication(authentication);
diff --git a/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
deleted file mode 100644
index c309905f..00000000
--- a/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2008-2019, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.service.security.deprecated;
-
-import com.juick.User;
-import com.juick.service.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.isAnonymous())
- return new JuickUser(userService.getUserByName(user.getName()));
- }
- throw new UsernameNotFoundException("User not found by hash " + hash);
- }
-}