Copilot commented on code in PR #3930: URL: https://github.com/apache/thrift/pull/3930#discussion_r4098890651
########## lib/netstd/Thrift/Transport/Client/THttpPerCallTransport.cs: ########## @@ -0,0 +1,207 @@ +// 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. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace Thrift.Transport.Client +{ + /// <summary> + /// Implementation of a per-call transport for THttpTransport. + /// Each call to the server will create a new HTTP request and response. + /// </summary> + internal class THttpPerCallTransport : TEndpointTransport + { + private readonly THttpTransport _parent; + private readonly MemoryStream _request = new MemoryStream(); + + private HttpResponseMessage _response; + private Stream _responseStream; + private CancellationTokenSource _responseReadTimeout; + private bool _sent; + private bool _disposed; + + public THttpPerCallTransport(THttpTransport parent) : base(parent.Configuration) + { + this._parent = parent; + } + + public override bool IsOpen => !_disposed; + + public override Task WriteAsync( + byte[] buffer, + int offset, + int length, + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + return _request.WriteAsync( + buffer, + offset, + length, + cancellationToken); + } + + public override async Task FlushAsync( + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + _request.Position = 0; + var response = await _parent.SendAsync(_request, cancellationToken); + + var responseReadTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + if (_parent.ConnectTimeout > 0) + { + responseReadTimeout.CancelAfter(_parent.ConnectTimeout); + } + + Stream responseStream = null; + try + { +#if NET5_0_OR_GREATER + responseStream = await response.Content.ReadAsStreamAsync(cancellationToken); +#else + responseStream = await response.Content.ReadAsStreamAsync(); +#endif Review Comment: On the netstandard2.0/2.1 targets this branch calls the non-cancellable `ReadAsStreamAsync()` overload, so neither the caller token nor the `responseReadTimeout` created above can interrupt response-stream acquisition. A handler/content implementation that waits for the response body before returning its stream can therefore hang indefinitely despite `ConnectTimeout`; use a cancellation-aware acquisition strategy for these targets as well. This issue also appears on line 99 of the same file. ########## lib/netstd/Thrift/Transport/Client/THttpTransport.cs: ########## @@ -237,27 +264,57 @@ private void ConfigureClient(HttpClient httpClient) public override async Task FlushAsync(CancellationToken cancellationToken) { + StreamContent contentStream = null; + HttpRequestMessage request = null; + HttpResponseMessage response = null; + CancellationTokenSource responseReadTimeout = null; try { _outputStream.Seek(0, SeekOrigin.Begin); - using (var contentStream = new StreamContent(_outputStream)) + contentStream = new StreamContent(_outputStream); + contentStream.Headers.ContentType = ContentType ?? new MediaTypeHeaderValue(@"application/x-thrift"); + + request = new HttpRequestMessage(HttpMethod.Post, _uri) { - contentStream.Headers.ContentType = ContentType ?? new MediaTypeHeaderValue(@"application/x-thrift"); + Content = contentStream + }; - var response = (await _httpClient.PostAsync(_uri, contentStream, cancellationToken)).EnsureSuccessStatusCode(); + response = await _httpClient.SendAsync( + request, + HttpCompletionOption.ResponseHeadersRead, + cancellationToken); + response.EnsureSuccessStatusCode(); - _inputStream?.Dispose(); + responseReadTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + if (_connectTimeout > 0) + { + responseReadTimeout.CancelAfter(_connectTimeout); + } + + Stream inputStream; #if NET5_0_OR_GREATER - _inputStream = await response.Content.ReadAsStreamAsync(cancellationToken); + inputStream = await response.Content.ReadAsStreamAsync(cancellationToken); #else - _inputStream = await response.Content.ReadAsStreamAsync(); + inputStream = await response.Content.ReadAsStreamAsync(); #endif Review Comment: On the netstandard2.0/2.1 targets this branch calls the non-cancellable `ReadAsStreamAsync()` overload, so neither the caller token nor the `responseReadTimeout` created above can interrupt response-stream acquisition. A handler/content implementation that waits for the response body before returning its stream can therefore hang indefinitely despite `ConnectTimeout`; use a cancellation-aware acquisition strategy for these targets as well. This issue also appears on line 306 of the same file. -- 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]
