fix: NPE in AbstractLogCollector.desensitizeShenyuRequestLog on null boxed Integer/Long - #6899
Open
nikhiln64 wants to merge 1 commit into
Open
fix: NPE in AbstractLogCollector.desensitizeShenyuRequestLog on null boxed Integer/Long#6899nikhiln64 wants to merge 1 commit into
nikhiln64 wants to merge 1 commit into
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
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.
Fixes #6884
desensitizeShenyuRequestLog unconditionally calls toString on three boxed numeric fields of ShenyuRequestLog. For byte type media appendResponse invokes logResponse with a null writer, so a chunked response with no Content-Length header reaches desensitize with responseContentLength still null and the collector throws an NPE inside the response doFinally, losing the access log for that request. status and upstreamResponseTime are nullable on the same class of paths.
This change guards each of the three fields with Objects.nonNull before desensitizing, matching the null tolerance the String fields already get from StringUtils.hasLength inside desensitizeForSingleWord. Added AbstractLogCollectorTest covering the null case (chunked byte response shape) and the populated case (values preserved when keywords do not match them).
Note for reviewers, the issue body on #6884 describes a different bug due to an off by one paste in the Aug 4 batch, the analysis matching this title is in the body of #6883, details in my comment on the issue.
Make sure that:
./mvnw clean install -Dmaven.javadoc.skip=true(module scoped build of shenyu-plugin-logging-common with tests).