Skip to content

Revert "Fixing the cookies field in the v2 request object." #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2021
Merged

Revert "Fixing the cookies field in the v2 request object." #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .../com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,6 @@ public String getAuthType() {

@Override
public Cookie[] getCookies() {
if (request.getCookies() != null && !request.getCookies().isEmpty()) {
return request.getCookies().stream()
.map(cookie -> cookie.split("=", 2))
.map(parts -> new Cookie(SecurityUtils.crlf(parts[0]), SecurityUtils.crlf(parts[1])))
.toArray(Cookie[]::new);
}

if (headers == null || !headers.containsKey(HttpHeaders.COOKIE)) {
return new Cookie[0];
}
Expand Down
6 changes: 0 additions & 6 deletions ...amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2HttpServletRequestReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequestContext;
import org.junit.Test;

import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;

import static org.junit.Assert.*;
Expand All @@ -26,18 +25,13 @@ public void baseRequest_read_populatesSuccessfully() {
.referer("localhost")
.queryString("param1", "value1")
.header("custom", "value")
.cookie("_cookie", "baked")
.apiId("test").toHttpApiV2Request();
AwsHttpApiV2HttpServletRequestReader reader = new AwsHttpApiV2HttpServletRequestReader();
try {
HttpServletRequest servletRequest = reader.readRequest(req, null, null, LambdaContainerHandler.getContainerConfig());
assertEquals("/hello", servletRequest.getPathInfo());
assertEquals("value1", servletRequest.getParameter("param1"));
assertEquals("value", servletRequest.getHeader("CUSTOM"));
Cookie[] cookies = servletRequest.getCookies();
assertEquals(1, cookies.length);
assertEquals("_cookie", cookies[0].getName());
assertEquals("baked", cookies[0].getValue());

assertNotNull(servletRequest.getAttribute(AwsHttpApiV2HttpServletRequestReader.HTTP_API_CONTEXT_PROPERTY));
assertEquals("test",
Expand Down