From 49110fc1f7b8a70219c9a8bc536bc87f7f0b7701 Mon Sep 17 00:00:00 2001
From: Tom Zeller <tzeller@dragonacea.biz>
Date: Thu, 20 Jan 2022 08:15:28 -0600
Subject: [PATCH] Initial support for Jetty 10

---
 pom.xml                                       |  2 +-
 .../jetty-base/etc/idp-backchannel.xml        |  1 -
 .../jetty-base/modules/idp-logging.mod        |  2 --
 .../jetty-base/modules/logging-logback.mod    | 17 ------------
 .../resources/jetty-logging.properties        | 10 +++++++
 .../jetty-base/start.d/idp-logging.ini        |  7 +++--
 .../jetty-base/start.d/requestlog.ini         | 27 +++++++++++++++++++
 7 files changed, 43 insertions(+), 23 deletions(-)
 delete mode 100644 src/main/resources/jetty-base/modules/logging-logback.mod
 create mode 100644 src/main/resources/jetty-base/resources/jetty-logging.properties
 create mode 100644 src/main/resources/jetty-base/start.d/requestlog.ini

diff --git a/pom.xml b/pom.xml
index 6e4be37..194d0f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base</artifactId>
     <packaging>pom</packaging>
-    <version>9.4.1-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
 
     <properties>
         <jetty94-dta-ssl.version>1.0.0</jetty94-dta-ssl.version>
diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/src/main/resources/jetty-base/etc/idp-backchannel.xml
index b522a81..0b797fc 100644
--- a/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ b/src/main/resources/jetty-base/etc/idp-backchannel.xml
@@ -53,7 +53,6 @@
         <Set name="host"><Property name="jetty.ssl.host" default="0.0.0.0" /></Set>
         <Set name="port"><Property name="idp.backchannel.port" default="8443" /></Set>
         <Set name="idleTimeout"><Property name="jetty.ssl.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" default="-1"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
         <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" default="0"/></Set>
       </New>
diff --git a/src/main/resources/jetty-base/modules/idp-logging.mod b/src/main/resources/jetty-base/modules/idp-logging.mod
index ca40cfc..e7043c1 100644
--- a/src/main/resources/jetty-base/modules/idp-logging.mod
+++ b/src/main/resources/jetty-base/modules/idp-logging.mod
@@ -3,8 +3,6 @@ Shibboleth IdP Logging
 
 [depend]
 console-capture
-logging-logback
-logback-access
 
 [files]
 logs/
diff --git a/src/main/resources/jetty-base/modules/logging-logback.mod b/src/main/resources/jetty-base/modules/logging-logback.mod
deleted file mode 100644
index 5ac0006..0000000
--- a/src/main/resources/jetty-base/modules/logging-logback.mod
+++ /dev/null
@@ -1,17 +0,0 @@
-[description]
-Configure jetty logging to use Logback Logging.
-SLF4J is used as the core logging mechanism.
-Shibboleth modification : do not exec
-
-[tags]
-logging
-
-[depends]
-slf4j-logback
-logback-impl
-
-[provides]
-logging
-
-# [exec]
-# -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
diff --git a/src/main/resources/jetty-base/resources/jetty-logging.properties b/src/main/resources/jetty-base/resources/jetty-logging.properties
new file mode 100644
index 0000000..fba9189
--- /dev/null
+++ b/src/main/resources/jetty-base/resources/jetty-logging.properties
@@ -0,0 +1,10 @@
+## Set logging levels from: ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF
+org.eclipse.jetty.LEVEL=INFO
+## Configure a level for an arbitrary logger tree
+#com.example.LEVEL=INFO
+## Configure a level for specific logger
+#com.example.MyComponent.LEVEL=INFO
+## Configure JMX Context Name
+# org.eclipse.jetty.logging.jmx.context=JettyServer
+## Hide stacks traces in an arbitrary logger tree
+#com.example.STACKS=false
diff --git a/src/main/resources/jetty-base/start.d/idp-logging.ini b/src/main/resources/jetty-base/start.d/idp-logging.ini
index fc1ec9f..c5cd3ab 100644
--- a/src/main/resources/jetty-base/start.d/idp-logging.ini
+++ b/src/main/resources/jetty-base/start.d/idp-logging.ini
@@ -4,5 +4,8 @@
 # --------------------------------------- 
 --module=idp-logging
 
-# Override logback version pinned in jetty-home/modules/logback-impl.mod
-logback.version=1.2.10
\ No newline at end of file
+# Override logback version pinned in jetty-home/modules/logging-logback.mod
+# logback.version=1.2.10
+
+# This seems to be needed in some cases to get early logging output.
+-Dlogback.configurationFile=resources/logback.xml
\ No newline at end of file
diff --git a/src/main/resources/jetty-base/start.d/requestlog.ini b/src/main/resources/jetty-base/start.d/requestlog.ini
new file mode 100644
index 0000000..08fbea6
--- /dev/null
+++ b/src/main/resources/jetty-base/start.d/requestlog.ini
@@ -0,0 +1,27 @@
+# --------------------------------------- 
+# Module: requestlog
+# Logs requests using CustomRequestLog and AsyncRequestLogWriter.
+# --------------------------------------- 
+--module=requestlog
+
+## Format string
+# jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"
+
+## Logging directory (relative to $jetty.base)
+# jetty.requestlog.dir=logs
+
+## File path
+# jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
+
+## Date format for rollovered files (uses SimpleDateFormat syntax)
+# jetty.requestlog.filenameDateFormat=yyyy_MM_dd
+
+## How many days to retain old log files
+# jetty.requestlog.retainDays=90
+
+## Whether to append to existing file
+# jetty.requestlog.append=false
+
+## Timezone of the log file rollover
+# jetty.requestlog.timezone=GMT
+