Skip to content

Fix multipart user-data MIME framing#20

Merged
fw2568 merged 2 commits into
mainfrom
fix/multipart-close-delimiter
May 25, 2026
Merged

Fix multipart user-data MIME framing#20
fw2568 merged 2 commits into
mainfrom
fix/multipart-close-delimiter

Conversation

@fw2568
Copy link
Copy Markdown
Contributor

@fw2568 fw2568 commented May 25, 2026

The multipart/mixed user-data produced by UserDataSerializer was missing the RFC 2046 close delimiter (--==BOUNDARY==--). Strict MIME parsers treated the final part as unterminated and dropped it — with a single cloud-config part the entire payload was silently lost.

Changes:

  • Append the close delimiter after the parts, but only when at least one part was written (no orphan delimiter for empty input).
  • Add the blank line between the container headers and the body, and between each part's headers and its body, so a body whose first line contains a colon is not mis-parsed as a header. This matches cloud-init's own output.
  • Add MimeKit-based round-trip tests confirming parts survive a spec-conformant parser, and update existing assertions.

The multipart/mixed user-data was missing the RFC 2046 close delimiter
(--==BOUNDARY==--), so strict MIME parsers treated the final part as
unterminated and dropped it; with a single cloud-config part the entire
payload was lost. Also add the blank line separating the container
headers from the body and each part's headers from its body, so a body
whose first line contains a colon is not mis-parsed as a header.

The close delimiter is only emitted when at least one part was written,
avoiding an orphan delimiter for empty input. Tests now round-trip the
output through MimeKit to confirm parts survive a spec-conformant parser.
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Fixes MIME framing in UserDataSerializer’s multipart user-data output so it is RFC 2046–conformant and survives strict MIME parsing (preventing the final part from being treated as unterminated/dropped).

Changes:

  • Add required blank line separation between multipart container headers and body, and between each part’s headers and body.
  • Append the multipart close delimiter (--==BOUNDARY==--) when at least one part is written.
  • Add MimeKit-based round-trip tests to validate parsing behavior and update existing string assertions.

Reviewed changes

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

File Description
src/CloudInit.ConfigDrive.Core/UserDataSerializer.cs Writes proper header/body separation and emits the multipart closing boundary delimiter.
test/CloudInit.ConfigDrive.Core.Test/UserDataSerializerTests.cs Updates expected MIME output and adds parser round-trip tests for strict MIME handling.
test/CloudInit.ConfigDrive.Core.Test/CloudInit.ConfigDrive.Core.Test.csproj Adds MimeKit dependency for MIME parsing tests.

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

Comment thread src/CloudInit.ConfigDrive.Core/UserDataSerializer.cs Outdated
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@fw2568 fw2568 merged commit 78d02dc into main May 25, 2026
1 check passed
@fw2568 fw2568 deleted the fix/multipart-close-delimiter branch May 25, 2026 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants