Read Juick hash from Authorization header, drop unused code

2 files changed, 16 insertions, 130 deletions

diff --git a/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
index 0a80a28c..3ce178f5 100644
--- a/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
@@ -20,6 +20,7 @@ package com.juick.service.security;
 import com.juick.User;
 import com.juick.service.UserService;
 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.core.Authentication;
@@ -92,10 +93,25 @@ public class HashParamAuthenticationFilter extends OncePerRequestFilter {
                 existingAuth instanceof AnonymousAuthenticationToken;
     }
 
+    private String hashFromAuthorizationHeader(HttpServletRequest request) {
+        String authorizationHeader = request.getHeader("Authorization");
+        if (StringUtils.isNotEmpty(authorizationHeader)) {
+            String[] parts = authorizationHeader.split(" ");
+            if ((parts.length == 2) && parts[0].equals("Juick")) {
+                return parts[1];
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
     private String getHashFromRequest(HttpServletRequest request) {
         String paramHash = request.getParameter(PARAM_NAME);
         Cookie cookieHash = WebUtils.getCookie(request, PARAM_NAME);
+        String headerHash = hashFromAuthorizationHeader(request);
 
+        if (StringUtils.isNotEmpty(headerHash)) {
+            return headerHash;
+        }
         if (paramHash == null && cookieHash != null) {
             return cookieHash.getValue();
         }
diff --git a/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
deleted file mode 100644
index e385d7dd..00000000
--- a/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2008-2017, 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.RandomStringUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-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.InvalidCookieException;
-import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException;
-import org.springframework.util.Assert;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/28/16.
- *
- * @deprecated not recommended use for secure reasons
- */
-@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 CookieSimpleHashRememberMeServices(
-            final String key, final UserService userService, final Environment environment) {
-        super(key, new NullUserDetailsService());
-
-        Assert.notNull(userService);
-        Assert.notNull(environment);
-
-        this.userService = userService;
-
-        setCookieName(COOKIE_PARAM_NAME);
-        setCookieDomain(environment.getProperty("web_domain", "localhost"));
-        setAlwaysRemember(true);
-    }
-
-    @Override
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        super.logout(request, response, authentication);
-        userService.deleteLoginForUser(authentication.getName());
-    }
-
-    @Override
-    protected void onLoginSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
-        String username = successfulAuthentication.getName();
-
-        logger.debug("Creating new persistent login for user {}", username);
-
-        try {
-            int uid = userService.getUIDbyName(username);
-
-            Assert.isTrue(uid > 0);
-
-            String hash = RandomStringUtils.randomAlphanumeric(16).toUpperCase();
-
-            userService.setLoginForUser(uid, hash);
-
-            setCookie(new String[]{hash}, getTokenValiditySeconds(), request, response);
-        } catch (Exception e) {
-            logger.error("Failed to save cookies", e);
-        }
-    }
-
-    @Override
-    protected UserDetails processAutoLoginCookie(
-            String[] cookieTokens, HttpServletRequest request, HttpServletResponse response)
-            throws RememberMeAuthenticationException, UsernameNotFoundException {
-        String hash = cookieTokens[0];
-
-        if (StringUtils.isBlank(hash)) {
-            hash = request.getParameter("hash");
-        }
-        if (StringUtils.isBlank(hash)) {
-            throw new InvalidCookieException("Cookie is invalid and hash parameter not found");
-        }
-
-        int uid = userService.getUIDbyHash(hash);
-        if (uid <= 0)
-            throw new UsernameNotFoundException("User not found by hash, cookies" + cookieTokens);
-
-        Optional<User> userOptional = userService.getUserByUID(uid);
-
-        Assert.isTrue(userOptional.isPresent());
-
-        return new JuickUser(userService.getUserByName(userOptional.get().getName()));
-    }
-
-    @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] : StringUtils.EMPTY;
-    }
-}