[java-idp-jetty-base] branch 12.1 updated: Collapse IdP/SP mods and properties, remove backchannel extension.
Scott Cantor
cantor.2 at osu.edu
Wed Nov 12 16:51:02 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch 12.1
in repository java-idp-jetty-base.
View the commit online:
https://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=800c657030171c8d1353a3047507635f97dbc11d
The following commit(s) were added to refs/heads/12.1 by this push:
new 800c657 Collapse IdP/SP mods and properties, remove backchannel extension.
800c657 is described below
commit 800c657030171c8d1353a3047507635f97dbc11d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 12 11:50:57 2025 -0500
Collapse IdP/SP mods and properties, remove backchannel extension.
---
.../lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar | Bin 5503 -> 0 bytes
.../jetty-base/modules/{idp.mod => shibboleth.mod} | 15 ++++---
.../idp/module/jetty/jetty-base/modules/sp.mod | 20 ---------
.../idp/module/jetty/jetty-base/start.d/idp.ini | 22 ---------
.../module/jetty/jetty-base/start.d/shibboleth.ini | 49 ++++++++++++++-------
.../idp/module/jetty/jetty-base/start.d/sp.ini | 18 --------
6 files changed, 42 insertions(+), 82 deletions(-)
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
deleted file mode 100644
index bd7b281..0000000
Binary files a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar and /dev/null differ
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/shibboleth.mod
similarity index 59%
rename from src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod
rename to src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/shibboleth.mod
index 2b392b6..2ae23c9 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/idp.mod
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/shibboleth.mod
@@ -1,19 +1,22 @@
[description]
-Shibboleth IdP
+Configure Jetty for use as a Shibboleth IdP and/or SP Hub container.
+
+[tags]
+shibboleth
[depend]
ee10-annotations
ee10-deploy
-ext
-ee9-webapp
-http
-https
ee10-jsp
ee10-jstl
ee10-plus
+ee10-servlets
+ee10-webapp
resources
server
-ee10-servlets
+ext
+http
+https
ssl
[files]
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/sp.mod b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/sp.mod
deleted file mode 100644
index 2b392b6..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/modules/sp.mod
+++ /dev/null
@@ -1,20 +0,0 @@
-[description]
-Shibboleth IdP
-
-[depend]
-ee10-annotations
-ee10-deploy
-ext
-ee9-webapp
-http
-https
-ee10-jsp
-ee10-jstl
-ee10-plus
-resources
-server
-ee10-servlets
-ssl
-
-[files]
-tmp/
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
deleted file mode 100644
index d8f31eb..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/idp.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Setup for the IdP
-#
---module=idp
-
-## Connector host/address to bind to
-# jetty.ssl.host=0.0.0.0
-
-## Connector port to listen on
-# jetty.ssl.port=443
-
-# Allows use of default IdP command line tools.
-jetty.http.host=127.0.0.1
-
-# Default jetty.http.port is 8080
-# jetty.http.port=80
-
-#
-# Uncomment the next line to enable the rewrite module
-# --module=rewrite
-# Documentation at
-# https://jetty.org/docs/jetty/12/operations-guide/modules/standard.html#rewrite
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
index a4fb8f6..5777154 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
@@ -1,28 +1,45 @@
# Setup common for running an IdP or a Hub (for SP4)
-## Keystore file path (relative to $jetty.base)
+# Enable our "comprehensive" module
+--module=shibboleth
+
+# Route access logging through standard SLF4J logging API
+etc/jetty-requestlog.xml
+
+# Do not expose contexts to web.
+jetty.server.default.showContexts=false
+
+##################################
+## Network/Host/Port configuration
+##################################
+
+## TLS host and port to bind to
+jetty.ssl.host=127.0.0.1
+#jetty.ssl.port=8443
+
+# Non-TLS host and port to bind to
+jetty.http.host=127.0.0.1
+#jetty.http.port=8080
+
+######################################
+## Keystore properties for TLS support
+######################################
+
+# Keystore file path (relative to $jetty.base)
jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
-## Truststore file path (relative to $jetty.base)
jetty.sslContext.trustStorePath=../credentials/idp-userfacing.p12
+# Keystore type
+#jetty.sslContext.keyStoreType=PKCS12
+#jetty.sslContext.trustStoreType=PKCS12
-## Keystore type
-jetty.sslContext.keyStoreType=PKCS12
-## Truststore type and provider
-jetty.sslContext.trustStoreType=PKCS12
-
-## Keystore password
+# Keystore passwords
jetty.sslContext.keyStorePassword=changeit
-## Truststore password
jetty.sslContext.trustStorePassword=changeit
-## KeyManager password
jetty.sslContext.keyManagerPassword=changeit
-## Deny SSL renegotiation
+# Deny SSL renegotiation
jetty.sslContext.renegotiationAllowed=false
-## Route request logging through standard logging API
-etc/jetty-requestlog.xml
-
-jetty.server.default.showContexts=false
-
+# Skip SNI hostcheck
jetty.ssl.sniHostCheck=false
+
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/sp.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/sp.ini
deleted file mode 100644
index 205eeee..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/sp.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Setup for the SP Hub
-#
---module=sp
-
-## Connector host/address to bind to
-# jetty.ssl.host=0.0.0.0
-
-## Connector port to listen on
-# jetty.ssl.port=443
-
-# Allows use of default IdP command line tools.
-jetty.http.host=127.0.0.1
-
-# Default jetty.http.port is 8080
-# jetty.http.port=80
-
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list