Issue #8296 and #8259 - AllowedResourceAliasChecker improvements #8315
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
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
…Handler.doStart() Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
gregw
requested changes
Jul 24, 2022
Comment on lines
862
to
867
| { | ||
| // We may have symlink to baseResource, try to resolve symlink if possible. | ||
| File file = getBaseResource().getFile(); | ||
| if (file != null) | ||
| _baseResource = Resource.newResource(file.toPath().toRealPath()); | ||
|
|
There was a problem hiding this comment.
I'm pretty sure the WebAppProvider in the deployer does something similar. Perhaps wrap up in a utlility static method on Resource
There was a problem hiding this comment.
I added a static method on Resource called resolveAlias.
...-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerMultipleResourceBasesTest.java
Outdated
Show resolved
Hide resolved
...-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerMultipleResourceBasesTest.java
Show resolved
Hide resolved
...-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerMultipleResourceBasesTest.java
Outdated
Show resolved
Hide resolved
.../test-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerWebRootIsSymlinkTest.java
Show resolved
Hide resolved
.../test-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerWebRootIsSymlinkTest.java
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
gregw
previously approved these changes
Jul 27, 2022
Comment on lines
862
to
867
| { | ||
| // We may have symlink to baseResource, try to resolve symlink if possible. | ||
| File file = getBaseResource().getFile(); | ||
| if (file != null) | ||
| _baseResource = Resource.newResource(file.toPath().toRealPath()); | ||
|
|
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
joakime
approved these changes
Aug 3, 2022
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.
Issue #8296 and #8259
AllowedResourceAliasCheckerandSymlinkAllowedResourceAliasCheckerto allow custom resource base directory, so we can more easily support use case of multiple default servlets with different resource bases from Symlinks cause 404 with DefaultServlet when its "resourceBase" is different from ContextHandler's #8259AllowedResourceAliasCheckerto be used whenContextHandleris still starting, by always extracting resource base when needed beforelifeCycleStartedis called.baseResourceduringContextHandler.doStart()so that not every path from it is also an alias.