public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-03-22 04:34:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1681 from lightpanda-io/xhr_url_escape_mime_parse_lax

Browse Source 
Escape XHR URL, Lax MIME parameter parsing
This commit is contained in:
Pierre Tachoire
2026-03-01 10:55:50 +01:00
committed by GitHub
parent 839052f4b8 059fb85e22
commit 71df03b729
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/browser/Mime.zig
View File

@@ -133,12 +133,12 @@ pub fn parse(input: []u8) !Mime {
var it = std.mem.splitScalar(u8, params, ';'); var it = std.mem.splitScalar(u8, params, ';');
while (it.next()) |attr| { while (it.next()) |attr| {
const i = std.mem.indexOfScalarPos(u8, attr, 0, '=') orelse return error.Invalid; const i = std.mem.indexOfScalarPos(u8, attr, 0, '=') orelse continue;
const name = trimLeft(attr[0..i]); const name = trimLeft(attr[0..i]);
const value = trimRight(attr[i + 1 ..]); const value = trimRight(attr[i + 1 ..]);
if (value.len == 0) { if (value.len == 0) {
return error.Invalid; continue;
} }
const attribute_name = std.meta.stringToEnum(enum { const attribute_name = std.meta.stringToEnum(enum {
@@ -151,7 +151,7 @@ pub fn parse(input: []u8) !Mime {
break; break;
} }
const attribute_value = try parseCharset(value); const attribute_value = parseCharset(value) catch continue;
@memcpy(charset[0..attribute_value.len], attribute_value); @memcpy(charset[0..attribute_value.len], attribute_value);
// Null-terminate right after attribute value. // Null-terminate right after attribute value.
charset[attribute_value.len] = 0; charset[attribute_value.len] = 0;
@@ -335,6 +335,19 @@ test "Mime: invalid" {
"text/ html", "text/ html",
"text / html", "text / html",
"text/html other", "text/html other",
};
for (invalids) |invalid| {
const mutable_input = try testing.arena_allocator.dupe(u8, invalid);
try testing.expectError(error.Invalid, Mime.parse(mutable_input));
}
}
test "Mime: malformed parameters are ignored" {
defer testing.reset();
// These should all parse successfully as text/html with malformed params ignored
const valid_with_malformed_params = [_][]const u8{
"text/html; x", "text/html; x",
"text/html; x=", "text/html; x=",
"text/html; x= ", "text/html; x= ",
@@ -343,11 +356,13 @@ test "Mime: invalid" {
"text/html; charset=\"\"", "text/html; charset=\"\"",
"text/html; charset=\"", "text/html; charset=\"",
"text/html; charset=\"\\", "text/html; charset=\"\\",
"text/html;\"",
}; };
for (invalids) |invalid| { for (valid_with_malformed_params) |input| {
const mutable_input = try testing.arena_allocator.dupe(u8, invalid); const mutable_input = try testing.arena_allocator.dupe(u8, input);
try testing.expectError(error.Invalid, Mime.parse(mutable_input)); const mime = try Mime.parse(mutable_input);
try testing.expectEqual(.text_html, std.meta.activeTag(mime.content_type));
} }
} }

2
src/browser/webapi/element/Html.zig
View File

@@ -415,7 +415,7 @@ fn setAttributeListener(
) !void { ) !void {
if (comptime IS_DEBUG) { if (comptime IS_DEBUG) {
log.debug(.event, "Html.setAttributeListener", .{ log.debug(.event, "Html.setAttributeListener", .{
.type = self._type, .type = std.meta.activeTag(self._type),
.listener_type = listener_type, .listener_type = listener_type,
}); });
} }

2
src/browser/webapi/net/XMLHttpRequest.zig
View File

@@ -183,7 +183,7 @@ pub fn open(self: *XMLHttpRequest, method_: []const u8, url: [:0]const u8) !void
const page = self._page; const page = self._page;
self._method = try parseMethod(method_); self._method = try parseMethod(method_);
self._url = try URL.resolve(self._arena, page.base(), url, .{ .always_dupe = true }); self._url = try URL.resolve(self._arena, page.base(), url, .{ .always_dupe = true, .encode = true });
try self.stateChanged(.opened, page.js.local.?, page); try self.stateChanged(.opened, page.js.local.?, page);
} }