Skip to content

Commit

Permalink
Always explicitly disable gzip automatic decompression on reqwest c…
Browse files Browse the repository at this point in the history
…lient used by object_store (#6843)

* Explicitly disable gzip on reqwest client used by object_store

* Add comment

* Add integration test for checking reqwest gzip feature

* Fix lint

* Add comment explaining why gzip feature is enabled
  • Loading branch information
phillipleblanc authored Dec 11, 2024
1 parent 06a0157 commit 50cf8bd
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
2 changes: 2 additions & 0 deletions object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ http-body-util = "0.1"
rand = "0.8"
tempfile = "3.1.0"
regex = "1.11.1"
# The "gzip" feature for reqwest is enabled for an integration test.
reqwest = { version = "0.12", features = ["gzip"] }
http = "1.1.0"

[[test]]
Expand Down
4 changes: 4 additions & 0 deletions object_store/src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,10 @@ impl ClientOptions {
builder = builder.danger_accept_invalid_certs(true)
}

// Reqwest will remove the `Content-Length` header if it is configured to
// transparently decompress the body via the non-default `gzip` feature.
builder = builder.no_gzip();

builder
.https_only(!self.allow_http.get()?)
.build()
Expand Down
43 changes: 43 additions & 0 deletions object_store/tests/http.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// 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.

//! Tests the HTTP store implementation
#[cfg(feature = "http")]
use object_store::{http::HttpBuilder, path::Path, GetOptions, GetRange, ObjectStore};

/// Tests that even when reqwest has the `gzip` feature enabled, the HTTP store
/// does not error on a missing `Content-Length` header.
#[tokio::test]
#[cfg(feature = "http")]
async fn test_http_store_gzip() {
let http_store = HttpBuilder::new()
.with_url("https://raw.githubusercontent.com/apache/arrow-rs/refs/heads/main")
.build()
.unwrap();

let _ = http_store
.get_opts(
&Path::parse("LICENSE.txt").unwrap(),
GetOptions {
range: Some(GetRange::Bounded(0..100)),
..Default::default()
},
)
.await
.unwrap();
}

0 comments on commit 50cf8bd

Please sign in to comment.