TCK: Dispatch forward and includes attributes do not meet the spec #9074
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
janbartel
added
Bug
…named-dispatch-include-attributes
janbartel
changed the title
|
@lachlan-roberts need your review on this. Pay particular attention to the changes to solve point 3 (ie reporting the values from the original request) - is there a better solution here? |
gregw
reviewed
Dec 20, 2022
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/Dispatcher.java
Outdated
Show resolved
Hide resolved
lachlan-roberts
requested changes
Dec 20, 2022
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/Dispatcher.java
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/Dispatcher.java
Outdated
Show resolved
Hide resolved
…named-dispatch-include-attributes
gregw
approved these changes
Dec 22, 2022
| /** | ||
| * Name of original request attribute | ||
| */ | ||
| public static final String __ORIGINAL_REQUEST = "org.eclipse.jetty.originalRequest"; |
There was a problem hiding this comment.
maybe put ee10 in the name to protect against future cross context dispatches between ee10, ee11 and then back to ee10.
@lachlan-roberts case __ORIGINAL_REQUEST:
HttpServletRequest originalRequest = (HttpServletRequest)super.getAttribute(name);
return originalRequest == null ? _httpServletRequest : originalRequest;So the inner most forwarded wrapper works out that it is the innermost by getting a null value for the super.getAttribute, thus it returns it's wrapped request as the original. |
|
@gregw ok, so its not really the original request but the first forwarded request. |
It's the request wrapped by the first forwarded request, so that is either the original request or something that wraps the original request in a non consequential way. |
lachlan-roberts
approved these changes
Dec 25, 2022
gregpoulos
pushed a commit
to gregpoulos/jetty.project
that referenced
this pull request
Jan 16, 2023
…x-document-modules * upstream/jetty-12.0.x: Issue jetty#9167 - making assumption in flaky test jetty 12.0.x cleanup duplicate osgi pom metadata (jetty#9093) Jetty 12 - Add tests in util/resource for alternate FileSystem implementations (jetty#9149) Cleanup non-retainable `Retainable`s (jetty#9159) Fixes retainability of special Chunks (jetty#9073) TCK: Dispatch forward and includes attributes do not meet the spec (jetty#9074) re-enable h3 tests (jetty#8773) More fundamental test case Reorganization of jetty-client classes. (jetty#9127) Removing @disabled from SslUploadTest Removing @disabled from jetty-start jetty#9134 added test ee10: DefaultServlet: Replace checks for isStreaming() by !isWriting() jetty#9078 make HttpContent.getByteBuffer() implementations return new ByteBuffer instances and document that contract Fixes jetty#9141 - Thread-safe Content.Chunk#slice (jetty#9142) Remove `@Disabled` from `jetty-jmx` (jetty#9143) Bump maven.version from 3.8.6 to 3.8.7 Bump maven.version from 3.8.6 to 3.8.7
gregpoulos
pushed a commit
to gregpoulos/jetty.project
that referenced
this pull request
Jan 16, 2023
… into jetty-12.0.x-documentation-lowercase-jetty_home-attribute * 'jetty-12.0.x' of https://github.com/eclipse/jetty.project: Issue jetty#9167 - making assumption in flaky test jetty 12.0.x cleanup duplicate osgi pom metadata (jetty#9093) Jetty 12 - Add tests in util/resource for alternate FileSystem implementations (jetty#9149) Cleanup non-retainable `Retainable`s (jetty#9159) Fixes retainability of special Chunks (jetty#9073) TCK: Dispatch forward and includes attributes do not meet the spec (jetty#9074) re-enable h3 tests (jetty#8773) More fundamental test case Reorganization of jetty-client classes. (jetty#9127) Removing @disabled from SslUploadTest Removing @disabled from jetty-start Bump maven.version from 3.8.6 to 3.8.7 Bump maven.version from 3.8.6 to 3.8.7
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.
Fix several spec non-compliances with
forwardandincludeattribute handling:includemust not have thejakarta.servlet.include.*attributes set.forwardmust not have thejakarta.servlet.forward.*attributes set.forwardmust report the values for thejakarta.servlet.forward.*attributes as the equivalent values from the original request (iegetRequestURIgetPathInfogetQueryStringetc etc) that went into the servlet call chain.Added tests for the above.