fix(http): allow User-Agent header to be set (#983)

* fix(http): allow `User-Agent` header to be set closes #966 * lint * fix build
tauri-apps · Feb 23, 2024 · ae56b13 · ae56b13
1 parent 267e39e
commit ae56b13
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 9 deletions.
diff --git a/.changes/http-user-agent.md b/.changes/http-user-agent.md
@@ -0,0 +1,6 @@
+---
+"http": "patch"
+"http-js": "patch"
+---
+
+Allow `User-Agent` header to be set.
diff --git a/plugins/http/guest-js/index.ts b/plugins/http/guest-js/index.ts
@@ -115,6 +115,21 @@ export async function fetch(
 
   const signal = init?.signal;
 
+  const headers = !init?.headers
+    ? []
+    : init.headers instanceof Headers
+      ? Array.from(init.headers.entries())
+      : Array.isArray(init.headers)
+        ? init.headers
+        : Object.entries(init.headers);
+
+  const mappedHeaders: [string, string][] = headers.map(([name, val]) => [
+    name,
+    // we need to ensure we have all values as strings
+    // eslint-disable-next-line
+    typeof val === "string" ? val : (val as any).toString(),
+  ]);
+
   const req = new Request(input, init);
   const buffer = await req.arrayBuffer();
   const reqData = buffer.byteLength ? Array.from(new Uint8Array(buffer)) : null;
@@ -123,7 +138,7 @@ export async function fetch(
     clientConfig: {
       method: req.method,
       url: req.url,
-      headers: Array.from(req.headers.entries()),
+      headers: mappedHeaders,
       data: reqData,
       maxRedirections,
       connectTimeout,
@@ -149,7 +164,7 @@ export async function fetch(
     status,
     statusText,
     url,
-    headers,
+    headers: responseHeaders,
     rid: responseRid,
   } = await invoke<FetchSendResponse>("plugin:http|fetch_send", {
     rid,
@@ -169,7 +184,7 @@ export async function fetch(
         ? new Uint8Array(body)
         : null,
     {
-      headers,
+      headers: responseHeaders,
       status,
       statusText,
     },

diff --git a/plugins/http/src/api-iife.js b/plugins/http/src/api-iife.js
diff --git a/plugins/http/src/commands.rs b/plugins/http/src/commands.rs
@@ -192,11 +192,33 @@ pub async fn fetch<R: Runtime>(
 
                 let mut request = builder.build()?.request(method.clone(), url);
 
-                for (key, value) in &headers {
-                    let name = HeaderName::from_bytes(key.as_bytes())?;
-                    let v = HeaderValue::from_bytes(value.as_bytes())?;
-                    if !matches!(name, header::HOST | header::CONTENT_LENGTH) {
-                        request = request.header(name, v);
+                for (name, value) in &headers {
+                    let name = HeaderName::from_bytes(name.as_bytes())?;
+                    let value = HeaderValue::from_bytes(value.as_bytes())?;
+                    if !matches!(
+                        name,
+                        // forbidden headers per fetch spec https://fetch.spec.whatwg.org/#terminology-headers
+                        header::ACCEPT_CHARSET
+                            | header::ACCEPT_ENCODING
+                            | header::ACCESS_CONTROL_REQUEST_HEADERS
+                            | header::ACCESS_CONTROL_REQUEST_METHOD
+                            | header::CONNECTION
+                            | header::CONTENT_LENGTH
+                            | header::COOKIE
+                            | header::DATE
+                            | header::DNT
+                            | header::EXPECT
+                            | header::HOST
+                            | header::ORIGIN
+                            | header::REFERER
+                            | header::SET_COOKIE
+                            | header::TE
+                            | header::TRAILER
+                            | header::TRANSFER_ENCODING
+                            | header::UPGRADE
+                            | header::VIA
+                    ) {
+                        request = request.header(name, value);
                     }
                 }