-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Netty Expect:100-continue feature support (#5412)
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
- Loading branch information
Showing
7 changed files
with
237 additions
and
7 deletions.
There are no files selected for viewing
71 changes: 71 additions & 0 deletions
71
...c/main/java/org/glassfish/jersey/netty/connector/Expect100ContinueConnectorExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.netty.connector; | ||
|
|
||
| import io.netty.handler.codec.http.HttpHeaderNames; | ||
| import io.netty.handler.codec.http.HttpHeaderValues; | ||
| import io.netty.handler.codec.http.HttpRequest; | ||
| import org.glassfish.jersey.client.ClientProperties; | ||
| import org.glassfish.jersey.client.ClientRequest; | ||
| import org.glassfish.jersey.client.RequestEntityProcessing; | ||
| import org.glassfish.jersey.client.internal.ConnectorExtension; | ||
|
|
||
| import javax.ws.rs.HttpMethod; | ||
| import java.io.IOException; | ||
| import java.net.ProtocolException; | ||
|
|
||
| class Expect100ContinueConnectorExtension | ||
| implements ConnectorExtension<HttpRequest, IOException> { | ||
| private static final String EXCEPTION_MESSAGE = "Server rejected operation"; | ||
| @Override | ||
| public void invoke(ClientRequest request, HttpRequest extensionParam) { | ||
|
|
||
| final long length = request.getLengthLong(); | ||
| final RequestEntityProcessing entityProcessing = request.resolveProperty( | ||
| ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.class); | ||
|
|
||
| final Boolean expectContinueActivated = request.resolveProperty( | ||
| ClientProperties.EXPECT_100_CONTINUE, Boolean.class); | ||
| final Long expectContinueSizeThreshold = request.resolveProperty( | ||
| ClientProperties.EXPECT_100_CONTINUE_THRESHOLD_SIZE, | ||
| ClientProperties.DEFAULT_EXPECT_100_CONTINUE_THRESHOLD_SIZE); | ||
|
|
||
| final boolean allowStreaming = length > expectContinueSizeThreshold | ||
| || entityProcessing == RequestEntityProcessing.CHUNKED; | ||
|
|
||
| if (!Boolean.TRUE.equals(expectContinueActivated) | ||
| || !(HttpMethod.POST.equals(request.getMethod()) || HttpMethod.PUT.equals(request.getMethod())) | ||
| || !allowStreaming) { | ||
| return; | ||
| } | ||
| extensionParam.headers().add(HttpHeaderNames.EXPECT, HttpHeaderValues.CONTINUE); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void postConnectionProcessing(HttpRequest extensionParam) { | ||
| } | ||
|
|
||
| @Override | ||
| public boolean handleException(ClientRequest request, HttpRequest extensionParam, IOException ex) { | ||
| final Boolean expectContinueActivated = request.resolveProperty( | ||
| ClientProperties.EXPECT_100_CONTINUE, Boolean.FALSE); | ||
|
|
||
| return expectContinueActivated | ||
| && (ex instanceof ProtocolException && ex.getMessage().equals(EXCEPTION_MESSAGE)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
...test/java/org/glassfish/jersey/tests/e2e/client/nettyconnector/Expect100ContinueTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.tests.e2e.client.nettyconnector; | ||
|
|
||
| import org.glassfish.jersey.client.ClientConfig; | ||
| import org.glassfish.jersey.client.ClientProperties; | ||
| import org.glassfish.jersey.client.RequestEntityProcessing; | ||
| import org.glassfish.jersey.client.http.Expect100ContinueFeature; | ||
| import org.glassfish.jersey.netty.connector.NettyConnectorProvider; | ||
| import org.glassfish.jersey.server.ResourceConfig; | ||
| import org.glassfish.jersey.test.JerseyTest; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import javax.ws.rs.HeaderParam; | ||
| import javax.ws.rs.POST; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.client.Entity; | ||
| import javax.ws.rs.core.Application; | ||
| import javax.ws.rs.core.HttpHeaders; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| public class Expect100ContinueTest extends JerseyTest { | ||
|
|
||
| private static final String RESOURCE_PATH = "expect"; | ||
| private static final String ENTITY_STRING = "1234567890123456789012345678901234567890123456789012" | ||
| + "3456789012345678901234567890"; | ||
|
|
||
|
|
||
| @Path(RESOURCE_PATH) | ||
| public static class Expect100ContinueResource { | ||
|
|
||
| @POST | ||
| public Response publishResource(@HeaderParam("Expect") String expect) { | ||
| if ("100-Continue".equalsIgnoreCase(expect)) { | ||
| return Response.noContent().build(); | ||
| } | ||
| return Response.ok("TEST").build(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected Application configure() { | ||
| return new ResourceConfig(Expect100ContinueResource.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected void configureClient(ClientConfig config) { | ||
| config.connectorProvider(new NettyConnectorProvider()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100Continue() { | ||
| final Response response = target(RESOURCE_PATH).request().post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(200, response.getStatus(), "Expected 200"); //no Expect header sent - response OK | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueChunked() { | ||
| final Response response = target(RESOURCE_PATH).register(Expect100ContinueFeature.basic()) | ||
| .property(ClientProperties.REQUEST_ENTITY_PROCESSING, | ||
| RequestEntityProcessing.CHUNKED).request().post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(204, response.getStatus(), "Expected 204"); //Expect header sent - No Content response | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueBuffered() { | ||
| final Response response = target(RESOURCE_PATH).register(Expect100ContinueFeature.basic()) | ||
| .property(ClientProperties.REQUEST_ENTITY_PROCESSING, | ||
| RequestEntityProcessing.BUFFERED).request().header(HttpHeaders.CONTENT_LENGTH, 67000L) | ||
| .post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(100, response.getStatus(), "Expected 100"); //Expect header sent - No Content response | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueCustomLength() { | ||
| final Response response = target(RESOURCE_PATH).register(Expect100ContinueFeature.withCustomThreshold(100L)) | ||
| .request().header(HttpHeaders.CONTENT_LENGTH, 101L) | ||
| .post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(100, response.getStatus(), "Expected 100"); //Expect header sent - No Content response | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueCustomLengthWrong() { | ||
| final Response response = target(RESOURCE_PATH).register(Expect100ContinueFeature.withCustomThreshold(100L)) | ||
| .request().header(HttpHeaders.CONTENT_LENGTH, 99L) | ||
| .post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(200, response.getStatus(), "Expected 200"); //Expect header NOT sent - low request size | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueCustomLengthProperty() { | ||
| final Response response = target(RESOURCE_PATH) | ||
| .property(ClientProperties.EXPECT_100_CONTINUE_THRESHOLD_SIZE, 555L) | ||
| .property(ClientProperties.EXPECT_100_CONTINUE, Boolean.TRUE) | ||
| .register(Expect100ContinueFeature.withCustomThreshold(555L)) | ||
| .request().header(HttpHeaders.CONTENT_LENGTH, 666L) | ||
| .post(Entity.text(ENTITY_STRING)); | ||
| assertNotNull(response.getStatus()); //Expect header sent - No Content response | ||
| } | ||
|
|
||
| @Test | ||
| public void testExpect100ContinueRegisterViaCustomProperty() { | ||
| final Response response = target(RESOURCE_PATH) | ||
| .property(ClientProperties.EXPECT_100_CONTINUE_THRESHOLD_SIZE, 43L) | ||
| .property(ClientProperties.EXPECT_100_CONTINUE, Boolean.TRUE) | ||
| .request().header(HttpHeaders.CONTENT_LENGTH, 44L) | ||
| .post(Entity.text(ENTITY_STRING)); | ||
| assertEquals(100, response.getStatus(), "Expected 100"); //Expect header sent - No Content response | ||
| } | ||
| } |