Browse Source

Remove redundant check and exception

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
pull/18754/head
Tran Ngoc Nhan 7 months ago committed by Josh Cummings
parent
commit
17b5cdde55
  1. 17
      web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java

17
web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
package org.springframework.security.web.authentication.rememberme;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@ -171,7 +170,7 @@ public abstract class AbstractRememberMeServices @@ -171,7 +170,7 @@ public abstract class AbstractRememberMeServices
*/
protected @Nullable String extractRememberMeCookie(HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
if ((cookies == null) || (cookies.length == 0)) {
if (cookies == null) {
return null;
}
for (Cookie cookie : cookies) {
@ -221,12 +220,7 @@ public abstract class AbstractRememberMeServices @@ -221,12 +220,7 @@ public abstract class AbstractRememberMeServices
}
String[] tokens = StringUtils.delimitedListToStringArray(cookieAsPlainText, DELIMITER);
for (int i = 0; i < tokens.length; i++) {
try {
tokens[i] = URLDecoder.decode(tokens[i], StandardCharsets.UTF_8.toString());
}
catch (UnsupportedEncodingException ex) {
this.logger.error(ex.getMessage(), ex);
}
tokens[i] = URLDecoder.decode(tokens[i], StandardCharsets.UTF_8);
}
return tokens;
}
@ -239,12 +233,7 @@ public abstract class AbstractRememberMeServices @@ -239,12 +233,7 @@ public abstract class AbstractRememberMeServices
protected String encodeCookie(String[] cookieTokens) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < cookieTokens.length; i++) {
try {
sb.append(URLEncoder.encode(cookieTokens[i], StandardCharsets.UTF_8.toString()));
}
catch (UnsupportedEncodingException ex) {
this.logger.error(ex.getMessage(), ex);
}
sb.append(URLEncoder.encode(cookieTokens[i], StandardCharsets.UTF_8));
if (i < cookieTokens.length - 1) {
sb.append(DELIMITER);
}

Loading…
Cancel
Save