fix compile issues after removal of AllowSymLinkAliasChecker
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
parent
a6b88cfead
commit
51d61d4c82
|
@ -25,7 +25,6 @@ import org.eclipse.jetty.http.HttpStatus;
|
|||
import org.eclipse.jetty.server.Connector;
|
||||
import org.eclipse.jetty.server.LocalConnector;
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
|
||||
import org.eclipse.jetty.server.handler.DefaultHandler;
|
||||
import org.eclipse.jetty.server.handler.HandlerList;
|
||||
import org.eclipse.jetty.server.handler.ResourceHandler;
|
||||
|
@ -78,8 +77,6 @@ public class AliasedConstraintTest
|
|||
|
||||
server.setHandler(new HandlerList(context, new DefaultHandler()));
|
||||
|
||||
context.addAliasCheck(new AllowSymLinkAliasChecker());
|
||||
|
||||
server.addBean(loginService);
|
||||
|
||||
security = new ConstraintSecurityHandler();
|
||||
|
|
|
@ -28,7 +28,6 @@ import org.eclipse.jetty.server.AllowedResourceAliasChecker;
|
|||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.ServerConnector;
|
||||
import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
|
||||
import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
|
||||
import org.eclipse.jetty.server.handler.ContextHandler;
|
||||
import org.eclipse.jetty.server.handler.ResourceHandler;
|
||||
import org.eclipse.jetty.util.IO;
|
||||
|
@ -165,7 +164,6 @@ public class AliasCheckerSymlinkTest
|
|||
{
|
||||
AllowedResourceAliasChecker allowedResource = new AllowedResourceAliasChecker(_context);
|
||||
SymlinkAllowedResourceAliasChecker symlinkAllowedResource = new SymlinkAllowedResourceAliasChecker(_context);
|
||||
AllowSymLinkAliasChecker allowSymlinks = new AllowSymLinkAliasChecker();
|
||||
ApproveAliases approveAliases = new ApproveAliases();
|
||||
|
||||
return Stream.of(
|
||||
|
@ -187,15 +185,6 @@ public class AliasCheckerSymlinkTest
|
|||
Arguments.of(symlinkAllowedResource, "/symlinkSiblingDir/file", HttpStatus.OK_200, "This file is inside a sibling dir to webroot."),
|
||||
Arguments.of(symlinkAllowedResource, "/webInfSymlink/web.xml", HttpStatus.OK_200, "This is the web.xml file."),
|
||||
|
||||
// The AllowSymLinkAliasChecker.
|
||||
Arguments.of(allowSymlinks, "/symlinkFile", HttpStatus.OK_200, "This file is inside webroot."),
|
||||
Arguments.of(allowSymlinks, "/symlinkExternalFile", HttpStatus.OK_200, "This file is outside webroot."),
|
||||
Arguments.of(allowSymlinks, "/symlinkDir/file", HttpStatus.OK_200, "This file is inside webroot/documents."),
|
||||
Arguments.of(allowSymlinks, "/symlinkParentDir/webroot/file", HttpStatus.OK_200, "This file is inside webroot."),
|
||||
Arguments.of(allowSymlinks, "/symlinkParentDir/webroot/WEB-INF/web.xml", HttpStatus.OK_200, "This is the web.xml file."),
|
||||
Arguments.of(allowSymlinks, "/symlinkSiblingDir/file", HttpStatus.OK_200, "This file is inside a sibling dir to webroot."),
|
||||
Arguments.of(allowSymlinks, "/webInfSymlink/web.xml", HttpStatus.OK_200, "This is the web.xml file."),
|
||||
|
||||
// The ApproveAliases (approves everything regardless).
|
||||
Arguments.of(approveAliases, "/symlinkFile", HttpStatus.OK_200, "This file is inside webroot."),
|
||||
Arguments.of(approveAliases, "/symlinkExternalFile", HttpStatus.OK_200, "This file is outside webroot."),
|
||||
|
|
Loading…
Reference in New Issue