Merge pull request #2015 from freedomofpress/reqwest-0.12

Upgrade reqwest to 0.12

proxy/Cargo.toml

@@ -11,7 +11,7 @@ qubesdb = []
 [dependencies]
 anyhow = {version = "1.0.75"}
 futures-util = "0.3.30"
-reqwest = {version = "0.11.20", features = ["gzip", "stream"]}
+reqwest = { version = "0.12", features = ["gzip", "stream"] }
 serde = {version = "1.0.188", features = ["derive"]}
 serde_json = "1.0.107"
 tokio = {version = "1.0", features = ["macros", "rt"]}

proxy/src/main.rs

@@ -165,10 +165,12 @@ async fn main() -> ExitCode {
     match proxy().await {
         Ok(()) => ExitCode::SUCCESS,
         Err(err) => {
+            let mut error = err.to_string();
+            if let Some(source) = err.source() {
+                error = format!("{}: {}", error, source);
+            }
             // Try to serialize into our error format
-            let resp = ErrorResponse {
-                error: err.to_string(),
-            };
+            let resp = ErrorResponse { error };
             match serde_json::to_string(&resp) {
                 Ok(json) => {
                     // Print the error to stderr

proxy/tests/test_errors.py

@@ -67,6 +67,5 @@ def test_cannot_connect(proxy_request):
     assert (
         result.stderr.decode().strip()
         == '{"error":"error sending request for url (http://missing.test/): '
-        + "error trying to connect: dns error: failed to lookup address information: "
-        + 'Name or service not known"}'
+        + 'client error (Connect)"}'
     )