24515 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Gili Tzabari
e2e59478ce Update in response to PR comments. 2022-10-24 13:17:25 -04:00
Gili Tzabari
48b89bdc2a Fixing checkstyle errors. 2022-10-24 13:04:14 -04:00
Gili Tzabari
d50510a1fe Fixes #8723: Provide a thread-safe way to modify HttpClient proxies at runtime. 2022-10-24 13:04:14 -04:00
Simone Bordet
a6afbaf470
Merge pull request #8756 from janvojt/fix/jetty-10-npe-with-destination-idle-timeout
Issue #8753 - Fix HttpClient initialization with destinationIdleTimeout set.
2022-10-22 15:09:36 +02:00
Jan Vojt
1f8b0c75a4 Issue #8753 - Fix HttpClient initialization with destinationIdleTimeout set.
Signed-off-by: Jan Vojt <jan@vojt.net>
2022-10-21 15:45:46 +02:00
Baoyi Chen
8404eb0db1
Add log.isDebugEnabled() to reduce string allocation (#8743)
Signed-off-by: Baoyi Chen <chen.bao.yi@qq.com>
2022-10-20 17:28:01 +10:00
Gili Tzabari
481c801c3c
Jetty 10 - #8591: Indicate units of HttpClient properties (#8728)
* Fixes #8591: Indicate units of HttpClient properties.
2022-10-19 18:34:34 +02:00
Ludovic Orban
5a9f3fb831 #8695: update to quiche 0.16.0
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-18 09:14:04 +02:00
Ludovic Orban
b27a528cf5 #8695: move client address binding to QuicClientConnectorConfigurator
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-18 09:14:04 +02:00
Ludovic Orban
3c6c83da07 #8695: make sure the Foreign binding is used for testing when running on JDK 17 and not any older nor a more recent version.
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-18 09:14:04 +02:00
Ludovic Orban
15e90acab6 #8695: fix inconsistencies between quiche's native API and its JNA/Foreign bindings
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-18 09:14:04 +02:00
Ludovic Orban
d6a101d463 #8695: update quiche to version 0.15.0
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-18 09:14:04 +02:00
Jan Bartel
d9b6aa02f2
Issue #8712 Deprecate ELContextCleaner (#8713) 2022-10-17 11:02:16 +11:00
Ludovic Orban
1c242a6849 disabled Foreign module tests on JDK18+
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-10 19:15:30 +02:00
Joakim Erdfelt
5733ffc8c7
Merge pull request #8688 from eclipse/fix/jetty-10-start-extract-traversal
Fix traversal bug on extraction of bad jar/zip files during jetty-start
2022-10-06 07:15:06 -05:00
Joakim Erdfelt
4b908d9483
Merge pull request #8629 from eclipse/fix/jetty-10-restore-pathmapping-getmatch
Issue #8628 - pseudo restore `PathMappings.getMatch(String)`
2022-10-06 07:13:45 -05:00
Joakim Erdfelt
a84fe38fef
Fix directory traversal on bad jar/zip files
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-05 13:26:56 -05:00
Joakim Erdfelt
f8a6a0f5bc
Merge pull request #8687 from eclipse/fix/jetty-10-javascript-replace
Fix bad Javascript `replace` usage in demos / test
2022-10-05 13:03:56 -05:00
Joakim Erdfelt
9b94bcd340
Merge pull request #8684 from eclipse/jetty-10.0.x-jackson-bom
Issue #8576 use jackson bom
2022-10-05 09:22:58 -05:00
Joakim Erdfelt
d3050dee7b
Fix bad js replace in demos / test
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-05 09:13:57 -05:00
Simone Bordet
ecea0e6d0a
Fixes #7993 - HttpClient idleTimeout configuration being ignored/over… (#8672)
* Fixes #7993 - HttpClient idleTimeout configuration being ignored/overridden

The problem was that the timeout scheduling was not happening,
because for TunnelRequest the timeouts were set in normalizeRequest(),
which runs after the scheduling.

Now a call to request.sent() is made also after normalizeRequest()
so that the timeouts is scheduled (if it was not scheduled before).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 11:46:00 +02:00
Simone Bordet
58f0e0744b Fixes #8584 - HttpRequest.send() never returns
Fixed handling of the idle timeout in case the SOCKS proxy does not reply to the SOCKS bytes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 11:45:13 +02:00
Lachlan
ccb2cc0637
Merge pull request #8682 from eclipse/jetty-10.0.x-jetty-start-expand-properties
expand jetty properties when generating dry-run command line
2022-10-05 14:21:03 +11:00