New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(pdk) allow kong.response.exit on header_filter with no body #4039

Merged

thibaultcha merged 3 commits into next from fix-response-ratelimiting-exit

Dec 5, 2018

Member

kikito commented Nov 30, 2018 •

edited

Loading

This fix on kong.response.exit fixes unintended failures on the response-ratelimiting plugin which were introduced when it was translated to the PDK.

I temporarily activated the response-ratelimiting specs on travis and they worked (although I had to to re-launch them many times, they are still quite flaky).

This PR also includes some doc comments on the pdk_phase_checking function, please verify that those comments are correct.

hishamhm reviewed

View reviewed changes

t/Util.pm Outdated Show resolved Hide resolved

hishamhm reviewed

View reviewed changes

t/Util.pm Outdated Show resolved Hide resolved

hishamhm reviewed

View reviewed changes

t/Util.pm Outdated Show resolved Hide resolved

hishamhm reviewed

View reviewed changes

t/Util.pm Show resolved Hide resolved

hishamhm reviewed

View reviewed changes

spec/03-plugins/25-response-rate-limiting/04-access_spec.lua Outdated Show resolved Hide resolved

thibaultcha reviewed

View reviewed changes

t/01-pdk/08-response/00-phase_checks.t

+                  location /t {
+                      proxy_pass http://unix:$TEST_NGINX_NXSOCK/nginx.sock;
+                      set $upstream_uri '/t';
+                      set $upstream_scheme 'http';

Member

thibaultcha Nov 30, 2018

Are those two variables used in this test case?

thibaultcha added this to the 1.0.0rc4 milestone

kikito force-pushed the fix-response-ratelimiting-exit branch 3 times, most recently from e476171 to 49a5ffd Compare

December 3, 2018 11:58

Member

bungle commented Dec 3, 2018 •

edited

Loading

What does ngx.ctx.KONG_EXITED mean after this change? It was about to signal early exit. E.g. a plugin that short-circuited proxying (usually in access phase and I think never in response phases, e.g. after proxying).

Member

thibaultcha commented Dec 3, 2018 •

edited

Loading

What does ngx.ctx.KONG_EXITED mean after this change?

KONG_EXITED is true, and so is KONG_PROXIED. That is Kong indeed proxied the request (no short-circuit), but Kong produced the response itself (i.e. the response seen by the client is not that which was received from the upstream). That is where kong.response.get_source() loses some of its precisions, but I don't believe the control variables to be incorrectly set.

hishamhm mentioned this pull request

refactor(plugins) make plugins defensive against possible errors between different phases #3976

Closed

kikito force-pushed the fix-response-ratelimiting-exit branch 2 times, most recently from 7f702d5 to 9c7f773 Compare

December 5, 2018 17:05

thibaultcha force-pushed the fix-response-ratelimiting-exit branch 3 times, most recently from 9d81304 to 805cb30 Compare

December 5, 2018 21:59

thibaultcha and others added 3 commits

December 5, 2018 14:38


          tests(pdk) make a test resilient to nginx config changes

33fb741


          feat(pdk) allow 'kong.response.exit' in header_filter with no body

140e383


          hotfix(pdk) prioritize exit over proxy in 'kong.response.get_source'

6aeee60

thibaultcha force-pushed the fix-response-ratelimiting-exit branch from 805cb30 to 6aeee60 Compare

December 5, 2018 22:38

thibaultcha approved these changes

View reviewed changes

Member

thibaultcha left a comment

LGTM with tweaks. Merging since the error is a known one being investigated and should not delay this merge.

thibaultcha merged commit 3c6a252 into next

thibaultcha deleted the fix-response-ratelimiting-exit branch

December 5, 2018 23:28

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet