Lightpanda: the headless browser designed for AI and automation
fix: Reject xhr send() when send already active
Karl Seguinb78170c71e63
diff --git a/src/browser/tests/net/xhr.html b/src/browser/tests/net/xhr.htmlindex fff72d387..3f45b3715 100644--- a/src/browser/tests/net/xhr.html+++ b/src/browser/tests/net/xhr.html@@ -481,3 +481,30 @@testing.expectEqual(false, registered);}</script>++<script id=xhr_send_flag type=module>+ {+ // Per spec, calling send() while a request is already in flight throws+ // InvalidStateError (the "send() flag"). Without it, two concurrent+ // transfers race on the XHR's single response slot and one is left dangling+ // at teardown (the "release overflow" UAF).+ const state = await testing.async();+ const req = new XMLHttpRequest();+ req.onload = () => state.resolve();+ req.open('GET', 'http://127.0.0.1:9582/xhr');+ req.send();+ testing.expectError('InvalidStateError', () => req.send());++ await state.done(() => {+ // the first request was unaffected by the rejected second send()+ testing.expectEqual(200, req.status);+ });++ // a fresh open() clears the flag, so the object is reusable+ const state2 = await testing.async();+ req.onload = () => state2.resolve();+ req.open('GET', 'http://127.0.0.1:9582/xhr');+ req.send();+ await state2.done(() => testing.expectEqual(200, req.status));+ }+</script>diff --git a/src/browser/webapi/net/XMLHttpRequest.zig b/src/browser/webapi/net/XMLHttpRequest.zigindex 7135c627d..8d676310e 100644--- a/src/browser/webapi/net/XMLHttpRequest.zig+++ b/src/browser/webapi/net/XMLHttpRequest.zig@@ -52,6 +52,7 @@ _http_response: ?HttpClient.Response = null,// number of inflight requests, we can have multiple, e.g. xhr calling its own// send from the onload callback_active_requests: u8 = 0,+_send_flag: bool = false,_url: [:0]const u8 = "",_method: http.Method = .GET,@@ -185,6 +186,7 @@ pub fn open(self: *XMLHttpRequest, method_: []const u8, url: [:0]const u8) !voidtransfer.abort(error.Abort);self._http_response = null;}+ self._send_flag = false;// Reset internal state. _override_mime intentionally survives open()// per https://xhr.spec.whatwg.org/#the-overridemimetype()-method.@@ -224,7 +226,7 @@ pub fn send(self: *XMLHttpRequest, body_: ?BodyInit, exec_: *const Execution) !vif (comptime IS_DEBUG) {log.debug(.http, "XMLHttpRequest.send", .{ .url = self._url });}- if (self._ready_state != .opened) {+ if (self._ready_state != .opened or self._send_flag) {return error.InvalidStateError;}@@ -259,6 +261,7 @@ pub fn send(self: *XMLHttpRequest, body_: ?BodyInit, exec_: *const Execution) !vself.acquireRef();self._active_requests += 1;+ self._send_flag = true;exec.makeRequest(.{.ctx = self,@@ -282,6 +285,7 @@ pub fn send(self: *XMLHttpRequest, body_: ?BodyInit, exec_: *const Execution) !v.body_outlives_request = true,}) catch |err| {self.releaseSelfRef();+ self._send_flag = false;return err;};}