CA-405593: Do not write extraneous data into the host certificate file #6263
+80
−49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lindig
approved these changes
Jan 30, 2025
lindig
reviewed
Jan 30, 2025
psafont
force-pushed
the
private/paus/parsed-pems
branch
from
2d47ce8 to
3270920
Compare
lindig
reviewed
Jan 30, 2025
Vincent-lau
approved these changes
Jan 30, 2025
When installing host certificates, the parser used accepts strings with
extraneous characters surrounding the PEM-encoded data. The ad-hoc parser used
to reject such data because it was stricter.
Because the PEM-encoded objects are copied as-is after validating them, the
ad-hoc parser failed to read the file correctly on xapi restarts.
This change fixes the issue by encoding the key and certificates in PEM format
from parsed datastructures instead of using user-provided inputs directly.
Parse, don't validate
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
psafont
force-pushed
the
private/paus/parsed-pems
branch
from
3270920 to
8a6af5e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When installing host certificates, the parser used accepts string with random characters surrounding the PEM-encoded data. The ad-hoc parser used to read the host certificate file was unable to parse them.
Because the PEM-encoded objects are copied as-is after validating them, the ad-hoc parser fails to read the file correctly when xapi restarts.
This change fixes the issue by making sure that the written file's data has been sanitized, by using parsed datastructures instead of user-provided data.
I've manually tested the fix on a host, before and after to validate that indeed now all the characters in between the PEM-encoded objects are stripped