Greg Wilkins
6edd6d0ed0
Improve handling of SSL metadata in ConnectionMetaData, proxied connections and forwarded requests #10775 ( #10853 )
...
Improve handling of SSL metadata in ConnectionMetaData, proxied connections and forwarded requests
+ Added an Attributes.Synthetic mechanism to better (and mor commonly) handle additional attributes, whilst meeting the new TCK requirement that they can be deleted or replaced.
+ Made SslSessionData a reusable type provided by EndPoint
+ Added the EndPoint.Securable subtype that can provide a SslSessionData instance for secure EndPoints
+ Updated ForwardedRequestCustomizer, SecureRequestCustomizer to understand Securable and SslSessionData
+ Javadocs improvements.
+ Removed unnecessary attribute constants in SecureRequestCustomizer.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-11-09 14:07:19 +11:00
Olivier Lamy
b88908236e
Jetty 12 add duplicate classes finder plugin to avoid sames classes with different content coming from different jars ( #10767 )
...
* add duplicate finder plugin
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-11-07 06:37:41 +01:00
Olivier Lamy
91d11941b3
Jetty 12 merge from 11 and fix JAAS ldap login test ( #10857 )
...
* Merge from jetty-10.0.x to jetty-11.0.x
* Fixes #10812 - Correct awaitility dependency scope (#10813 )
* Bump org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.1
Bumps org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.1.
---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump maven.plugin-tools.version from 3.9.0 to 3.10.1
Bumps `maven.plugin-tools.version` from 3.9.0 to 3.10.1.
Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.9.0 to 3.10.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
Updates `org.apache.maven.plugin-tools:maven-plugin-tools-api` from 3.9.0 to 3.10.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-tools-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2
Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin ) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/apache/maven-clean-plugin/releases )
- [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.3.1...maven-clean-plugin-3.3.2 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump org.apache.maven.plugins:maven-dependency-plugin
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin ) from 3.6.0 to 3.6.1.
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump commons-io:commons-io from 2.14.0 to 2.15.0
Bumps commons-io:commons-io from 2.14.0 to 2.15.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump org.apache.maven.plugins:maven-plugin-plugin from 3.9.0 to 3.10.1
Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases )
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump maven.surefire.plugin.version from 3.1.2 to 3.2.1
Bumps `maven.surefire.plugin.version` from 3.1.2 to 3.2.1.
Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.1.2 to 3.2.1
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.1 )
Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.1.2 to 3.2.1
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.1 )
Updates `org.apache.maven.surefire:surefire-junit47` from 3.1.2 to 3.2.1
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.surefire:surefire-junit47
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump org.apache.maven.plugins:maven-checkstyle-plugin
Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin ) from 3.3.0 to 3.3.1.
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.3.0...maven-checkstyle-plugin-3.3.1 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump apacheds.version from 2.0.0.AM26 to 2.0.0.AM27 (#10836 )
* Bump apacheds.version from 2.0.0.AM26 to 2.0.0.AM27
Bumps `apacheds.version` from 2.0.0.AM26 to 2.0.0.AM27.
Updates `org.apache.directory.server:apacheds-test-framework` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
Updates `org.apache.directory.server:apacheds-server-integ` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
Updates `org.apache.directory.server:apacheds-core-integ` from 2.0.0.AM26 to 2.0.0.AM27
- [Commits](https://github.com/apache/directory-server/compare/2.0.0.AM26...2.0.0.AM27 )
---
updated-dependencies:
- dependency-name: org.apache.directory.server:apacheds-test-framework
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.apache.directory.server:apacheds-server-integ
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.apache.directory.server:apacheds-core-integ
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* get this work
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
* Bump org.infinispan:infinispan-bom from 11.0.17.Final to 11.0.18.Final (#10724 )
Bumps [org.infinispan:infinispan-bom](https://github.com/infinispan/infinispan ) from 11.0.17.Final to 11.0.18.Final.
- [Release notes](https://github.com/infinispan/infinispan/releases )
- [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release )
- [Commits](https://github.com/infinispan/infinispan/compare/11.0.17.Final...11.0.18.Final )
---
updated-dependencies:
- dependency-name: org.infinispan:infinispan-bom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* not needed, bad merge
Signed-off-by: Olivier Lamy <olamy@apache.org>
* fix version
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Chad Wilson <chadw@thoughtworks.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-06 15:27:40 +11:00
Greg Wilkins
0ce52b9741
The replaceCookie method renamed to putCookie and refined #10797 ( #10803 )
...
Addressed #10797 by make cleanup of addCookie and renaming replaceCookie to putCookie.
Ensured that Jetty code calls putCookie when appropriate.
2023-11-02 07:07:54 +11:00
Ludovic Orban
5e747ac1e9
Stabilize `secondary_super_cache` in server code ( #10802 )
...
#10781 Stabilize secondary_super_cache in server code
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-11-01 09:28:33 +01:00
Greg Wilkins
2773bc7df8
Recycle ServletChannel in ServletContextHandler ( #10801 )
...
Recycle ServletChannel in ServletContextHandler rather than in ServletHandler, so that completion events on servlet API request/response can be handled.
2023-11-01 11:16:15 +11:00
Joakim Erdfelt
c01baac85c
Updating to version 12.0.4-SNAPSHOT
2023-10-26 22:47:29 -05:00
Joakim Erdfelt
a873259fd5
Updating to version 12.0.3
2023-10-26 22:24:43 -05:00
Joakim Erdfelt
4b3e7d1e90
Bump com.sun.xml.ws:jaxws-rt to 4.0.2
2023-10-26 20:36:08 -05:00
Olivier Lamy
8ba5ff1e9c
Issue #10688 add Jetty 12.0.x ee8 osgi ( #10711 )
...
* Add OSGi for ee8 environment
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-26 20:23:52 -05:00
Joakim Erdfelt
04475daf60
Issue #10794 - fixing Moved Permanently handling of query strings
2023-10-26 11:35:52 -05:00
Simone Bordet
ab749237ce
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-26 17:27:37 +02:00
Jan Bartel
a5f06fceaf
Add ability to compress and skip unserializable session attributes ( #10747 )
...
* Add ability to compress and skip unserializable session attributes
2023-10-26 09:36:45 +02:00
Joakim Erdfelt
1a0c0c32d2
Fixing 429 Too Many Requests from w3.org ( #10789 )
2023-10-26 14:26:45 +11:00
Jan Bartel
3ae43961b8
Jetty 12.0.x overlay combined resources ( #10760 )
...
* Fix overlays with CombinedResource
* Improvements to CombinedResource for AnnotationParser
* Added `contains` and `getPathTo` methods to the Resource API, so they can be used by the AnnotationParser
* Fixed numerous bugs in CombinedResource list and getAllResources
* handles cross file system copy as well.
* Reduced fallback to URI string manipulation.
---------
Co-authored-by: gregw <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-26 07:49:48 +11:00
Simone Bordet
7bc856b1a3
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-25 12:21:51 +02:00
Lachlan Roberts
829e2a19b7
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2023-10-25 16:35:42 +11:00
Greg Wilkins
14152c425b
Better handling of Objects in JMX MetaData ( #10762 )
...
* Send attributes as Map<String,String>
* JMX-annotated ErrorHandler, fixed usage of showMessageInTitle and removed showServlet.
* JMX-annotated Request.Handler.
* Added JMX test module to test improvements to JMX.
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-24 10:03:28 +11:00
Olivier Lamy
2940528033
awaitility must be only test dependency ( #10765 )
...
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-10-21 19:16:54 +10:00
Simone Bordet
2aba4117c2
Fixes #10477 - Jetty 12: Review MBeans for Handlers ( #10754 )
...
Updated base MBean class for o.e.j.server.Handler.
Also updated and modernized existing explicit MBean classes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-19 23:48:51 +02:00
Jan Bartel
467f026d37
Jetty 12.0.x 10716 charset printwriter ( #10737 )
...
* Issue #10716 tck compliance for setting response charset
---------
Co-authored-by: gregw <gregw@webtide.com>
2023-10-19 05:09:42 +02:00
Simone Bordet
a9bcbc6512
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-18 17:43:32 +02:00
Lachlan
929eec9506
Merge pull request #10658 from jetty/fix/jetty-12.0.x-10333-requestTimeStamp
...
Issue #10333 - fix flaky test testLogRequestTimeCustomFormats
2023-10-18 15:47:20 +11:00
Lachlan Roberts
8f6a371195
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocketParameterMap
2023-10-18 07:39:51 +11:00
Joakim Erdfelt
74d301e49d
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2023-10-17 08:14:08 -05:00
Ludovic Orban
7e2c9e5e2f
Reintroduce dispatched and errors stats as well as stats-on time ( #10678 )
...
* #10555 reintroduced dispatched and errors stats as well as stats-on time counter
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 14:20:08 +02:00
Ludovic Orban
5a21bd328a
Fix NPE in ResponseListeners ( #10730 )
...
* #10726 fix NPE in ResponseListeners when demultiplexing is used and the original source spuriously calls demand()
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 14:19:10 +02:00
Ludovic Orban
674a1acf06
Allow POSTing with a URL not ending with '/' to jax-ws endpoints ( #10710 )
...
* #10699 allow POSTing with a URL not ending with '/' to jax-ws endpoints
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 14:18:29 +02:00
Ludovic Orban
4ed22a7a71
Fix race condition in `ArrayByteBufferPool.clear()` ( #10704 )
...
* #10703 fix race condition in clear() and make sure non-reusable released entries are removed from the pool
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 14:17:32 +02:00
Olivier Lamy
f2ab447c4f
Merge 11 to 12 Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet ( #10735 ) and Address build/test failure against bad entities. ( #10742 ) ( #10745 )
...
* Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735 )
* Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet
Signed-off-by: Olivier Lamy <olamy@apache.org>
* Update jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
* Update jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
* fix javadoc
Signed-off-by: Olivier Lamy <olamy@apache.org>
* more usage of constant
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
* Address build/test failure against bad entities. (#10742 )
Bad entities in test case can lead to:
* external URL references
* required HTTP GET requests
* not testing redirectEntity / resolveEntity
(the whole point of the test)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* use constant
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-17 07:29:13 +02:00
Greg Wilkins
ffe80cd1f2
MutableHttpFields.asImmutable avoids copy ( #10651 )
...
* Avoid a copy in MutableHttpFields.asImmutable if the mutable is never mutated again.
* reduce instance creations needed for iterations
---------
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 08:58:19 +11:00
Lachlan Roberts
0fa3165018
revert changes to request
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-17 07:31:03 +11:00
Lachlan Roberts
a8bf3ff99d
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12.0.x-10333-requestTimeStamp
2023-10-17 07:29:36 +11:00
Lachlan Roberts
791d9e9783
make CustomRequestLogTest.testLogRequestTimeCustomFormats more lenient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-17 07:29:26 +11:00
Simone Bordet
825fc6df1f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-16 09:41:45 +02:00
Lachlan Roberts
ee702b01c2
Issue #10734 - fix websocket CoreSession getParameterMap
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-16 12:18:37 +11:00
Simone Bordet
e45814a49a
Javadocs.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-13 16:56:36 +02:00
Ludovic Orban
937713fc73
#10698 fix racy assertion
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-13 11:39:21 +02:00
Simone Bordet
57dcf7c525
Added missing API getRequest().
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-13 11:28:14 +02:00
Ludovic Orban
d6c900a783
Fix flaky leaky h2 tests ( #10728 )
...
* Fixed more tests that became flaky after #10554 .
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-13 11:09:30 +02:00
Olivier Lamy
fcc88274a4
Jetty 12.0.x use automatic formatter for poms to have same style for every poms ( #10578 )
...
* apply spotless sort pom
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-10-12 03:51:36 +02:00
Ludovic Orban
9275d2acca
Made tests relying on TestForbiddenMethodsEventsHandler not flaky
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-10 17:09:56 +02:00
Joakim Erdfelt
6b3f760b80
Updating to version 12.0.3-SNAPSHOT
2023-10-09 21:16:46 -05:00
Joakim Erdfelt
b01e3611cf
Updating to version 12.0.2
2023-10-09 20:59:14 -05:00
Lachlan Roberts
70b1fd40ef
fix infinite recursion in server dump with Path
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-10 11:26:55 +11:00
Simone Bordet
7bd6c5211d
Fixes #10679 - Review HTTP/2 rate control. ( #10682 )
...
* Bumped the rate control rate from 50 events/s to 128.
* Added rate control for all CONTINUATION frames.
* Added rate control for invalid PUSH_PROMISE frames.
* Added rate control for RST_STREAM frames.
* Added rate control for all SETTINGS frames.
* Fixed growth of header block accumulation buffer.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-09 15:19:00 +02:00
Simone Bordet
c41509950b
Fixes #10657 - jetty-http-tools-12.0.1.jar is not well-formed
...
Added Maven property <bundle-symbolic-name>.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-07 15:14:23 +02:00
Simone Bordet
3608ecf999
Changed default implementation of Session.Listener.onNewStream() and … ( #10672 )
...
* Changed default implementation of Session.Listener.onNewStream() and Stream.Listener.onDataAvailable() to auto-discard DATA frames.
For normal cases, these methods are overridden and the application is in full control.
For test cases, these methods may not be overridden and the default implementation conveniently avoids buffer leaks.
Fixed flaky test RawHTTP2ProxyTest.testRawHTTP2Proxy() due to the bad assumption that the first DATA frame ends the stream (so an aggregator is needed), and a copy/paste error in ServerToProxyToClient while processing DATA frames.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-06 14:18:09 +02:00
Simone Bordet
ff57574285
Fixed test `FlowControlStrategyTest` after the changes of #10554 .
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-05 20:08:53 +02:00
Simone Bordet
a4b55e6964
Fixed flaky test `StreamResetTest.testResetAfterBlockingWrite()`, that became flaky after #10554 .
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-05 19:47:28 +02:00