fix: avoid writing empty decryption secrets block in savePcapng method #786
Conversation
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
fix #784 Signed-off-by: CFC4N <cfc4n.cs@gmail.com>
Closed
There was a problem hiding this comment.
Pull Request Overview
This PR prevents writing an empty TLS decryption secrets block in the savePcapng method by only calling WriteDecryptionSecretsBlock when there is data in masterKeyBuffer.
- Added a length check around
WriteDecryptionSecretsBlock - Kept the buffer reset logic after write or skip
|
Failed to generate code suggestions for PR |
There was a problem hiding this comment.
Pull Request Overview
This PR ensures the savePcapng method only writes a decryption secrets block when there is data in masterKeyBuffer, preventing empty blocks.
- Added a check around
WriteDecryptionSecretsBlockto skip it ifmasterKeyBufferis empty. - Retains buffer reset behavior after conditional write.
Comments suppressed due to low confidence (1)
user/module/probe_pcap.go:152
- Add a unit test case for
savePcapngwhenmasterKeyBufferis empty to confirm thatWriteDecryptionSecretsBlockis not called.
if t.masterKeyBuffer.Len() > 0 {
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.
fix #784
Key change:
user/module/probe_pcap.go: Added a conditional check to ensure themasterKeyBufferis not empty before attempting to write the decryption secrets block, resolving issue masterKey被多次写入pcapng文件中 #542.