Flip the default should throw behavior for HttpJsonMessageWithFaultingPayload #1176
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
gregschohn
force-pushed
the
SaferPayloadFaults
branch
2 times, most recently
from
5c3cb8a to
1e1847d
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1176 +/- ##
============================================
- Coverage 80.95% 80.87% -0.08%
+ Complexity 2996 2995 -1
============================================
Files 407 407
Lines 15231 15237 +6
Branches 1023 1023
============================================
- Hits 12330 12323 -7
- Misses 2272 2286 +14
+ Partials 629 628 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
gregschohn
requested review from
AndreKurait,
chelma,
lewijacn,
mikaylathompson,
peternied and
sumobrian
as code owners
AndreKurait
reviewed
Dec 4, 2024
| // ContentType not text if specified and has a value with / and that value does not start with text/ | ||
| return Optional.ofNullable(capturedHttpJsonMessage.headers().insensitiveGet(HttpHeaderNames.CONTENT_TYPE.toString())) | ||
| .map(s -> s.stream() | ||
| .filter(v -> v.contains("/")) | ||
| .filter(v -> !v.startsWith("text/")) | ||
| .filter(cnotentTypeFilter) |
AndreKurait
reviewed
Dec 4, 2024
| @@ -93,7 +95,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception | |||
| } | |||
| } | |||
| } catch (JacksonException e) { | |||
| log.atInfo().setCause(e).setMessage("Error parsing json body. " + | |||
| log.atLevel(hasRequestContentTypeMatching(capturedHttpJsonMessage, v -> v.startsWith("application/json")) | |||
There was a problem hiding this comment.
A comment in the code on why we're doing this could be helpful
AndreKurait
approved these changes
Dec 4, 2024
gregschohn
force-pushed
the
SaferPayloadFaults
branch
from
9c69dd8 to
df0d5fc
Compare
…gPayload to opt-in rather than opt-out. HttpJsonMessageWithFaultingPayload throws by default - so it could be run even if it wasn't within a transform - like from within a LoggingHandler, which is what I was observing when I added some more logging. The worst part was that it created other errors which then caused the message to be processed in a very different way. Signed-off-by: Greg Schohn <[email protected]>
gregschohn
force-pushed
the
SaferPayloadFaults
branch
from
df0d5fc to
09377de
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.
Flip the default should throw behavior for HttpJsonMessageWithFaultingPayload to opt-in rather than opt-out.
HttpJsonMessageWithFaultingPayload throws by default - so it could be run even if it wasn't within a transform - like from within a LoggingHandler, which is what I was observing when I added some more logging. The worst part was that it created other errors which then caused the message to be processed in a very different way.
Description
Issues Resolved
https://opensearch.atlassian.net/browse/MIGRATIONS-2242
Testing
gradle/cicd
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.