You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bifromq.apache.org by po...@apache.org on 2026/07/06 06:22:05 UTC
(bifromq) branch main updated: Prevent tenant-aware HTTP request ByteBuf leak (#266)
This is an automated email from the ASF dual-hosted git repository.
popduke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bifromq.git
The following commit(s) were added to refs/heads/main by this push:
new ff1768393 Prevent tenant-aware HTTP request ByteBuf leak (#266)
ff1768393 is described below
commit ff176839351a2706a6c28905abe26cd421959c68
Author: EverWang <Ev...@users.noreply.github.com>
AuthorDate: Mon Jul 6 14:22:01 2026 +0800
Prevent tenant-aware HTTP request ByteBuf leak (#266)
* fix: prevent HTTP request ByteBuf leak
* test: cover tenant-aware request ownership
---
.../apiserver/http/handler/TenantAwareHandler.java | 1 -
.../http/handler/TenantAwareHandlerTest.java | 69 ++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java
index f5dd0ee98..4c0dcd488 100644
--- a/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java
+++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java
@@ -61,7 +61,6 @@ abstract class TenantAwareHandler implements IHTTPRequestHandler {
response.headers().set(CONTENT_LENGTH, 0);
return CompletableFuture.completedFuture(response);
}
- req.retain();
return handle(reqId, tenantId, req);
}
diff --git a/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandlerTest.java
new file mode 100644
index 000000000..7f159f5a6
--- /dev/null
+++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandlerTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.bifromq.apiserver.http.handler;
+
+import static org.apache.bifromq.apiserver.Headers.HEADER_TENANT_ID;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.concurrent.CompletableFuture;
+import org.apache.bifromq.plugin.settingprovider.ISettingProvider;
+import org.apache.bifromq.plugin.settingprovider.Setting;
+import org.testng.annotations.Test;
+
+public class TenantAwareHandlerTest {
+ @Test
+ public void handleDoesNotRetainRequest() {
+ String tenantId = "tenantId";
+ ISettingProvider settingProvider = mock(ISettingProvider.class);
+ when(settingProvider.provide(Setting.MaxUserPayloadBytes, tenantId)).thenReturn(1024);
+ TenantAwareHandler handler = new TenantAwareHandler(settingProvider) {
+ @Override
+ protected CompletableFuture<FullHttpResponse> handle(long reqId,
+ String tenantId,
+ FullHttpRequest req) {
+ return CompletableFuture.completedFuture(
+ new DefaultFullHttpResponse(req.protocolVersion(), HttpResponseStatus.OK));
+ }
+ };
+ FullHttpRequest request =
+ new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/pub");
+ request.headers().set(HEADER_TENANT_ID.header, tenantId);
+ int initialRefCnt = request.refCnt();
+ FullHttpResponse response = handler.handle(1, request).join();
+
+ try {
+ assertEquals(request.refCnt(), initialRefCnt);
+ } finally {
+ response.release();
+ while (request.refCnt() > 0) {
+ request.release();
+ }
+ }
+ }
+}