mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: incorrect Content-Disposition serialization (#31669)

Browse source 
* fix: incorrect Content-Disposition serialization

* test: fixup test
This commit is contained in:
Shelley Vohr 2021-11-03 15:11:37 +01:00 • committed by GitHub
parent 31e877515c
commit 24b02d68a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/api/electron_api_web_request.cc
View file

@ -133,8 +133,10 @@ v8::Local<v8::Value> HttpResponseHeadersToV8(
net::HttpContentDisposition header(value, std::string()); net::HttpContentDisposition header(value, std::string());
std::string decodedFilename = std::string decodedFilename =
header.is_attachment() ? " attachment" : " inline"; header.is_attachment() ? " attachment" : " inline";
decodedFilename += "; filename=" + header.filename(); // The filename must be encased in double quotes for serialization
value = decodedFilename; // to happen correctly.
std::string filename = "\"" + header.filename() + "\"";
value = decodedFilename + "; filename=" + filename;
} }
if (!values) if (!values)
values = response_headers.SetKey(key, base::ListValue()); values = response_headers.SetKey(key, base::ListValue());

2
spec-main/api-web-request-spec.ts
View file

@ -354,7 +354,7 @@ describe('webRequest module', () => {
it('does not change content-disposition header by default', async () => { it('does not change content-disposition header by default', async () => {
ses.webRequest.onHeadersReceived((details, callback) => { 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({}); callback({});
}); });
const { data, headers } = await ajax(defaultURL + 'contentDisposition'); const { data, headers } = await ajax(defaultURL + 'contentDisposition');