Skip to content

fix(reqresp): map malformed request payloads to invalid request #9645

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

Open
Osraka wants to merge 2 commits into
base: unstable
Choose a base branch
from
+45 −12
Open

fix(reqresp): map malformed request payloads to invalid request #9645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5846f92
fix(reqresp): map malformed request payloads to invalid request
Osraka Jul 11, 2026
12732f9
refactor(reqresp): avoid deserialize helper closures
Osraka Jul 11, 2026
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
42 changes: 30 additions & 12 deletions packages/beacon-node/src/network/reqresp/handlers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ProtocolHandler} from "@lodestar/reqresp";
import {ProtocolHandler, RespStatus, ResponseError} from "@lodestar/reqresp";
import {ssz} from "@lodestar/types";
import {IBeaconChain} from "../../../chain/index.js";
import {IBeaconDb} from "../../../db/index.js";
Expand Down Expand Up @@ -29,6 +29,14 @@ function notImplemented(method: ReqRespMethod): ProtocolHandler {
};
}

function deserializeRequestBody<T>(deserialize: () => T): T {
try {
return deserialize();
} catch (e) {
throw new ResponseError(RespStatus.INVALID_REQUEST, (e as Error).message);
}
}

@gemini-code-assist gemini-code-assist Bot Jul 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Performance & Safety Improvement

  1. Avoid Closure Allocations in Hot Paths:
    Currently, deserializeRequestBody takes a closure () => T. Since this helper is executed on every incoming p2p request, creating a new closure () => ... for every request introduces unnecessary memory allocations and garbage collection overhead in high-throughput network paths.

    We can avoid this by passing the deserializable type and the data buffer directly to the helper.

  2. Safe Error Handling:
    Casting e as Error and accessing .message is unsafe if a non-Error object (or null/undefined) is thrown. Using e instanceof Error ? e.message : String(e) is much safer and guarantees a valid string message.

With this change, the usages can be simplified from:

const body = deserializeRequestBody(() => ssz.phase0.BeaconBlocksByRangeRequest.deserialize(req.data));

to:

const body = deserializeRequestBody(ssz.phase0.BeaconBlocksByRangeRequest, req.data);
interface Deserializable<T> {
  deserialize(data: Uint8Array): T;
}

function deserializeRequestBody<T>(type: Deserializable<T>, data: Uint8Array): T {
  try {
    return type.deserialize(data);
  } catch (e) {
    throw new ResponseError(RespStatus.INVALID_REQUEST, e instanceof Error ? e.message : String(e));
  }
}


/**
* The ReqRespHandler module handles app-level requests / responses from other peers,
* fetching state from the chain and database as needed.
Expand All @@ -40,51 +48,61 @@ export function getReqRespHandlers({db, chain}: {db: IBeaconDb; chain: IBeaconCh
[ReqRespMethod.Ping]: notImplemented(ReqRespMethod.Ping),
[ReqRespMethod.Metadata]: notImplemented(ReqRespMethod.Metadata),
[ReqRespMethod.BeaconBlocksByRange]: (req, peerId, peerClient) => {
const body = ssz.phase0.BeaconBlocksByRangeRequest.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.phase0.BeaconBlocksByRangeRequest.deserialize(req.data));
return onBeaconBlocksByRange(body, chain, db, peerId, peerClient);
},
[ReqRespMethod.BeaconBlocksByRoot]: (req) => {
const fork = chain.config.getForkName(chain.clock.currentSlot);
const body = BeaconBlocksByRootRequestType(fork, chain.config).deserialize(req.data);
const body = deserializeRequestBody(() =>
BeaconBlocksByRootRequestType(fork, chain.config).deserialize(req.data)
);
return onBeaconBlocksByRoot(body, chain);
},
[ReqRespMethod.BeaconBlocksByHead]: (req, peerId, peerClient) => {
const body = ssz.fulu.BeaconBlocksByHeadRequest.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.fulu.BeaconBlocksByHeadRequest.deserialize(req.data));
return onBeaconBlocksByHead(body, chain, peerId, peerClient);
},
[ReqRespMethod.BlobSidecarsByRoot]: (req) => {
const fork = chain.config.getForkName(chain.clock.currentSlot);
const body = BlobSidecarsByRootRequestType(fork, chain.config).deserialize(req.data);
const body = deserializeRequestBody(() =>
BlobSidecarsByRootRequestType(fork, chain.config).deserialize(req.data)
);
return onBlobSidecarsByRoot(body, chain);
},
[ReqRespMethod.BlobSidecarsByRange]: (req) => {
const body = ssz.deneb.BlobSidecarsByRangeRequest.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.deneb.BlobSidecarsByRangeRequest.deserialize(req.data));
return onBlobSidecarsByRange(body, chain, db);
},
[ReqRespMethod.DataColumnSidecarsByRange]: (req, peerId, peerClient) => {
const body = ssz.fulu.DataColumnSidecarsByRangeRequest.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.fulu.DataColumnSidecarsByRangeRequest.deserialize(req.data));
return onDataColumnSidecarsByRange(body, chain, db, peerId, peerClient);
},
[ReqRespMethod.DataColumnSidecarsByRoot]: (req, peerId, peerClient) => {
const body = DataColumnSidecarsByRootRequestType(chain.config).deserialize(req.data);
const body = deserializeRequestBody(() =>
DataColumnSidecarsByRootRequestType(chain.config).deserialize(req.data)
);
return onDataColumnSidecarsByRoot(body, chain, db, peerId, peerClient);
},

[ReqRespMethod.ExecutionPayloadEnvelopesByRoot]: (req, peerId, peerClient) => {
const body = ExecutionPayloadEnvelopesByRootRequestType(chain.config).deserialize(req.data);
const body = deserializeRequestBody(() =>
ExecutionPayloadEnvelopesByRootRequestType(chain.config).deserialize(req.data)
);
return onExecutionPayloadEnvelopesByRoot(body, chain, db, peerId, peerClient);
},
[ReqRespMethod.ExecutionPayloadEnvelopesByRange]: (req, peerId, peerClient) => {
const body = ssz.gloas.ExecutionPayloadEnvelopesByRangeRequest.deserialize(req.data);
const body = deserializeRequestBody(() =>
ssz.gloas.ExecutionPayloadEnvelopesByRangeRequest.deserialize(req.data)
);
return onExecutionPayloadEnvelopesByRange(body, chain, db, peerId, peerClient);
},

[ReqRespMethod.LightClientBootstrap]: (req) => {
const body = ssz.Root.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.Root.deserialize(req.data));
return onLightClientBootstrap(body, chain);
},
[ReqRespMethod.LightClientUpdatesByRange]: (req) => {
const body = ssz.altair.LightClientUpdatesByRange.deserialize(req.data);
const body = deserializeRequestBody(() => ssz.altair.LightClientUpdatesByRange.deserialize(req.data));
return onLightClientUpdatesByRange(body, chain);
},
[ReqRespMethod.LightClientFinalityUpdate]: () => onLightClientFinalityUpdate(chain),
Expand Down
24 changes: 24 additions & 0 deletions packages/beacon-node/test/unit/network/reqresp/handlers/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import {describe, expect, it} from "vitest";
import {config} from "@lodestar/config/default";
import {RespStatus, ResponseError} from "@lodestar/reqresp";
import {IBeaconChain} from "../../../../../src/chain/index.js";
import {IBeaconDb} from "../../../../../src/db/index.js";
import {getReqRespHandlers} from "../../../../../src/network/reqresp/handlers/index.js";
import {ReqRespMethod} from "../../../../../src/network/reqresp/types.js";

describe("network / reqresp / handlers", () => {
it("rejects malformed DataColumnSidecarsByRoot request bytes as invalid request", () => {
const handler = getReqRespHandlers({
chain: {config} as unknown as IBeaconChain,
db: {} as IBeaconDb,
})(ReqRespMethod.DataColumnSidecarsByRoot);

try {
handler({data: Buffer.alloc(20), version: 1}, undefined as never, "test");
expect.fail("expected malformed request bytes to be rejected");
} catch (e) {
expect(e).toBeInstanceOf(ResponseError);
expect((e as ResponseError).status).toBe(RespStatus.INVALID_REQUEST);
}
});
});