diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml deleted file mode 100644 index 270fe956466e..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-decorate.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - /etc/jetty-web-decorate.xml - - - - - - diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml deleted file mode 100644 index 6fc546e361a6..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod b/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod deleted file mode 100644 index ac34a99f3298..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/modules/decorate.mod +++ /dev/null @@ -1,15 +0,0 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ - -[description] -Jetty setup to support Decoration of Listeners, Filters and Servlets within a deployed webapp. -This module uses DecoratingListener to register an object set as a context attribute -as a dynamic decorator. -This module sets the "org.eclipse.jetty.ee9.webapp.DecoratingListener" -context attribute with the name of the context attribute that will be listened to. -By default the attribute is "org.eclipse.jetty.ee9.webapp.decorator". - -[depend] -deploy - -[xml] -etc/jetty-decorate.xml diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml deleted file mode 100644 index 665c385c80db..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml deleted file mode 100644 index 1e51105be394..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod b/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod deleted file mode 100644 index bd66293a0210..000000000000 --- a/jetty-core/jetty-deploy/src/main/config/modules/global-webapp-common.mod +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/ - -[description] -Enables Deployer to apply common configuration to all webapp deployments. - -[depend] -deploy - -[xml] -etc/global-webapp-common.xml - -[files] -basehome:modules/global-webapp-common.d/global-webapp-common.xml|etc/global-webapp-common.xml -basehome:modules/global-webapp-common.d/webapp-common.xml|etc/webapp-common.xml - -[ini-template] - -# Location of webapp xml config file to apply after context xml -# jetty.deploy.webappCommonConfig=${jetty.base}/etc/webapp-common.xml diff --git a/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/TestHandler.java b/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/TestHandler.java index fad86da7a9b5..5d036ea734fd 100644 --- a/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/TestHandler.java +++ b/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/TestHandler.java @@ -41,29 +41,13 @@ public TestHandler(List hasRoles, List hasntRoles) @Override public boolean handle(Request request, Response response, Callback callback) throws Exception { - if (_hasRoles == null && _hasntRoles == null) - { - try - { - // TODO this is wrong - AuthenticationState.authenticate(request, response, callback); - } - catch (Throwable e) - { - //TODO: an Exception should only be thrown here if the response has - //not been set, but currently it seems that the ServletException is thrown - //anyway by ServletContextRequest.ServletApiRequest.authenticate. - } - } - else - { - testHasRoles(request, response); - testHasntRoles(request, response); + testHasRoles(request, response); + testHasntRoles(request, response); + + response.setStatus(200); + response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain"); + Content.Sink.write(response, true, "All OK\nrequestURI=" + request.getHttpURI(), callback); - response.setStatus(200); - response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain"); - Content.Sink.write(response, true, "All OK\nrequestURI=" + request.getHttpURI(), callback); - } return true; } diff --git a/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/spi/PropertyFileLoginModuleTest.java b/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/spi/PropertyFileLoginModuleTest.java index e38f1bc15d51..1a5e5888e80f 100644 --- a/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/spi/PropertyFileLoginModuleTest.java +++ b/jetty-core/jetty-security/src/test/java/org/eclipse/jetty/security/jaas/spi/PropertyFileLoginModuleTest.java @@ -14,23 +14,27 @@ package org.eclipse.jetty.security.jaas.spi; import java.io.File; +import java.util.Arrays; import java.util.Base64; import java.util.Collections; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; import javax.security.auth.login.Configuration; +import org.eclipse.jetty.security.Constraint; import org.eclipse.jetty.security.DefaultIdentityService; import org.eclipse.jetty.security.PropertyUserStore; +import org.eclipse.jetty.security.SecurityHandler; +import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.security.jaas.JAASLoginService; import org.eclipse.jetty.security.jaas.PropertyUserStoreManager; +import org.eclipse.jetty.security.jaas.TestHandler; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static java.nio.charset.StandardCharsets.ISO_8859_1; @@ -62,7 +66,6 @@ public void tearDown() throws Exception } @Test - @Disabled //TODO public void testPropertyFileLoginModule() throws Exception { //configure for PropertyFileLoginModule @@ -81,24 +84,21 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String name) ContextHandler context = new ContextHandler(); context.setContextPath("/ctx"); - /* TODO - context.setHandler(new TestHandler(Arrays.asList("role1", "role2", "role3"), Arrays.asList("role4")), "/"); + SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped(); + securityHandler.setAuthenticator(new BasicAuthenticator()); + securityHandler.put("/*", Constraint.from("role1", "role2", "role3")); + context.setHandler(securityHandler); + securityHandler.setHandler(new TestHandler(Arrays.asList("role1", "role2", "role3"), Arrays.asList("role4"))); _server.setHandler(context); - - ConstraintSecurityHandler security = new ConstraintSecurityHandler(); - security.setAuthenticator(new BasicAuthenticator()); - context.setSecurityHandler(security); - */ - JAASLoginService ls = new JAASLoginService("foo"); - ls.setCallbackHandlerClass("org.eclipse.jetty.ee10.jaas.callback.DefaultCallbackHandler"); + ls.setCallbackHandlerClass("org.eclipse.jetty.security.jaas.callback.DefaultCallbackHandler"); ls.setIdentityService(new DefaultIdentityService()); ls.setConfiguration(testConfig); _server.addBean(ls, true); _server.start(); - + //test that the manager is created when the JAASLoginService starts PropertyUserStoreManager mgr = ls.getBean(PropertyUserStoreManager.class); assertThat(mgr, notNullValue()); diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee10/test/BadServletInit.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee9/test/BadServletInit.java similarity index 97% rename from jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee10/test/BadServletInit.java rename to jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee9/test/BadServletInit.java index fd9b8bf5db39..72376a45608a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee10/test/BadServletInit.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/java/org/eclipse/jetty/ee9/test/BadServletInit.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.ee10.test; +package org.eclipse.jetty.ee9.test; import java.io.IOException; diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/webapp/WEB-INF/web.xml index e027f6aeb5cf..2b3dd8f95076 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-badinit-webapp/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ BadInit - org.eclipse.jetty.ee10.test.BadServletInit + org.eclipse.jetty.ee9.test.BadServletInit 0