Skip to content

fix(WebRequest): CWE-190/DoS fix and boundary-parsing refactor#447

Open
mathieucarbou wants to merge 1 commit into
mainfrom
CWE-190
Open

fix(WebRequest): CWE-190/DoS fix and boundary-parsing refactor#447
mathieucarbou wants to merge 1 commit into
mainfrom
CWE-190

Conversation

@mathieucarbou

Copy link
Copy Markdown
Member

Tighten multipart boundary parsing in _parseReqHeader():

  • Replace String::charAt() inner loop with a raw C-string pointer and pre-computed length for faster, allocation-free scanning.
  • Add an early-exit upper bound on the scan loop so that positions where 'boundary=' cannot possibly fit are skipped entirely.
  • Replace the three-pass quoted-string extraction (find close-quote, substring, then unescape) with a single-pass approach that writes directly into _boundary using a std::string_view window into the original header value — no intermediate heap allocations.
  • Enforce the RFC 2046 §5.1 70-character limit on boundary length in both token and quoted-string paths; abort with PARSE_REQ_FAIL on violation to prevent CWE-190 integer-overflow / DoS.
  • Replace strncmp length guard with a position-based early break that is clearer and avoids the redundant cast.

Ref: #445

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR hardens and refactors multipart boundary= parsing in AsyncWebServerRequest::_parseReqHeader() to reduce allocation overhead during header scanning and to enforce RFC 2046’s 70-character boundary limit as a mitigation for CWE-190/DoS scenarios.

Changes:

  • Refactors the boundary= parameter scan to use raw C-string access and earlier exit conditions.
  • Reworks boundary value extraction to a single-pass unescape/write path (token or quoted-string) and enforces the 70-char limit early.
  • Introduces std::string_view-based slicing to avoid intermediate String::substring() allocations during parsing.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/WebRequest.cpp Outdated
Comment thread src/WebRequest.cpp Outdated
@mathieucarbou

Copy link
Copy Markdown
Member Author

@willmmiles : fyi we cannot use string_view if we want to keep supporting arduino 2 and libretiny.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comment thread src/WebRequest.cpp

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Tighten multipart boundary parsing in _parseReqHeader():

- Replace String::charAt() inner loop with a raw C-string pointer and
  pre-computed length for faster, allocation-free scanning.
- Add an early-exit upper bound on the scan loop so that positions
  where 'boundary=' cannot possibly fit are skipped entirely.
- Replace the three-pass quoted-string extraction (find close-quote,
  substring, then unescape) with a single-pass approach that writes
  directly into _boundary using a raw pointer+length pair — no
  intermediate heap allocations and no C++17 dependency.
- Enforce the RFC 2046 §5.1 70-character limit on boundary length in
  both token and quoted-string paths; abort with PARSE_REQ_FAIL on
  violation to prevent CWE-190 integer-overflow / DoS.
- Replace strncmp length guard with a position-based early break that
  is clearer and avoids the redundant cast.
- Fix ESP8266 build: String(const char*, size_t) is unavailable; use
  a 71-byte stack buffer + String(const char*) instead (#ifdef ESP8266).
- Fix LibreTiny/C++14 build: remove std::string_view (C++17 only);
  replaced with plain const char* + size_t throughout.

Ref: #445
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants