Skip to content

Commit 6b48ee0

Browse files
committed
Upgrade reqwest to 0.12
There's a small change in how reqwest errors are printed (see <seanmonstar/reqwest#2199>), so handle that in our code and update one test accordingly. Import a number of audits and trust markers, a few audits will still be needed. Fixes #1985.
1 parent 43cd245 commit 6b48ee0

File tree

6 files changed

+285
-36
lines changed

6 files changed

+285
-36
lines changed

Cargo.lock

+119-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proxy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ qubesdb = []
1111
[dependencies]
1212
anyhow = {version = "1.0.75"}
1313
futures-util = "0.3.30"
14-
reqwest = {version = "0.11.20", features = ["gzip", "stream"]}
14+
reqwest = { version = "0.12", features = ["gzip", "stream"] }
1515
serde = {version = "1.0.188", features = ["derive"]}
1616
serde_json = "1.0.107"
1717
tokio = {version = "1.0", features = ["macros", "rt"]}

proxy/src/main.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,12 @@ async fn main() -> ExitCode {
165165
match proxy().await {
166166
Ok(()) => ExitCode::SUCCESS,
167167
Err(err) => {
168+
let mut error = err.to_string();
169+
if let Some(source) = err.source() {
170+
error = format!("{}: {}", error, source);
171+
}
168172
// Try to serialize into our error format
169-
let resp = ErrorResponse {
170-
error: err.to_string(),
171-
};
173+
let resp = ErrorResponse { error };
172174
match serde_json::to_string(&resp) {
173175
Ok(json) => {
174176
// Print the error to stderr

proxy/tests/test_errors.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,5 @@ def test_cannot_connect(proxy_request):
6767
assert (
6868
result.stderr.decode().strip()
6969
== '{"error":"error sending request for url (http://missing.test/): '
70-
+ "error trying to connect: dns error: failed to lookup address information: "
71-
+ 'Name or service not known"}'
70+
+ 'client error (Connect)"}'
7271
)

0 commit comments

Comments
 (0)