Skip to content

Commit

Permalink
Fix request.getContentLength() to return 0 if it is less than 0 (apac…
Browse files Browse the repository at this point in the history
…he#8448)

### Motivation

- "Negative initial size: -1" error occurs when submitting an HTTP request which has "Content-Type: application/json"  and no request body .

### Modifications

- Pass 0 to argument of ByteArrayOutputStream if request.getContentLength() returns a negative number.
- Add unit test.
  • Loading branch information
magrain authored and flowchartsman committed Nov 17, 2020
1 parent fffcb28 commit 248aea9
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ protected class ReplayableProxyContentProvider extends ProxyInputStreamContentPr
private final ByteArrayOutputStream bodyBuffer;
protected ReplayableProxyContentProvider(HttpServletRequest request, HttpServletResponse response, Request proxyRequest, InputStream input) {
super(request, response, proxyRequest, input);
bodyBuffer = new ByteArrayOutputStream(request.getContentLength());
bodyBuffer = new ByteArrayOutputStream(Math.max(request.getContentLength(), 0));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.pulsar.proxy.server;

import static org.mockito.Mockito.*;

import org.eclipse.jetty.client.api.Request;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.io.InputStream;
import java.io.ByteArrayOutputStream;
import java.lang.reflect.Field;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

public class AdminProxyHandlerTest {

@Test
public void replayableProxyContentProviderTest() throws Exception {

AdminProxyHandler adminProxyHandler = new AdminProxyHandler(mock(ProxyConfiguration.class),
mock(BrokerDiscoveryProvider.class));

HttpServletRequest request = mock(HttpServletRequest.class);
doReturn(-1).when(request).getContentLength();

try {
AdminProxyHandler.ReplayableProxyContentProvider replayableProxyContentProvider = adminProxyHandler.new ReplayableProxyContentProvider(
request, mock(HttpServletResponse.class), mock(Request.class), mock(InputStream.class));
Field field = replayableProxyContentProvider.getClass().getDeclaredField("bodyBuffer");
field.setAccessible(true);
Assert.assertEquals(((ByteArrayOutputStream) field.get(replayableProxyContentProvider)).size(), 0);
} catch (IllegalArgumentException e) {
Assert.fail("IllegalArgumentException should not be thrown");
}

}
}

0 comments on commit 248aea9

Please sign in to comment.