Skip to content
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

Issue #11434 - resolve differences in AliasCheckerSymlinkTests #12208

Merged
merged 3 commits into from
Sep 3, 2024
Merged

Issue #11434 - resolve differences in AliasCheckerSymlinkTests #12208

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178a795
Issue #11434 - resolve differences in AliasCheckerSymlinkTests
lachlan-roberts Aug 28, 2024
96a0468
Issue #11434 - remove printlns in AliasCheckerSymlinkTest
lachlan-roberts Aug 28, 2024
4164ab7
PR #12208 - changes from review
lachlan-roberts Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,12 @@ public boolean handle(Request request, Response response, Callback callback) thr

protected boolean handleByContextHandler(String pathInContext, ContextRequest request, Response response, Callback callback)
{
if (isProtectedTarget(pathInContext))
{
Response.writeError(request, response, callback, HttpStatus.NOT_FOUND_404, null);
return true;
}

return false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ protected boolean handleByContextHandler(String pathInContext, ContextRequest re
return true;
}

return super.handleByContextHandler(pathInContext, request, response, callback);
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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);
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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);

}

@Override
Expand Down
324 changes: 0 additions & 324 deletions ...0-test-integration/src/test/java/org/eclipse/jetty/ee10/test/AliasCheckerSymlinkTest.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/altDir1/file1
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/altDir2/file2
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/sibling/file
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...0/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/webroot/WEB-INF/web.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/webroot/documents/file
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/webroot/file
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...y-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/webroot/index.html
View file
Open in desktop

This file was deleted.

Loading
Loading