You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2024/07/02 05:47:47 UTC

(wicket) branch WICKET-7118-jetty-https created (now 688d2b059b)

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a change to branch WICKET-7118-jetty-https
in repository https://gitbox.apache.org/repos/asf/wicket.git


      at 688d2b059b [WICKET-7118] HTTPS for Jetty is fixed

This branch includes the following new commits:

     new 688d2b059b [WICKET-7118] HTTPS for Jetty is fixed

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(wicket) 01/01: [WICKET-7118] HTTPS for Jetty is fixed

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch WICKET-7118-jetty-https
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 688d2b059b6232dd2d2efe905ecc4b7bedfdf6c0
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Tue Jul 2 12:47:30 2024 +0700

    [WICKET-7118] HTTPS for Jetty is fixed
---
 .gitignore                                                     |  1 +
 .../quickstart/src/main/resources/archetype-resources/pom.xml  |  2 +-
 .../resources/archetype-resources/src/test/jetty/jetty-ssl.xml | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea43d21e61..842efdc3a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ velocity.log
 **.settings/
 **velocity.log*
 *.idea/
+.vscode/
 *.iml
 *.ipr
 *.iws
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 299f17d744..ab1451b1c2 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -189,7 +189,7 @@
 							<value>${project.build.directory}/test-classes</value>
 						</systemProperty>
 					</systemProperties>
-					<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
+					<jettyXmls>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXmls>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
index 6065fd02a6..755fc0ccd6 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/test/jetty/jetty-ssl.xml
@@ -5,8 +5,8 @@
 <!-- This configuration must be used in conjunction with jetty.xml -->
 <!-- and either jetty-https.xml or jetty-spdy.xml (but not both)   -->
 <!-- ============================================================= -->
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="maven.project.build.directory.test-classes" default="." />/<Property name="jetty.keystore" default="keystore"/></Set>
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
+  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="target/test-classes/keystore"/></Set>
   <Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="wicket"/></Set>
   <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="wicket"/></Set>
   <Set name="EndpointIdentificationAlgorithm"></Set>
@@ -51,7 +51,11 @@
   <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
     <Arg><Ref refid="httpConfig"/></Arg>
     <Call name="addCustomizer">
-      <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
+      <Arg>
+        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
+          <Set name="SniHostCheck"><Property name="jetty.ssl.sniHostCheck" default="false"/></Set>
+        </New>
+      </Arg>
     </Call>
   </New>
 </Configure>