Fix tls.create_csr log message path concatenation (#60877)#68835
Open
kimimgo wants to merge 1 commit intosaltstack:masterfrom
Open
Fix tls.create_csr log message path concatenation (#60877)#68835kimimgo wants to merge 1 commit intosaltstack:masterfrom
kimimgo wants to merge 1 commit intosaltstack:masterfrom
Conversation
Use os.path.join() instead of f-string concatenation for csr_path in return message to avoid missing separator when csr_path lacks a trailing slash. Before: 'Created Private Key: "/etc/ssl/MYCA/certsMY.HOSTNAME.key"' After: 'Created Private Key: "/etc/ssl/MYCA/certs/MY.HOSTNAME.key"'
Contributor
|
@kimimgo The test suite passes with your change, that's great! please add a test and changelog entry so we can get this merged. |
dwoz
added
needs-testcase
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #60877
Summary
tls.create_csruses f-string concatenation forcsr_pathin thereturn message without ensuring a path separator. When
csr_pathlacks a trailing slash, the filename merges with the directory name:
Fix
Replace
f"{csr_path}{csr_filename}"withos.path.join(csr_path, csr_filename)in the return message (lines1256-1257).
osis already imported.