US-706099: update access log to include session ID and user-agent

.grype.yaml

@@ -26,3 +26,4 @@ ignore:
   - vulnerability: CVE-2025-50106
   - vulnerability: CVE-2025-50059
   - vulnerability: CVE-2025-30754
+  - vulnerability: CVE-2025-53066

tests/test-artifacts/templates/expected_server.xml

@@ -187,7 +187,7 @@
              Note: The pattern used is equivalent to using pattern="common" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access_log" suffix=".txt"
-               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b"
+               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b %S &quot;%{User-Agent}i&quot;"
                resolveHosts="false" />
 
         <Valve className="org.apache.catalina.valves.ErrorReportValve"
@@ -197,4 +197,4 @@
       </Host>
     </Engine>
   </Service>
-</Server>
+</Server>

tests/test-artifacts/templates/server.xml.tmpl

@@ -189,7 +189,7 @@
              Note: The pattern used is equivalent to using pattern="common" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access_log" suffix=".txt"
-               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b"
+               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b %S &quot;%{User-Agent}i&quot;"
                resolveHosts="false" />
 
         <Valve className="org.apache.catalina.valves.ErrorReportValve"
@@ -199,4 +199,4 @@
       </Host>
     </Engine>
   </Service>
-</Server>
+</Server>

tests/test-artifacts/templates/server_compressed.xml.tmpl

@@ -1 +1 @@
-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
+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

tomcat-conf/server.xml

@@ -165,7 +165,7 @@
              Note: The pattern used is equivalent to using pattern="common" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access_log" suffix=".txt"
-               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b" 
+               pattern="%{X-Forwarded-For}i %h %l %u %t &quot;%r&quot; %s %b %S &quot;%{User-Agent}i&quot;" 
                resolveHosts="false" />
 
         <Valve className="org.apache.catalina.valves.ErrorReportValve"
@@ -179,4 +179,4 @@
       </Host>
     </Engine>
   </Service>
-</Server>
+</Server>