Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ext/web): use mimesniff in FileAPI #16233

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

fix(ext/web): use mimesniff in FileAPI #16233

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d8b9a1e
fix(ext/mimesniff): fix parseMimeType
marcosc90 Oct 10, 2022
c18129f
use parseMimeType in normalizeType
marcosc90 Oct 10, 2022
b50e590
Merge branch 'main' into fix-mimesniff
marcosc90 Oct 29, 2022
e834da4
enable tests
marcosc90 Oct 29, 2022
46ad0d6
Merge branch 'main' into fix-mimesniff
bartlomieju Oct 30, 2022
8e78e17
disable broken blob tests
marcosc90 Oct 31, 2022
5851b14
disable broken tests
marcosc90 Oct 31, 2022
be3f2ef
Merge branch 'main' into fix-mimesniff
crowlKats Jan 13, 2023
f62a991
Merge branch 'main' into fix-mimesniff
aapoalas Jul 7, 2023
2d9866d
Fix lint
aapoalas Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ext/web/01_mimesniff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@
position = res.position;

// 11.8.2.
position++;
const res2 = collectSequenceOfCodepoints(
input,
position,
(c) => c !== "\u003B",
);
position = res2.position;
} else { // 11.9.
// 11.9.1.
const res = collectSequenceOfCodepoints(
Expand Down
10 changes: 3 additions & 7 deletions ext/web/09_file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@
MathMax,
MathMin,
ObjectPrototypeIsPrototypeOf,
RegExpPrototypeTest,
StringPrototypeCharAt,
StringPrototypeToLowerCase,
StringPrototypeSlice,
Symbol,
SymbolFor,
TypedArrayPrototypeSet,
TypeError,
Uint8Array,
} = window.__bootstrap.primordials;
const mimesniff = window.__bootstrap.mimesniff;
const consoleInternal = window.__bootstrap.console;

// TODO(lucacasonato): this needs to not be hardcoded and instead depend on
Expand Down Expand Up @@ -145,11 +144,8 @@
* @returns {string}
*/
function normalizeType(str) {
let normalizedType = str;
if (!RegExpPrototypeTest(/^[\x20-\x7E]*$/, str)) {
normalizedType = "";
}
return StringPrototypeToLowerCase(normalizedType);
const mime = mimesniff.parseMimeType(str);
return mime !== null ? mimesniff.serializeMimeType(mime) : "";
}

/**
Expand Down
Loading