From 7601da9fdd504b6af651528059f0d04d8eacadf9 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Tue, 24 Sep 2024 10:02:52 +0200 Subject: [PATCH] fixes #252 --- cms-api/pom.xml | 2 +- cms-auth/pom.xml | 2 +- cms-content/pom.xml | 2 +- cms-core/pom.xml | 2 +- cms-extensions/pom.xml | 2 +- cms-filesystem/pom.xml | 2 +- cms-git/pom.xml | 2 +- cms-media/pom.xml | 2 +- cms-sandbox/pom.xml | 2 +- cms-server/pom.xml | 2 +- .../java/com/condation/cms/server/VHost.java | 28 +++++++++++++++++-- distribution/build.xml | 2 +- integration-tests/pom.xml | 2 +- modules-framework/api/pom.xml | 2 +- modules-framework/manager/pom.xml | 2 +- modules-framework/pom.xml | 2 +- modules/example-module/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 44 insertions(+), 20 deletions(-) diff --git a/cms-api/pom.xml b/cms-api/pom.xml index 863573e5c..4e6ed8382 100644 --- a/cms-api/pom.xml +++ b/cms-api/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-api jar diff --git a/cms-auth/pom.xml b/cms-auth/pom.xml index 7c797512a..d860dfe62 100644 --- a/cms-auth/pom.xml +++ b/cms-auth/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-auth jar diff --git a/cms-content/pom.xml b/cms-content/pom.xml index 4df7a9815..536a21032 100644 --- a/cms-content/pom.xml +++ b/cms-content/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-content jar diff --git a/cms-core/pom.xml b/cms-core/pom.xml index 59ebd14ff..06737f722 100644 --- a/cms-core/pom.xml +++ b/cms-core/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-core jar diff --git a/cms-extensions/pom.xml b/cms-extensions/pom.xml index f52e5ab3f..299df7881 100644 --- a/cms-extensions/pom.xml +++ b/cms-extensions/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-extensions jar diff --git a/cms-filesystem/pom.xml b/cms-filesystem/pom.xml index fb0ec1596..ce2ce5605 100644 --- a/cms-filesystem/pom.xml +++ b/cms-filesystem/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-filesystem jar diff --git a/cms-git/pom.xml b/cms-git/pom.xml index b0cb7342f..3a859eeb6 100644 --- a/cms-git/pom.xml +++ b/cms-git/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-git jar diff --git a/cms-media/pom.xml b/cms-media/pom.xml index a1d6e6cee..00c23b740 100644 --- a/cms-media/pom.xml +++ b/cms-media/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-media jar diff --git a/cms-sandbox/pom.xml b/cms-sandbox/pom.xml index b6f484284..04c96c9a0 100644 --- a/cms-sandbox/pom.xml +++ b/cms-sandbox/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-sandbox pom diff --git a/cms-server/pom.xml b/cms-server/pom.xml index 5f650579b..a6a0f9249 100644 --- a/cms-server/pom.xml +++ b/cms-server/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 cms-server jar diff --git a/cms-server/src/main/java/com/condation/cms/server/VHost.java b/cms-server/src/main/java/com/condation/cms/server/VHost.java index 6625d2beb..e6606470b 100644 --- a/cms-server/src/main/java/com/condation/cms/server/VHost.java +++ b/cms-server/src/main/java/com/condation/cms/server/VHost.java @@ -282,11 +282,11 @@ public Handler buildHttpHandler() { pathMappingsHandler.addMapping(PathSpec.from("/media/*"), mediaHandler); pathMappingsHandler.addMapping(PathSpec.from("/" + JettyModuleHandler.PATH + "/*"), - requestContextFilter(injector.getInstance(JettyModuleHandler.class), injector) + createModuleHandler() ); pathMappingsHandler.addMapping(PathSpec.from("/" + JettyHttpHandlerExtensionHandler.PATH + "/*"), - requestContextFilter(injector.getInstance(JettyHttpHandlerExtensionHandler.class), injector) + createExtensionHandler() ); ContextHandler defaultContextHandler = new ContextHandler( @@ -318,6 +318,30 @@ public Handler buildHttpHandler() { return hostHandler; } + + private Handler.Wrapper createExtensionHandler() { + var authHandler = injector.getInstance(JettyAuthenticationHandler.class); + var initContextHandler = injector.getInstance(InitRequestContextFilter.class); + var extensionHandler = injector.getInstance(JettyHttpHandlerExtensionHandler.class); + var handlerSequence = new Handler.Sequence( + authHandler, + initContextHandler, + extensionHandler + ); + return requestContextFilter(handlerSequence, injector); + } + + private Handler.Wrapper createModuleHandler() { + var authHandler = injector.getInstance(JettyAuthenticationHandler.class); + var initContextHandler = injector.getInstance(InitRequestContextFilter.class); + var modulehandler = injector.getInstance(JettyModuleHandler.class); + var handlerSequence = new Handler.Sequence( + authHandler, + initContextHandler, + modulehandler + ); + return requestContextFilter(handlerSequence, injector); + } private Handler.Wrapper requestContextFilter(Handler handler, Injector injector) { var performance = configuration.get(ServerConfiguration.class).serverProperties().performance(); diff --git a/distribution/build.xml b/distribution/build.xml index 562d2f369..bc0b333fe 100644 --- a/distribution/build.xml +++ b/distribution/build.xml @@ -1,6 +1,6 @@ - 6.0.1 + 6.1.1 v2.0.0 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 060754e8d..b7a6b3c58 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 integration-tests jar diff --git a/modules-framework/api/pom.xml b/modules-framework/api/pom.xml index a6d5a22c0..60443b509 100644 --- a/modules-framework/api/pom.xml +++ b/modules-framework/api/pom.xml @@ -4,7 +4,7 @@ com.condation.cms.module.framework module-framework - 6.1.0 + 6.1.1 modules-api jar diff --git a/modules-framework/manager/pom.xml b/modules-framework/manager/pom.xml index 9042ee7b1..6b15db815 100644 --- a/modules-framework/manager/pom.xml +++ b/modules-framework/manager/pom.xml @@ -4,7 +4,7 @@ com.condation.cms.module.framework module-framework - 6.1.0 + 6.1.1 modules-manager jar diff --git a/modules-framework/pom.xml b/modules-framework/pom.xml index cfc8da85a..b1f292e5f 100644 --- a/modules-framework/pom.xml +++ b/modules-framework/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 com.condation.cms.module.framework module-framework diff --git a/modules/example-module/pom.xml b/modules/example-module/pom.xml index a846e2fed..91288473a 100644 --- a/modules/example-module/pom.xml +++ b/modules/example-module/pom.xml @@ -4,7 +4,7 @@ com.condation.cms.modules cms-modules - 6.1.0 + 6.1.1 example-module jar diff --git a/modules/pom.xml b/modules/pom.xml index 74e5f049d..e322b51da 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 6.1.0 + 6.1.1 com.condation.cms.modules cms-modules diff --git a/pom.xml b/pom.xml index ffe54efa9..dc79feab5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.condation.cms cms-parent - 6.1.0 + 6.1.1 pom UTF-8