Issue #11434 - resolve differences in AliasCheckerSymlinkTests #12208
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.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
gregw
requested changes
Sep 2, 2024
| @@ -0,0 +1 @@ | |||
| This is in the second WEB-INF dir. | |||
There was a problem hiding this comment.
This is intentional so we don't have to check for newline in the response for the test.
| @@ -0,0 +1 @@ | |||
| This is a file in the combined resource dir. | |||
| @@ -0,0 +1 @@ | |||
| file1 from combined dir | |||
| @@ -0,0 +1 @@ | |||
| file1 from webroot | |||
| @@ -1197,7 +1197,7 @@ protected boolean handleByContextHandler(String pathInContext, ContextRequest re | |||
| return true; | |||
| } | |||
|
|
|||
| return super.handleByContextHandler(pathInContext, request, response, callback); | |||
| return false; | |||
There was a problem hiding this comment.
I don't like this always false return.
I think this method would be better written like:
protected boolean handleByContextHandler(String pathInContext, ContextRequest request, Response response, Callback callback)
{
if (!request.instanceof ServletContextRequest && isProtectedTarget(pathInContext))
return false;
return super.handleByContextHandler(pathInContext, request, response, callback);
}There was a problem hiding this comment.
I see what you mean, but this code is incorrect with isProtectedTarget(pathInContext) here.
I think this is correct:
boolean initialDispatch = request instanceof ServletContextRequest;
if (!initialDispatch)
return false;
return super.handleByContextHandler(pathInContext, request, response, callback);Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
gregw
approved these changes
Sep 2, 2024
lachlan-roberts
deleted the
jetty-12.0.x-11434-AliasCheckerSymlinkTests
branch
lachlan-roberts
added a commit
that referenced
this pull request
Sep 5, 2024
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.
closes #11434