Copilot commented on code in PR #25211:
URL: https://github.com/apache/pulsar/pull/25211#discussion_r2767108040
##########
pulsar-package-management/core/src/test/java/org/apache/pulsar/packages/management/core/MockedPackagesStorage.java:
##########
@@ -45,8 +46,13 @@ public CompletableFuture<Void> writeAsync(String path,
InputStream inputStream)
CompletableFuture<Void> future = new CompletableFuture<>();
CompletableFuture.runAsync(() -> {
try {
- byte[] bytes = new byte[inputStream.available()];
- inputStream.read(bytes);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[8192];
+ int read;
+ while ((read = inputStream.read(buffer)) != -1) {
+ baos.write(buffer, 0, read);
+ }
+ byte[] bytes = baos.toByteArray();
storage.put(path, bytes);
Review Comment:
The ByteArrayOutputStream should be closed to follow best practices for
resource management, even though ByteArrayOutputStream.close() is a no-op.
Consider wrapping it in a try-with-resources block or explicitly closing it
after use.
```suggestion
try (ByteArrayOutputStream baos = new
ByteArrayOutputStream()) {
byte[] buffer = new byte[8192];
int read;
while ((read = inputStream.read(buffer)) != -1) {
baos.write(buffer, 0, read);
}
byte[] bytes = baos.toByteArray();
storage.put(path, bytes);
}
```
##########
pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java:
##########
@@ -117,84 +112,15 @@ class AdminProxyHandler extends ProxyServlet {
@Override
protected HttpClient createHttpClient() throws ServletException {
- ServletConfig config = getServletConfig();
-
- HttpClient client = newHttpClient();
-
- client.setFollowRedirects(true);
-
- // Must not store cookies, otherwise cookies of different clients will
mix.
- client.setHttpCookieStore(new HttpCookieStore.Empty());
-
- Executor executor;
- String value = config.getInitParameter("maxThreads");
- if (value == null || "-".equals(value)) {
- executor = (Executor)
getServletContext().getAttribute("org.eclipse.jetty.server.Executor");
- if (executor == null) {
- throw new IllegalStateException("No server executor for
proxy");
- }
- } else {
- QueuedThreadPool qtp = new
QueuedThreadPool(Integer.parseInt(value));
- String servletName = config.getServletName();
- int dot = servletName.lastIndexOf('.');
- if (dot >= 0) {
- servletName = servletName.substring(dot + 1);
- }
- qtp.setName(servletName);
- executor = qtp;
- }
-
- client.setExecutor(executor);
-
- value = config.getInitParameter("maxConnections");
- if (value == null) {
- value = "256";
- }
- client.setMaxConnectionsPerDestination(Integer.parseInt(value));
-
- value = config.getInitParameter("idleTimeout");
- if (value == null) {
- value = "30000";
- }
- client.setIdleTimeout(Long.parseLong(value));
-
- value = config.getInitParameter(INIT_PARAM_REQUEST_BUFFER_SIZE);
- if (value != null) {
- client.setRequestBufferSize(Integer.parseInt(value));
- }
-
- value = config.getInitParameter("responseBufferSize");
- if (value != null){
- client.setResponseBufferSize(Integer.parseInt(value));
- }
-
- try {
- client.start();
-
- // Content must not be decoded, otherwise the client gets confused.
- // Allow encoded content, such as "Content-Encoding: gzip", to
pass through without decoding it.
- client.getContentDecoderFactories().clear();
-
- // Pass traffic to the client, only intercept what's necessary.
- ProtocolHandlers protocolHandlers = client.getProtocolHandlers();
- protocolHandlers.clear();
- protocolHandlers.put(new RedirectProtocolHandler(client));
- protocolHandlers.put(new ProxyContinueProtocolHandler());
-
- return client;
- } catch (Exception x) {
- throw new ServletException(x);
- }
+ HttpClient httpClient = super.createHttpClient();
Review Comment:
The previous implementation explicitly cleared content decoder factories to
prevent automatic decompression (client.getContentDecoderFactories().clear())
with the comment "Content must not be decoded, otherwise the client gets
confused. Allow encoded content, such as 'Content-Encoding: gzip', to pass
through without decoding it." This clearing is no longer performed in the new
implementation. Verify that the parent class's createHttpClient() also clears
these factories, or add this clearing back to prevent potential issues with
encoded content being incorrectly decoded during proxying.
```suggestion
HttpClient httpClient = super.createHttpClient();
// Content must not be decoded, otherwise the client gets confused.
// Allow encoded content, such as 'Content-Encoding: gzip', to pass
through without decoding it.
httpClient.getContentDecoderFactories().clear();
```
##########
pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPackagesUploadTest.java:
##########
@@ -0,0 +1,140 @@
+/*
+ * 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 com.google.common.net.HttpHeaders.EXPECT;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import lombok.Cleanup;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.broker.authentication.AuthenticationService;
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
+import org.apache.pulsar.common.util.ObjectMapperFactory;
+import
org.apache.pulsar.packages.management.core.MockedPackagesStorageProvider;
+import org.apache.pulsar.packages.management.core.common.PackageMetadata;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClientConfig;
+import org.asynchttpclient.RequestBuilder;
+import org.asynchttpclient.Response;
+import org.asynchttpclient.request.body.multipart.FilePart;
+import org.asynchttpclient.request.body.multipart.StringPart;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-admin")
+public class ProxyPackagesUploadTest extends MockedPulsarServiceBaseTest {
+
+ private static final int FILE_SIZE = 8 * 1024 * 1024; // 8 MB
+ private static final ObjectMapper MAPPER = ObjectMapperFactory.create();
+ private WebServer webServer;
+ private PulsarAdmin proxyAdmin;
+
+ @BeforeMethod(alwaysRun = true)
+ @Override
+ protected void setup() throws Exception {
+ conf.setEnablePackagesManagement(true);
+
conf.setPackagesManagementStorageProvider(MockedPackagesStorageProvider.class.getName());
+ super.internalSetup();
+
+ ProxyConfiguration proxyConfig = new ProxyConfiguration();
+ proxyConfig.setServicePort(Optional.of(0));
+ proxyConfig.setWebServicePort(Optional.of(0));
+ proxyConfig.setBrokerWebServiceURL(brokerUrl.toString());
+
+ webServer = new WebServer(proxyConfig, new AuthenticationService(
+ PulsarConfigurationLoader.convertFrom(proxyConfig, true)));
+ webServer.addServlet("/", new ServletHolder(new
AdminProxyHandler(proxyConfig, null, null)));
+ webServer.start();
+
+ proxyAdmin = PulsarAdmin.builder()
+ .serviceHttpUrl("http://localhost:"; +
webServer.getListenPortHTTP().get())
+ .build();
+
+ admin.tenants().createTenant("public", createDefaultTenantInfo());
+ admin.namespaces().createNamespace("public/default");
+ }
+
+ @AfterMethod(alwaysRun = true)
+ @Override
+ protected void cleanup() throws Exception {
+ if (proxyAdmin != null) proxyAdmin.close();
+ if (webServer != null) webServer.stop();
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testUploadPackageThroughProxy() throws Exception {
+ Path packageFile = Files.createTempFile("pkg-sdk", ".nar");
+ packageFile.toFile().deleteOnExit();
+ Files.write(packageFile, new byte[FILE_SIZE]);
+
+ String pkgName = "function://public/default/pkg-sdk@v1";
+ PackageMetadata meta =
PackageMetadata.builder().description("sdk-test").build();
+
+ proxyAdmin.packages().upload(meta, pkgName, packageFile.toString());
+
+ verifyDownload(pkgName, FILE_SIZE);
Review Comment:
For consistency with the cleanup pattern used in verifyDownload (lines 133,
138), consider explicitly deleting the temporary package file after the test
completes using Files.deleteIfExists(packageFile). While deleteOnExit() ensures
cleanup, explicit deletion provides immediate cleanup and is more consistent
with the rest of the test.
##########
pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyPackagesUploadTest.java:
##########
@@ -0,0 +1,140 @@
+/*
+ * 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 com.google.common.net.HttpHeaders.EXPECT;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import lombok.Cleanup;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.broker.authentication.AuthenticationService;
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
+import org.apache.pulsar.common.util.ObjectMapperFactory;
+import
org.apache.pulsar.packages.management.core.MockedPackagesStorageProvider;
+import org.apache.pulsar.packages.management.core.common.PackageMetadata;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClientConfig;
+import org.asynchttpclient.RequestBuilder;
+import org.asynchttpclient.Response;
+import org.asynchttpclient.request.body.multipart.FilePart;
+import org.asynchttpclient.request.body.multipart.StringPart;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-admin")
+public class ProxyPackagesUploadTest extends MockedPulsarServiceBaseTest {
+
+ private static final int FILE_SIZE = 8 * 1024 * 1024; // 8 MB
+ private static final ObjectMapper MAPPER = ObjectMapperFactory.create();
+ private WebServer webServer;
+ private PulsarAdmin proxyAdmin;
+
+ @BeforeMethod(alwaysRun = true)
+ @Override
+ protected void setup() throws Exception {
+ conf.setEnablePackagesManagement(true);
+
conf.setPackagesManagementStorageProvider(MockedPackagesStorageProvider.class.getName());
+ super.internalSetup();
+
+ ProxyConfiguration proxyConfig = new ProxyConfiguration();
+ proxyConfig.setServicePort(Optional.of(0));
+ proxyConfig.setWebServicePort(Optional.of(0));
+ proxyConfig.setBrokerWebServiceURL(brokerUrl.toString());
+
+ webServer = new WebServer(proxyConfig, new AuthenticationService(
+ PulsarConfigurationLoader.convertFrom(proxyConfig, true)));
+ webServer.addServlet("/", new ServletHolder(new
AdminProxyHandler(proxyConfig, null, null)));
+ webServer.start();
+
+ proxyAdmin = PulsarAdmin.builder()
+ .serviceHttpUrl("http://localhost:"; +
webServer.getListenPortHTTP().get())
+ .build();
+
+ admin.tenants().createTenant("public", createDefaultTenantInfo());
+ admin.namespaces().createNamespace("public/default");
+ }
+
+ @AfterMethod(alwaysRun = true)
+ @Override
+ protected void cleanup() throws Exception {
+ if (proxyAdmin != null) proxyAdmin.close();
+ if (webServer != null) webServer.stop();
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testUploadPackageThroughProxy() throws Exception {
+ Path packageFile = Files.createTempFile("pkg-sdk", ".nar");
+ packageFile.toFile().deleteOnExit();
+ Files.write(packageFile, new byte[FILE_SIZE]);
+
+ String pkgName = "function://public/default/pkg-sdk@v1";
+ PackageMetadata meta =
PackageMetadata.builder().description("sdk-test").build();
+
+ proxyAdmin.packages().upload(meta, pkgName, packageFile.toString());
+
+ verifyDownload(pkgName, FILE_SIZE);
+ }
+
+ @Test
+ public void testUploadWithExpect100Continue() throws Exception {
+ Path packageFile = Files.createTempFile("pkg-ahc", ".nar");
+ packageFile.toFile().deleteOnExit();
+ Files.write(packageFile, new byte[FILE_SIZE]);
+
+ String pkgName = "function://public/default/expect-test@v1";
+ String uploadUrl =
String.format("http://localhost:%d/admin/v3/packages/function/public/default/expect-test/v1";,
+ webServer.getListenPortHTTP().orElseThrow());
+
+ @Cleanup
+ AsyncHttpClient client = new DefaultAsyncHttpClient(new
DefaultAsyncHttpClientConfig.Builder().build());
+
+ Response response = client.executeRequest(new RequestBuilder("POST")
+ .setUrl(uploadUrl)
+ .addHeader(EXPECT, "100-continue")
+ .addBodyPart(new FilePart("file", packageFile.toFile()))
+ .addBodyPart(new StringPart("metadata",
MAPPER.writeValueAsString(
+
PackageMetadata.builder().description("ahc-test").build()), "application/json"))
+ .build()).get();
+
+ assertThat(response.getStatusCode()).isEqualTo(204);
+
+ verifyDownload(pkgName, FILE_SIZE);
Review Comment:
For consistency with the cleanup pattern used in verifyDownload (lines 133,
138), consider explicitly deleting the temporary package file after the test
completes using Files.deleteIfExists(packageFile). While deleteOnExit() ensures
cleanup, explicit deletion provides immediate cleanup and is more consistent
with the rest of the test.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
