Skip to content

Commit 454d84f

Browse files
committed
xds: default to UNKNOWN status when ImmediateResponse status is unset
TAG=agy CONV=581f86a6-097d-44a2-9d6e-6f9d2e83cbc0
1 parent 52cc812 commit 454d84f

2 files changed

Lines changed: 106 additions & 1 deletion

File tree

‎xds/src/main/java/io/grpc/xds/ExternalProcessorServerInterceptor.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,9 @@ void drainPendingDownstreamBodyMessages() {
14911491

14921492
private void handleImmediateResponse(ImmediateResponse immediate)
14931493
throws HeaderMutationDisallowedException {
1494-
Status status = Status.fromCodeValue(immediate.getGrpcStatus().getStatus());
1494+
Status status = immediate.hasGrpcStatus()
1495+
? Status.fromCodeValue(immediate.getGrpcStatus().getStatus())
1496+
: Status.UNKNOWN;
14951497
if (!immediate.getDetails().isEmpty()) {
14961498
status = status.withDescription(immediate.getDetails());
14971499
}

‎xds/src/test/java/io/grpc/xds/ExternalProcessorServerInterceptorTest.java‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11463,6 +11463,109 @@ public void onClose(Status status, Metadata trailers) {
1146311463
assertThat(dataPlaneStarted.get()).isFalse();
1146411464
}
1146511465

11466+
@Test
11467+
public void
11468+
serverInterceptor_immediateResponseWithUnsetStatus_whenReceived_thenStatusUnknown()
11469+
throws Exception {
11470+
ExternalProcessor proto =
11471+
createBaseProto(extProcServerName)
11472+
.setProcessingMode(
11473+
ProcessingMode.newBuilder()
11474+
.setRequestHeaderMode(ProcessingMode.HeaderSendMode.SEND)
11475+
.setResponseHeaderMode(ProcessingMode.HeaderSendMode.SKIP)
11476+
.setResponseTrailerMode(ProcessingMode.HeaderSendMode.SKIP)
11477+
.build())
11478+
.build();
11479+
ConfigOrError<ExternalProcessorFilterConfig> configOrError =
11480+
provider.parseFilterConfig(Any.pack(proto), filterContext);
11481+
assertThat(configOrError.errorDetail).isNull();
11482+
ExternalProcessorFilterConfig filterConfig = configOrError.config;
11483+
11484+
ExternalProcessorGrpc.ExternalProcessorImplBase extProcImpl =
11485+
new ExternalProcessorGrpc.ExternalProcessorImplBase() {
11486+
@Override
11487+
@SuppressWarnings("unchecked")
11488+
public StreamObserver<ProcessingRequest> process(
11489+
StreamObserver<ProcessingResponse> responseObserver) {
11490+
((ServerCallStreamObserver<ProcessingResponse>) responseObserver).request(100);
11491+
return new StreamObserver<ProcessingRequest>() {
11492+
@Override
11493+
public void onNext(ProcessingRequest request) {
11494+
if (request.hasRequestHeaders()) {
11495+
responseObserver.onNext(
11496+
ProcessingResponse.newBuilder()
11497+
.setImmediateResponse(
11498+
io.envoyproxy.envoy.service.ext_proc.v3.ImmediateResponse.newBuilder()
11499+
.setDetails("Custom security rejection")
11500+
.build())
11501+
.build());
11502+
responseObserver.onCompleted();
11503+
}
11504+
}
11505+
11506+
@Override
11507+
public void onError(Throwable t) {}
11508+
11509+
@Override
11510+
public void onCompleted() {}
11511+
};
11512+
}
11513+
};
11514+
11515+
grpcCleanup.register(
11516+
InProcessServerBuilder.forName(extProcServerName)
11517+
.addService(extProcImpl)
11518+
.directExecutor()
11519+
.build()
11520+
.start());
11521+
11522+
CachedChannelManager channelManager =
11523+
new CachedChannelManager(
11524+
config ->
11525+
grpcCleanup.register(
11526+
InProcessChannelBuilder.forName(extProcServerName).directExecutor().build()));
11527+
11528+
ExternalProcessorServerInterceptor interceptor =
11529+
new ExternalProcessorServerInterceptor(filterConfig, channelManager, FAKE_CONTEXT);
11530+
11531+
final AtomicBoolean dataPlaneStarted = new AtomicBoolean(false);
11532+
dataPlaneHandler =
11533+
new DataPlaneServiceHandler() {
11534+
@Override
11535+
public void sayHello(InputStream request, StreamObserver<InputStream> responseObserver) {
11536+
dataPlaneStarted.set(true);
11537+
responseObserver.onNext(request);
11538+
responseObserver.onCompleted();
11539+
}
11540+
};
11541+
11542+
startDataPlane(interceptor);
11543+
11544+
io.grpc.ClientCall<InputStream, InputStream> clientCall =
11545+
dataPlaneChannel.newCall(METHOD_SAY_HELLO_RAW, io.grpc.CallOptions.DEFAULT);
11546+
11547+
final CountDownLatch callCompletedLatch = new CountDownLatch(1);
11548+
final AtomicReference<Status> closedStatus = new AtomicReference<>();
11549+
clientCall.start(
11550+
new io.grpc.ClientCall.Listener<InputStream>() {
11551+
@Override
11552+
public void onClose(Status status, Metadata trailers) {
11553+
closedStatus.set(status);
11554+
callCompletedLatch.countDown();
11555+
}
11556+
},
11557+
new Metadata());
11558+
11559+
clientCall.request(1);
11560+
clientCall.sendMessage(new ByteArrayInputStream("hello".getBytes(StandardCharsets.UTF_8)));
11561+
clientCall.halfClose();
11562+
11563+
assertThat(callCompletedLatch.await(5, TimeUnit.SECONDS)).isTrue();
11564+
assertThat(closedStatus.get().getCode()).isEqualTo(Status.Code.UNKNOWN);
11565+
assertThat(closedStatus.get().getDescription()).isEqualTo("Custom security rejection");
11566+
assertThat(dataPlaneStarted.get()).isFalse();
11567+
}
11568+
1146611569
@Test
1146711570
public void serverInterceptor_immediateResponse_duringResponseHeaders_closesCall()
1146811571
throws Exception {

0 commit comments

Comments
 (0)