Fix: allow explicit cookie header overwrite (#6672)

src/utils/proxy/cookie-jar.js

@@ -2,13 +2,13 @@ import { Cookie, CookieJar } from "tough-cookie";
 
 const cookieJar = new CookieJar();
 
-export function setCookieHeader(url, params) {
+export function setCookieHeader(url, params, { overwrite = false } = {}) {
   // add cookie header, if we have one in the jar
   const existingCookie = cookieJar.getCookieStringSync(url.toString());
   if (existingCookie) {
     params.headers = params.headers ?? {};
     const cookieHeader = params.cookieHeader ?? "Cookie";
-    if (!params.headers[cookieHeader]) {
+    if (overwrite || !params.headers[cookieHeader]) {
       params.headers[cookieHeader] = existingCookie;
     }
   }

src/utils/proxy/cookie-jar.test.js

@@ -54,4 +54,17 @@ describe("utils/proxy/cookie-jar", () => {
 
     expect(params.headers.Cookie).toBe("manual=1");
   });
+
+  it("overwrites an existing cookie header when requested", async () => {
+    const { addCookieToJar, setCookieHeader } = await import("./cookie-jar");
+
+    const url = new URL("http://example5.test/path");
+    addCookieToJar(url, { "set-cookie": ["sid=1; Path=/"] });
+
+    const params = { headers: { Cookie: "stale=1" } };
+    setCookieHeader(url, params, { overwrite: true });
+
+    expect(params.headers.Cookie).toContain("sid=1");
+    expect(params.headers.Cookie).not.toContain("stale=1");
+  });
 });

src/utils/proxy/handlers/unifi.js

@@ -97,7 +97,7 @@ export default function createUnifiProxyHandler({
       }
 
       addCookieToJar(url, responseHeaders);
-      setCookieHeader(url, params);
+      setCookieHeader(url, params, { overwrite: true });
 
       [status, contentType, data, responseHeaders] = await httpProxy(url, params);
     }

src/utils/proxy/http.js

@@ -18,7 +18,7 @@ function addCookieHandler(url, params) {
   // handle cookies during redirects
   params.beforeRedirect = (options, responseInfo) => {
     addCookieToJar(options.href, responseInfo.headers);
-    setCookieHeader(options.href, options);
+    setCookieHeader(options.href, options, { overwrite: true });
   };
 }
 

src/utils/proxy/http.test.js

@@ -348,7 +348,9 @@ describe("utils/proxy/http httpProxy", () => {
     );
 
     expect(cookieJar.addCookieToJar).toHaveBeenCalledWith("http://example.com/redirect", { "set-cookie": ["a=b"] });
-    expect(cookieJar.setCookieHeader).toHaveBeenCalledWith("http://example.com/redirect", expect.any(Object));
+    expect(cookieJar.setCookieHeader).toHaveBeenCalledWith("http://example.com/redirect", expect.any(Object), {
+      overwrite: true,
+    });
   });
 
   it("supports gzip-compressed responses", async () => {