fix(response-transformer) initialize rt_body_chunks and `rt_body_ch…
#3524
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
…unk_number` if needed
Tieske
requested changes
Jun 10, 2018
| -- did not run - and hence `rt_body_chunks` and `rt_body_chunk_number` | ||
| -- were not initialized | ||
| ctx.rt_body_chunks = ctx.rt_body_chunks or {} | ||
| ctx.rt_body_chunk_number = ctx.rt_body_chunk_number or 1 |
There was a problem hiding this comment.
The access handler above does nothing but setting the defaults, so that entire handler can be removed now.
There was a problem hiding this comment.
@Tieske access handler removed
Tieske
requested changes
Jun 11, 2018
|
|
||
| -- Initializes context here in case this plugin's access phase | ||
| -- did not run - and hence `rt_body_chunks` and `rt_body_chunk_number` | ||
| -- were not initialized |
|
@nateslo Could you bump the version to |
thibaultcha
requested changes
Jun 12, 2018
| @@ -97,5 +116,19 @@ for _, strategy in helpers.each_strategy() do | |||
| assert.equals([[this is a / test]], json.uri_args) | |||
| end) | |||
| end) | |||
|
|
|||
| describe("unauthorized", function() | |||
There was a problem hiding this comment.
Could you rename this block to "regressions"? Thanks
| @@ -97,5 +116,19 @@ for _, strategy in helpers.each_strategy() do | |||
| assert.equals([[this is a / test]], json.uri_args) | |||
| end) | |||
| end) | |||
|
|
|||
| describe("unauthorized", function() | |||
| it("doesn't err when unauthorized", function() | |||
There was a problem hiding this comment.
Within this block, it'd be nice to include a link to the issue this regression test fixes just like https://github.com/Kong/kong/blob/master/spec-old-api/01-unit/010-router_spec.lua#L927
There was a problem hiding this comment.
We should also be more explicit in the name of this test:
it("does not throw an error when request was short-circuited in access phase")
thibaultcha
pushed a commit
that referenced
this pull request
Jun 13, 2018
When `ResponseTransformerHandler:access` is not executed, `ResponseTransformerHandler:body_filter` attempts to access `nil` `ctx.rt_body_chunks` and `nil` `ctx.rt_body_chunk_number`. This patch initially added checks for both and initialized them to defaults if `nil`, but now even gets rid of the `:access()` phase an lazily initializes `ngx.ctx` values in `:body_filter()`. Fix #3521 From #3524
thibaultcha
approved these changes
Jun 13, 2018
|
Manually merged to master, thank you! |
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.
Summary
When
ResponseTransformerHandler:accessis not executed,ResponseTransformerHandler:body_filterattempts to access nilctx.rt_body_chunksand nilctx.rt_body_chunk_number. This PR adds checks for both and initializes them to defaults if nil.A test case has been added to verify there is no error if
ResponseTransformerHandler:accessis not executed.Full changelog
ctx.rt_body_chunksandctx.rt_body_chunk_numberinResponseTransformerHandler:body_filterResponseTransformerHandler:access)accesshandler - ctx variables now initialized inbody_filterIssues resolved
Fix #3521