Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated Cookie usage

Browse Source 
Remove usage of comment and verison usage

Signed-off-by: M-Faheem-Khan <faheem5948@gmail.com>
This commit is contained in:
M-Faheem-Khan
2025-04-27 23:53:19 -04:00
committed by Rob Winch
parent d52289bd7a
commit 241c3cd35a
10 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
View File

@@ -372,9 +372,6 @@ public abstract class AbstractRememberMeServices
if (this.cookieDomain != null) {
cookie.setDomain(this.cookieDomain);
}
if (maxAge < 1) {
cookie.setVersion(1);
}
cookie.setSecure((this.useSecureCookie != null) ? this.useSecureCookie : request.isSecure());
cookie.setHttpOnly(true);

1
web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java
View File

@@ -67,7 +67,6 @@ class FirewalledResponse extends HttpServletResponseWrapper {
validateCrlf(SET_COOKIE_HEADER, cookie.getValue());
validateCrlf(SET_COOKIE_HEADER, cookie.getPath());
validateCrlf(SET_COOKIE_HEADER, cookie.getDomain());
validateCrlf(SET_COOKIE_HEADER, cookie.getComment());
}
super.addCookie(cookie);
}

2
web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
View File

@@ -45,11 +45,9 @@ class CookieDeserializer extends JsonDeserializer<Cookie> {
ObjectMapper mapper = (ObjectMapper) jp.getCodec();
JsonNode jsonNode = mapper.readTree(jp);
Cookie cookie = new Cookie(readJsonNode(jsonNode, "name").asText(), readJsonNode(jsonNode, "value").asText());
cookie.setComment(readJsonNode(jsonNode, "comment").asText());
cookie.setDomain(readJsonNode(jsonNode, "domain").asText());
cookie.setMaxAge(readJsonNode(jsonNode, "maxAge").asInt(-1));
cookie.setSecure(readJsonNode(jsonNode, "secure").asBoolean());
cookie.setVersion(readJsonNode(jsonNode, "version").asInt());
cookie.setPath(readJsonNode(jsonNode, "path").asText());
JsonNode attributes = readJsonNode(jsonNode, "attributes");
cookie.setHttpOnly(readJsonNode(attributes, "HttpOnly") != null);

6
web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java
View File

@@ -44,10 +44,8 @@ abstract class SavedCookieMixin {
@JsonCreator
SavedCookieMixin(@JsonProperty("name") String name, @JsonProperty("value") String value,
@JsonProperty("comment") String comment, @JsonProperty("domain") String domain,
@JsonProperty("maxAge") int maxAge, @JsonProperty("path") String path,
@JsonProperty("secure") boolean secure, @JsonProperty("version") int version) {
@JsonProperty("domain") String domain, @JsonProperty("maxAge") int maxAge,
@JsonProperty("path") String path, @JsonProperty("secure") boolean secure) {
}
}

33
web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java
View File

@@ -35,8 +35,6 @@ public class SavedCookie implements Serializable {
private final String value;
private final String comment;
private final String domain;
private final int maxAge;
@@ -45,28 +43,13 @@ public class SavedCookie implements Serializable {
private final boolean secure;
private final int version;
/**
* @deprecated use
* {@link org.springframework.security.web.savedrequest.SavedCookie#SavedCookie(String, String, String, int, String, boolean)}
* instead
*/
@Deprecated(forRemoval = true, since = "6.1")
public SavedCookie(String name, String value, String comment, String domain, int maxAge, String path,
boolean secure, int version) {
public SavedCookie(String name, String value, String domain, int maxAge, String path, boolean secure) {
this.name = name;
this.value = value;
this.comment = comment;
this.domain = domain;
this.maxAge = maxAge;
this.path = path;
this.secure = secure;
this.version = version;
}
public SavedCookie(String name, String value, String domain, int maxAge, String path, boolean secure) {
this(name, value, null, domain, maxAge, path, secure, 0);
}
public SavedCookie(Cookie cookie) {
@@ -82,11 +65,6 @@ public class SavedCookie implements Serializable {
return this.value;
}
@Deprecated(forRemoval = true, since = "6.1")
public String getComment() {
return this.comment;
}
public String getDomain() {
return this.domain;
}
@@ -103,23 +81,14 @@ public class SavedCookie implements Serializable {
return this.secure;
}
@Deprecated(forRemoval = true, since = "6.1")
public int getVersion() {
return this.version;
}
public Cookie getCookie() {
Cookie cookie = new Cookie(getName(), getValue());
if (getComment() != null) {
cookie.setComment(getComment());
}
if (getDomain() != null) {
cookie.setDomain(getDomain());
}
if (getPath() != null) {
cookie.setPath(getPath());
}
cookie.setVersion(getVersion());
cookie.setMaxAge(getMaxAge());
cookie.setSecure(isSecure());
return cookie;