Skip to content
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

[fix][broker]Update interceptor handler exception #18940

Merged
merged 6 commits into from
Dec 19, 2022
Merged

[fix][broker]Update interceptor handler exception #18940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42ab00f
Update interceptor handler exception
tuteng Dec 15, 2022
2ad5376
Fixed json ser function
tuteng Dec 15, 2022
42dac5b
Remove logic to jetty.server.Response for avoid unnecessary checks
tuteng Dec 18, 2022
e6fe0e2
Update style
tuteng Dec 18, 2022
b264f72
Add test for interceptor
tuteng Dec 18, 2022
3b1963f
Fixed import
tuteng Dec 18, 2022
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
27 changes: 19 additions & 8 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response;
import org.apache.pulsar.common.intercept.InterceptException;
import org.apache.pulsar.common.policies.data.ErrorData;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http.MetaData;

Expand All @@ -35,16 +40,22 @@ public class ExceptionHandler {

public void handle(ServletResponse response, Exception ex) throws IOException {
if (ex instanceof InterceptException) {
String reason = ex.getMessage();
byte[] content = reason.getBytes(StandardCharsets.UTF_8);
MetaData.Response info = new MetaData.Response();
info.setHttpVersion(HttpVersion.HTTP_1_1);
info.setReason(reason);
info.setStatus(((InterceptException) ex).getErrorCode());
info.setContentLength(content.length);
if (response instanceof org.eclipse.jetty.server.Response) {
String errorData = ObjectMapperFactory
.getThreadLocal().writeValueAsString(new ErrorData(ex.getMessage()));
byte[] errorBytes = errorData.getBytes(StandardCharsets.UTF_8);
int errorCode = ((InterceptException) ex).getErrorCode();
HttpFields httpFields = new HttpFields();
HttpField httpField = new HttpField(HttpHeader.CONTENT_TYPE, "application/json;charset=utf-8");
httpFields.add(httpField);
MetaData.Response info = new MetaData.Response(HttpVersion.HTTP_1_1, errorCode, httpFields);
info.setHttpVersion(HttpVersion.HTTP_1_1);
info.setReason(errorData);
info.setStatus(errorCode);
info.setContentLength(errorBytes.length);
((org.eclipse.jetty.server.Response) response).getHttpChannel().sendResponse(info,
ByteBuffer.wrap(content), true);
ByteBuffer.wrap(errorBytes),
true);
} else {
((HttpServletResponse) response).sendError(((InterceptException) ex).getErrorCode(),
ex.getMessage());
Expand Down
30 changes: 30 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.common.nar.NarClassLoader;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.awaitility.Awaitility;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
Expand All @@ -40,7 +41,9 @@

import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

Expand Down Expand Up @@ -269,8 +272,35 @@ public void onResponse(Call call, Response response) throws IOException {
Awaitility.await().until(() -> !interceptor.getResponseList().isEmpty());
CounterBrokerInterceptor.ResponseEvent responseEvent = interceptor.getResponseList().get(0);
Assert.assertEquals(responseEvent.getRequestUri(), "/admin/v3/test/asyncGet/my-topic/1000");

Assert.assertEquals(responseEvent.getResponseStatus(),
javax.ws.rs.core.Response.noContent().build().getStatus());
}

public void requestInterceptorFailedTest() {
Set<String> allowedClusters = new HashSet<>();
allowedClusters.add(configClusterName);
TenantInfoImpl tenantInfo = new TenantInfoImpl(new HashSet<>(), allowedClusters);
try {
admin.tenants().createTenant("test-interceptor-failed-tenant", tenantInfo);
Assert.fail("Create tenant because interceptor should fail");
} catch (PulsarAdminException e) {
Assert.assertEquals(e.getHttpError(), "Create tenant failed");
}

try {
admin.namespaces().createNamespace("public/test-interceptor-failed-namespace");
Assert.fail("Create namespace because interceptor should fail");
} catch (PulsarAdminException e) {
Assert.assertEquals(e.getHttpError(), "Create namespace failed");
}

try {
admin.topics().createNonPartitionedTopic("persistent://public/default/test-interceptor-failed-topic");
Assert.fail("Create topic because interceptor should fail");
} catch (PulsarAdminException e) {
Assert.assertEquals(e.getHttpError(), "Create topic failed");
}
}

}
20 changes: 17 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.http.HttpStatus;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.service.Consumer;
import org.apache.pulsar.broker.service.Producer;
Expand All @@ -43,6 +44,7 @@
import org.apache.pulsar.common.api.proto.CommandAck;
import org.apache.pulsar.common.api.proto.MessageMetadata;
import org.apache.pulsar.common.api.proto.TxnAction;
import org.apache.pulsar.common.intercept.InterceptException;
import org.eclipse.jetty.server.Response;


Expand Down Expand Up @@ -216,25 +218,37 @@ public void onConnectionClosed(ServerCnx cnx) {
}

@Override
public void onWebserviceRequest(ServletRequest request) {
public void onWebserviceRequest(ServletRequest request) throws IOException, ServletException, InterceptException {
count.incrementAndGet();
String url = ((HttpServletRequest) request).getRequestURL().toString();
if (log.isDebugEnabled()) {
log.debug("[{}] On [{}] Webservice request", count, ((HttpServletRequest) request).getRequestURL().toString());
log.debug("[{}] On [{}] Webservice request", count, url);
}
if (url.contains("/admin/v2/tenants/test-interceptor-failed-tenant")) {
throw new InterceptException(HttpStatus.SC_PRECONDITION_FAILED, "Create tenant failed");
}
if (url.contains("/admin/v2/namespaces/public/test-interceptor-failed-namespace")) {
throw new InterceptException(HttpStatus.SC_PRECONDITION_FAILED, "Create namespace failed");
}
if (url.contains("/admin/v2/persistent/public/default/test-interceptor-failed-topic")) {
throw new InterceptException(HttpStatus.SC_PRECONDITION_FAILED, "Create topic failed");
}
}

@Override
public void onWebserviceResponse(ServletRequest request, ServletResponse response) {
count.incrementAndGet();
if (log.isDebugEnabled()) {
log.debug("[{}] On [{}] Webservice response {}", count, ((HttpServletRequest) request).getRequestURL().toString(), response);
log.debug("[{}] On [{}] Webservice response {}",
count, ((HttpServletRequest) request).getRequestURL().toString(), response);
}
if (response instanceof Response) {
Response res = (Response) response;
responseList.add(new ResponseEvent(res.getHttpChannel().getRequest().getRequestURI(), res.getStatus()));
}
}


@Override
public void onFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
Expand Down