fix: incorrect Content-Disposition serialization (#31694)

* fix: incorrect Content-Disposition serialization * test: fixup test Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · Nov 4, 2021 · 8c84255 · 8c84255
1 parent e918fe6
commit 8c84255
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc
@@ -133,8 +133,10 @@ v8::Local<v8::Value> HttpResponseHeadersToV8(
         net::HttpContentDisposition header(value, std::string());
         std::string decodedFilename =
             header.is_attachment() ? " attachment" : " inline";
-        decodedFilename += "; filename=" + header.filename();
-        value = decodedFilename;
+        // The filename must be encased in double quotes for serialization
+        // to happen correctly.
+        std::string filename = "\"" + header.filename() + "\"";
+        value = decodedFilename + "; filename=" + filename;
       }
       if (!values)
         values = response_headers.SetKey(key, base::ListValue());

diff --git a/spec-main/api-web-request-spec.ts b/spec-main/api-web-request-spec.ts
@@ -354,7 +354,7 @@ describe('webRequest module', () => {
 
     it('does not change content-disposition header by default', async () => {
       ses.webRequest.onHeadersReceived((details, callback) => {
-        expect(details.responseHeaders!['content-disposition']).to.deep.equal([' attachment; filename=aa中aa.txt']);
+        expect(details.responseHeaders!['content-disposition']).to.deep.equal([' attachment; filename="aa中aa.txt"']);
         callback({});
       });
       const { data, headers } = await ajax(defaultURL + 'contentDisposition');