Commit Graph

24599 Commits

Author SHA1 Message Date
Greg Wilkins 55e9f738c9
Fix #8897 Ignore conditional headers as per RFC7232 (#8899)
* Ignore date based headers if etag ones are present.
* Also avoid parsing dates unless necessary.
* Check a resource has a lastModified date

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-11-17 12:27:21 +11:00
Joakim Erdfelt d2c1b1caf1
Remove maven-plugins from javadoc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 15:37:09 -06:00
Simone Bordet 3569f65066
Fixes #8750 - AbstractProxyServlet.onServerResponseHeaders does not support headers with empty values (#8904)
Fixed support for empty headers.
Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-16 21:47:00 +01:00
Joakim Erdfelt cf0193421e
Issue #8905 - GzipHandler should include `Vary` header on 304 (Not Modified) responses (per RFC9110)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 14:31:44 -06:00
Joakim Erdfelt 22a810debf
Referencing included /docs/ and /javadoc/ in root index.html
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:55:20 -06:00
Joakim Erdfelt 24b0f1989e
Fixing proxyTo url for javadoc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:54:59 -06:00
Joakim Erdfelt ae6ffdc135
Correct osgi bundle-name
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:36:34 -06:00
Joakim Erdfelt 5de6f734e9
Remove jetty-home dependency from jetty-maven-plugin
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:36:25 -06:00
Joakim Erdfelt 23c989c6ef
Cleanup imports
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:31:02 -06:00
Joakim Erdfelt f9b8d50a2e
Merge remote-tracking branch 'origin/fix/jetty-10-home-with-docs-awaitility' into fix/jetty-10-home-with-docs
# Conflicts:
#	tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java
2022-11-16 08:30:16 -06:00
Joakim Erdfelt 6b96b0d5e6
Issue #8895 - More reliable JettyHomeTester.unzip
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:23:18 -06:00
Olivier Lamy 62746d9d44
review comments 2022-11-16 20:57:07 +10:00
Olivier Lamy 1eb3cd91ab
use Awaitility
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-16 12:55:34 +10:00
Joakim Erdfelt fd558f2eaa
Issue #8895 - fixing JettyHomeTester.await logs timeout
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 18:51:10 -06:00
Joakim Erdfelt af227778bb
Issue #8895 - Move JettyHomeTester to own module
+ Fix for circular dependency loop
    test-distribution ->
    jetty-home ->
    jetty-documentation ->
    jetty-asciidoctor-extensions ->
    test-distribution
+ Remove any deps on anything in org.eclipse.jetty from new module

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 15:06:59 -06:00
Joakim Erdfelt 43615b53f3
Issue #8895 - Fixing jetty-documentation dep reference
Now the jetty-home artifact builds at the right time in the reactor.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 14:38:55 -06:00
Joakim Erdfelt 3305440adc
Unpacking the right javadoc artifact 2022-11-14 15:51:27 -06:00
Joakim Erdfelt 67629e68cc
Issue #8895 - Introduce jetty-home-<ver>-with-docs.zip
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-14 15:35:40 -06:00
Simone Bordet df265e0abb
Fixes #8678 - Jetty client receives GO_AWAY and continue to send traffic on same connection (#8891)
* Fixes #8678 - Jetty client receives GO_AWAY and continue to send traffic on same connection

* Now upon receiving the GOAWAY, the connection is removed from the pool, so it cannot be used by new requests.
* HTTP2Session.removeStream() now happens _after_ notifying HEADERS and DATA events, although the Stream state change still happens before.
This is necessary to avoid that a "close" event is notified before a "headers" or "data" event.

With these changes, the race window of a client acquiring a connection while the server is closing it is reduced, but it is impossible to close it completely.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-14 15:25:25 +01:00
Simone Bordet 12041da72f
Fixes #8810 - ArrayRetainableByteBufferPool inefficiently calculates bucket indices (#8882)
Added constructor that uses IntUnaryOperator to avoid boxing.
Deprecated constructor that uses Function<Integer, Integer>.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-10 18:42:53 +01:00
Joakim Erdfelt 34e38d2156
Issue #8822 - Fix NPE seen on `deflater.reset()` when called after `deflater.end()` (#8881)
* Issue #8822 - NPE on deflater.reset() called after deflater.end()

Now waiting for the server to finish writing even in case of HEAD method,
otherwise the test exit races with the server finishing to fake-write the response content.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-10 18:42:11 +01:00
Simone Bordet 051588d45b
Fixed javadoc typo.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-10 16:21:24 +01:00
Lachlan 690220fc40
Merge pull request #8787 from eclipse/jetty-10.0.x-8786-KeyStoreScanner-Symlink
Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
2022-11-10 17:17:59 +11:00
Lachlan 4f633e945c
Merge pull request #8792 from eclipse/jetty-10.0.x-OpenIdSessionSerialization
Issue #8330 - fix IllegalStateException from using OpenID with SessionDatastore
2022-11-10 16:54:03 +11: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 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 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 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
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 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
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