fix_error_handler_494 #12114
Merged
fix_error_handler_494 #12114
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
liverpool8056
force-pushed
the
fix/core/error_handler_for_status_code_494
branch
from
a7afbd4
to
b47005c
Compare
liverpool8056
force-pushed
the
fix/core/error_handler_for_status_code_494
branch
from
b47005c
to
7db60b5
Compare
liverpool8056
force-pushed
the
fix/core/error_handler_for_status_code_494
branch
2 times, most recently
from
682327c
to
a89dc7b
Compare
outsinre
reviewed
Nov 29, 2023
| @@ -81,7 +81,8 @@ server { | |||
| listen $(entry.listener); | |||
| > end | |||
|
|
|||
| error_page 400 404 405 408 411 412 413 414 417 494 /kong_error_handler; | |||
| error_page 400 404 405 408 411 412 413 414 417 /kong_error_handler; | |||
| error_page 494 =494 /kong_error_handler; | |||
There was a problem hiding this comment.
Seems we return 400. So can remove =494?
There was a problem hiding this comment.
=494 is essential, or the status code got in error_handler is always 400.
oowl
approved these changes
Nov 29, 2023
| @@ -59,6 +59,10 @@ return function(ctx) | |||
| local status = kong.response.get_status() | |||
| local message = get_body(status) | |||
|
|
|||
There was a problem hiding this comment.
It would be better if we add some comments in the code to explain why we do this.
outsinre
approved these changes
Nov 29, 2023
status code 494. There is a dedicated response body for 494 defined in error_handler. However, based on the current configuration for `error_page` in nginx-kong.conf, 494 will not be treated correctly wihout reserving it by the `=response` option in `error_page` directive. In this PR, a `error_page` configuration is added for 494 separately, so that it can be recognized in error handler, and it will be replaced with 400 finally. FTI-5374
liverpool8056
force-pushed
the
fix/core/error_handler_for_status_code_494
branch
from
a89dc7b
to
7ee8fcd
Compare
windmgc
approved these changes
Nov 30, 2023
liverpool8056
added
the
cherry-pick kong-ee
kikito
added
cherry-pick kong-ee
|
Cherry-pick failed for Please cherry-pick the changes locally. git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12114-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12114-to-master-to-upstream
git checkout -b cherry-pick-12114-to-master-to-upstream
ancref=$(git merge-base 25149497a5f8f71ef8693e46b8e183c0d08e46eb 7ee8fcd4c0afad181ae83278be7991fd5384ac99)
git cherry-pick -x $ancref..7ee8fcd4c0afad181ae83278be7991fd5384ac99 |
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
fix the bug that error handler can't recognize status code 494.
There is a dedicated response body for 494 defined in error_handler. However, based on the current configuration for
error_pagein nginx-kong.conf, 494 will not be treated correctly wihout reserving it by the=responseoption inerror_pagedirective. In this PR, aerror_pageconfiguration is added for 494 separately, so that it can be recognized in error handler, and it will be replaced with 400 finally.Checklist
changelog/unreleased/kongorskip-changeloglabel added on PR if changelog is unnecessary. README.mdFull changelog
Issue reference
FTI-5374