diff --git a/wayback-core/src/test/java/org/archive/wayback/webapp/AccessPointTest.java b/wayback-core/src/test/java/org/archive/wayback/webapp/AccessPointTest.java index 82ed9997d7..4afaf21e00 100644 --- a/wayback-core/src/test/java/org/archive/wayback/webapp/AccessPointTest.java +++ b/wayback-core/src/test/java/org/archive/wayback/webapp/AccessPointTest.java @@ -31,7 +31,9 @@ import org.archive.wayback.RequestParser; import org.archive.wayback.ResourceIndex; import org.archive.wayback.ResourceStore; +import org.archive.wayback.accesscontrol.ExclusionFilterFactory; import org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter; +import org.archive.wayback.authenticationcontrol.AccessControlSettingOperation; import org.archive.wayback.core.CaptureSearchResult; import org.archive.wayback.core.CaptureSearchResults; import org.archive.wayback.core.FastCaptureSearchResult; @@ -42,8 +44,10 @@ import org.archive.wayback.exception.WaybackException; import org.archive.wayback.memento.MementoHandler; import org.archive.wayback.memento.MementoUtils; +import org.archive.wayback.resourceindex.filters.ExclusionFilter; import org.archive.wayback.resourcestore.resourcefile.ArcResource; import org.archive.wayback.resourcestore.resourcefile.WarcResource; +import org.archive.wayback.util.operator.TrueBooleanOperator; import org.archive.wayback.util.url.KeyMakerUrlCanonicalizer; import org.archive.wayback.util.webapp.RequestMapper; import org.easymock.EasyMock; @@ -1554,5 +1558,44 @@ public void testMemento_dispatchLocal() throws Exception { assertTrue("handleRequest return value", r); } + /** + * {@code AccessPoint.authentication} is typically configured with {@link AccessControlSettingOperation}, + * which conditionally installs exclusion filter by calling {@code WaybackRequest.exclusionFilter} directly. + * {@link AccessPoint#createExclusionFilter(WaybackRequest)} shall not overwrite it. + * + *
Issue: #259
+ * + * @throws Exception + */ + public void testExclusionThroughAuthentication() throws Exception { + ExclusionFilterFactory accessControlFactory = EasyMock.createMock(ExclusionFilterFactory.class); + ExclusionFilter accessControlFilter = new ExclusionFilter() { + @Override + public int filterObject(CaptureSearchResult o) { + return FILTER_INCLUDE; + } + }; + EasyMock.expect(accessControlFactory.get()).andReturn(accessControlFilter).once(); + + AccessControlSettingOperation acso = new AccessControlSettingOperation(); + acso.setFactory(accessControlFactory); + acso.setOperator(new TrueBooleanOperator