Commit Graph

25918 Commits

Author SHA1 Message Date
Simone Bordet 40e79c88ab
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:17:44 +01:00
Simone Bordet c280e31b46
Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet. (#8873)
* Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet.

Now getReader() tests whether it has to send a 100 continue in case getInputStream() 
is not called because the reader is reused.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:16:42 +01:00
Simone Bordet 3b65cd32c9
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:13:55 +01:00
Simone Bordet f21fa6e6e9
Fixed flakyness of GracefulShutdownTest by explicitly setting the Connector shutdownIdleTimeout to a large value that does not interfere with the tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:13:27 +01:00
Joakim Erdfelt 3ffc29f669
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-08 18:09:01 -06:00
Joakim Erdfelt 793bee9e14
Issue #8716 - Handle bad host/authority headers better (#8717)
* Issue #8716 - Handle bad host/authority headers better
* Remove extra `Host` header in testcase that doesn't deal with bad Host headers
* Create URIUtil.isRegName
* Correcting HostPortTest.testValidAuthority
* Correcting RequestTest.testInvalidHostHeader
* Remove clonable, set to final

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-08 18:08:20 -06:00
Joakim Erdfelt f99da578af
More reliable `AllowedResourceAliasCheckerTest` (#8872)
* More reliable AllowedResourceAliasCheckerTest

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-08 16:16:37 -06:00
Simone Bordet 8893cc2b94
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-08 21:55:10 +01:00
Simone Bordet 1a1b9cfe4c
Fixes #8770 - Review whether to send request body in redirects. (#8775)
* Fixes #8770 - Review whether to send request body in redirects.

Now the original request body is re-sent only if the redirect status code is 307 or 308.
In the other cases, it is a redirect to a GET method, so the Location is followed without resending the body, and the content headers are removed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-08 21:54:20 +01:00
Joakim Erdfelt cf7353f274
Jetty 10 - Improve test reliability (#8868)
* Don't care about stop failures in this test
* More consistent ConnectTimeoutTest
 + using IANA example.com (as it will route to a
   real machine, and will never have this
   specific port open)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-07 16:16:25 -06:00
Simone Bordet c96b14f25c
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-07 18:45:28 +01:00
Simone Bordet cd737489f9 Fixes #8811 - HTTP/2 session shutdown race may cause Server.stop() to block until stop timeout.
Now a completed future is returned from shutdown() if the session is already closed.

Moved the notification of the CompletableFuture to terminate(), which is always invoked.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-07 18:43:34 +01:00
Joakim Erdfelt 77ceb4172d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-04 17:34:58 -05:00
Joakim Erdfelt 27f60b35f9
Merge pull request #8796 from eclipse/dependabot/maven/jetty-10.0.x/org.jboss.logmanager-jboss-logmanager-2.1.19.Final
Bump jboss-logmanager from 2.1.18.Final to 2.1.19.Final
2022-11-04 17:34:46 -05:00
Joakim Erdfelt fbd4387a3e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-04 15:42:41 -05:00
dependabot[bot] 031af1f2ec
Bump jboss-logmanager from 2.1.18.Final to 2.1.19.Final
Bumps jboss-logmanager from 2.1.18.Final to 2.1.19.Final.

---
updated-dependencies:
- dependency-name: org.jboss.logmanager:jboss-logmanager
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-04 20:42:12 +00:00
Joakim Erdfelt bb5813b5b7
Merge pull request #8797 from eclipse/dependabot/maven/jetty-10.0.x/org.testcontainers-testcontainers-bom-1.17.5
Bump testcontainers-bom from 1.17.4 to 1.17.5
2022-11-04 15:41:12 -05:00
dependabot[bot] 07a1d9041c
Bump maven-shade-plugin from 3.4.0 to 3.4.1 (#8795)
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.0...maven-shade-plugin-3.4.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-04 15:39:15 -05:00
dependabot[bot] f83b631763
Bump testcontainers-bom from 1.17.4 to 1.17.5
Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.17.4 to 1.17.5.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.4...1.17.5)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-04 19:07:57 +00:00
Joakim Erdfelt 2243ee5f3b
Jetty 10 - Flag flaky tests to be skipped on CI (#8865)
* @Tag("flaky") use instead of @Disabled
* Tweaking timeouts on some tests
* Tweaking timeouts on some tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-04 14:06:12 -05:00
Simone Bordet bff5b3eb8f
Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-03 21:56:38 +01:00
Lachlan Roberts 0a14cca307 changes from review - rename resolveAlias to followLinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 20:37:55 +11:00
Lachlan Roberts 1e0ef57bb4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-03 19:28:55 +11:00
Lachlan Roberts 3b7ea99780 set type of arg in jetty-ssl-context-reload.xml
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 19:26:00 +11:00
Lachlan Roberts 8607e3ef15 changes to ssl-reload module & documentation from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:54:53 +11:00
Joakim Erdfelt b37ce63588
Issue #8779 - CompactPathRule should not drop query section from modified URI (#8780)
* Issue #8779 - CompactPathRule should not drop query section from modified URI

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-02 16:38:50 -05:00
Olivier Lamy 05e5a99352
jetty 10.0.x use default container (#8813)
* do not switch container and use default one only
2022-11-02 16:13:34 +10:00
Olivier Lamy 55a6cdad9d
add back dependabot for 9.4.x branch and force timezone to try get this done on weekend (#8820)
Signed-off-by: Olivier Lamy <olamy@apache.org>

Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-02 14:56:13 +10:00
Joakim Erdfelt 86c0d5b3e5
Disable flaky test (#8816) 2022-11-02 14:55:53 +10:00
Joakim Erdfelt 861e1e635c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-01 15:00:51 -05:00
dependabot[bot] 59c1cfa327
Bump logback-core from 1.4.1 to 1.4.4 (#8798)
Bumps [logback-core](https://github.com/qos-ch/logback) from 1.4.1 to 1.4.4.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.1...v_1.4.4)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-01 12:44:51 -05:00
dependabot[bot] d9d35cb42e
Merge pull request #8799 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.commons-commons-compress-1.22 2022-11-01 11:24:55 +00:00
Olivier Lamy a6cbb1933a
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-01 20:37:38 +10:00
dependabot[bot] 0a1e6a6be4
Merge pull request #8804 from eclipse/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-utils-3.5.0 2022-11-01 08:46:38 +00:00
dependabot[bot] edd5a0ac12
Merge pull request #8794 from eclipse/dependabot/maven/jetty-10.0.x/asm.version-9.4 2022-11-01 08:44:58 +00:00
dependabot[bot] 95ce84bd4a
Bump plexus-utils from 3.4.2 to 3.5.0
Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.2...plexus-utils-3.5.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:15:11 +00:00
dependabot[bot] 82624a8ae5
Bump commons-compress from 1.21 to 1.22
Bumps commons-compress from 1.21 to 1.22.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:13:04 +00:00
dependabot[bot] 4d0718f11c
Bump asm.version from 9.3 to 9.4
Bumps `asm.version` from 9.3 to 9.4.

Updates `asm-commons` from 9.3 to 9.4

Updates `asm` from 9.3 to 9.4

Updates `asm-analysis` from 9.3 to 9.4

Updates `asm-tree` from 9.3 to 9.4

Updates `asm-util` from 9.3 to 9.4

---
updated-dependencies:
- dependency-name: org.ow2.asm:asm-commons
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-analysis
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-tree
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-util
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-01 02:08:16 +00:00
Lachlan Roberts a4185bf5ac restore deleted methods in SessionAuthentication
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:05:53 +11:00
Lachlan Roberts c60f38f387 Issue #8330 - fix persistence of sessions in OpenID
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:01:24 +11:00
Lachlan Roberts 41d4a3263c add test to replicate issue with OpenId Session serialization
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-01 12:01:23 +11:00
Lachlan Roberts 4d15593d63 Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-31 14:39:32 +11:00
Olivier Lamy 0a666ac2a2
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-10-29 10:24:04 +10:00
Joakim Erdfelt e014ba1775
limit build history to last 60 builds (#8776) (#8778)
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-10-29 10:07:55 +10:00
Simone Bordet 115107f5ec
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 16:19:31 +02:00
Simone Bordet f94599bf11
Merge pull request #8784 from eclipse/jetty-10.0.x-localhost-resolves-many-addresses
Fixed tests that fail when localhost resolves to more than one address.
2022-10-28 16:18:34 +02:00
Simone Bordet 35af8e5c71
Fixed tests that fail when localhost resolves to more than one address.
On Windows, Mac, OpenSolaris (verified) and probably Docker (did not verify, but likely),
DNS resolution of "localhost" yields [127.0.0.1, ::1], while on Linux only [127.0.0.1].

HttpClient will try the first address, and in case of failure will try the second address.
For those tests that want to explicitly fail the connection attempt, we don't want them to
try the second address, which likely yields test failures because of unexpected results
(for example, a different exception type).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 13:33:28 +02:00
Simone Bordet ff3b14d01b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 09:55:45 +02:00
Simone Bordet 94c6e63b76
Merged branch 'cowwoc-jetty-10.0.x-8723-provide-a-thread-safe-way-to-modify-proxies-at-runtime' into 'jetty-10.0.x'. 2022-10-25 09:54:02 +02:00
Simone Bordet 5973ce2941
Small additional fixes.
* Removed "since" attribute (it's commonly related to Java versions) to avoid confusion.
* Avoid using getProxies() to modify the Proxy object in ProxyServletTest.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 09:52:55 +02:00