Skip to content

grpc-web: relax bounds for inner service's response body #2245

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

Merged
merged 2 commits into from
Apr 5, 2025
Merged

grpc-web: relax bounds for inner service's response body #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44c6e5e
grpc-web: relax bounds for inner service's response body
bmwill Apr 4, 2025
10f005a
address feedback
bmwill Apr 5, 2025
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
1 change: 1 addition & 0 deletions tonic-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ tracing = "0.1"
[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt"] }
tower-http = { version = "0.6", features = ["cors"] }
axum = { version = "0.8", default-features = false }

[lints]
workspace = true
Expand Down
39 changes: 27 additions & 12 deletions tonic-web/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,23 @@ impl<S> GrpcWebService<S> {
}
}

impl<S, B> Service<Request<B>> for GrpcWebService<S>
impl<S, ReqBody, ResBody> Service<Request<ReqBody>> for GrpcWebService<S>
where
S: Service<Request<Body>, Response = Response<Body>>,
B: http_body::Body<Data = bytes::Bytes> + Send + 'static,
B::Error: Into<crate::BoxError> + fmt::Display,
S: Service<Request<Body>, Response = Response<ResBody>>,
ReqBody: http_body::Body<Data = bytes::Bytes> + Send + 'static,
ReqBody::Error: Into<crate::BoxError> + fmt::Display,
ResBody: http_body::Body<Data = bytes::Bytes> + Send + 'static,
ResBody::Error: Into<crate::BoxError> + fmt::Display,
{
type Response = S::Response;
type Response = Response<Body>;
type Error = S::Error;
type Future = ResponseFuture<S::Future>;

fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
self.inner.poll_ready(cx)
}

fn call(&mut self, req: Request<B>) -> Self::Future {
fn call(&mut self, req: Request<ReqBody>) -> Self::Future {
match RequestKind::new(req.headers(), req.method(), req.version()) {
// A valid grpc-web request, regardless of HTTP version.
//
Expand Down Expand Up @@ -152,9 +154,11 @@ impl<F> Case<F> {
}
}

impl<F, E> Future for ResponseFuture<F>
impl<F, B, E> Future for ResponseFuture<F>
where
F: Future<Output = Result<Response<Body>, E>>,
F: Future<Output = Result<Response<B>, E>>,
B: http_body::Body<Data = bytes::Bytes> + Send + 'static,
B::Error: Into<crate::BoxError> + fmt::Display,
{
type Output = Result<Response<Body>, E>;

Expand All @@ -167,7 +171,7 @@ where

Poll::Ready(Ok(coerce_response(res, *accept)))
}
CaseProj::Other { future } => future.poll(cx),
CaseProj::Other { future } => future.poll(cx).map_ok(|res| res.map(Body::new)),
CaseProj::ImmediateResponse { res } => {
let res = Response::from_parts(res.take().unwrap(), Body::empty());
Poll::Ready(Ok(res))
Expand Down Expand Up @@ -255,16 +259,16 @@ mod tests {
#[derive(Debug, Clone)]
struct Svc;

impl tower_service::Service<Request<Body>> for Svc {
impl<B> tower_service::Service<Request<B>> for Svc {
type Response = Response<Body>;
type Error = String;
type Error = std::convert::Infallible;
type Future = BoxFuture<Self::Response, Self::Error>;

fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}

fn call(&mut self, _: Request<Body>) -> Self::Future {
fn call(&mut self, _: Request<B>) -> Self::Future {
Box::pin(async { Ok(Response::new(Body::default())) })
}
}
Expand Down Expand Up @@ -313,6 +317,17 @@ mod tests {
assert_eq!(res.status(), StatusCode::OK);
}

#[tokio::test]
async fn web_layer_with_axum() {
let mut svc = axum::routing::Router::new()
.route("/", axum::routing::post_service(Svc))
.layer(crate::GrpcWebLayer::new());

let res = svc.call(request()).await.unwrap();

assert_eq!(res.status(), StatusCode::OK);
}

#[tokio::test]
async fn without_origin() {
let mut svc = enable(Svc);
Expand Down
Loading