Commit Graph

18356 Commits

Author SHA1 Message Date
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
Lachlan Roberts 1b07c846c6 Issue #5320 - use HttpClient classloader to load jetty-websocket-httpclient.xml
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:20 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Simone Bordet 7bfca258d5
Merge pull request #5449 from eclipse/jetty-9.4.x-5409-invalid_response_state_transient
Fixes #5409 - HttpClient fails intermittently with "Invalid response …
2020-10-14 15:55:20 +02:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 16:35:58 +11:00
Simone Bordet c5df807b6d Fixes #5409 - HttpClient fails intermittently with "Invalid response state TRANSIENT".
The problem was a race condition during content decoding.
Since decoding needs to be done in a loop, the condition to loop is to
check whether there is demand for the next chunk of decoded content.

Checking for demand also sets the stalled flag, and this must be done
only after the response state has been set back to CONTENT.
Unfortunately this was not done in the decoding loop.

The fix is to always update the response state in the decoding loop.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-13 23:18:26 +02:00
Joakim Erdfelt 4d0edf9ee2
Merge pull request #5445 from eclipse/jetty-9.4.x-5443-forwarding-headers-optional
ForwardedRequestCustomizer behavior should not be applied to requests without forwarding headers
2020-10-13 12:20:38 -05:00
Chris Walker ca5165bd06
Updating security reports to reference project page 2020-10-13 12:08:57 -05:00
Joakim Erdfelt 89dc16ae09
Issue #5443 - Forwarding Headers are optional
Cleanup handling of forwarded.authority

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 10:27:01 -05:00
Joakim Erdfelt 0721178007
Issue #5443 - Forwarding Headers are optional
The `X-Proxied-Https: off` case should have an implied port
not a hardcoded port.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 08:31:32 -05:00
Joakim Erdfelt 457025bc16
Issue #5443 - Forwarding Headers are optional
Additional NPE safety checks.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 08:24:49 -05:00
Joakim Erdfelt ea1103077c
Issue #5443 - Forwarding Headers are optional
+ Additional tests for HTTP/1.0
+ Overly complex negative test cases for
   `X-Forwarded-Proto: http` and
   `X-Proxied-Https: off`
+ Failure testcase for `X-Proxied-Https: foo`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 08:20:27 -05:00
Joakim Erdfelt abdada05b1
Issue #5443 - Forwarding Headers are optional
+ Improve / document implied secure scheme behaviors
  for both `Proxy-Ssl-Id` or `Proxy-auth-cert`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 07:15:38 -05:00
Joakim Erdfelt f0681b33eb
Issue #5443 - Forwarding Headers are optional
+ Simplify isSecure handling in customize.
+ Simplify handling of `Proxy-Ssl-Id` header.
+ Simplify handling of `Proxy-auth-cert` header.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 07:03:37 -05:00
Joakim Erdfelt 0b646ee6b7
Issue #5443 - Forwarding Headers are optional
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-13 05:10:42 -05:00
Joakim Erdfelt c37c2c59ab
Merge pull request #5419 from eclipse/jetty-9.4.x-5417-forwarded-proto-port
Issue #5417 - Honoring implied ports on ForwardedRequestCustomizer better
2020-10-13 04:50:51 -05:00
olivier lamy 510c1f4b20 too early to test that
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-13 09:51:38 +10:00
olivier lamy 34365d0919 update labels
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-13 09:15:22 +10:00
olivier lamy 69abaed168 enable github-branch-release-drafter
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-13 09:09:00 +10:00
Joakim Erdfelt 85852dc84e
Merge pull request #5429 from eclipse/dependabot/maven/jetty-9.4.x/org.jboss.weld.servlet-weld-servlet-core-3.1.5.Final
Bump weld-servlet-core from 3.1.3.Final to 3.1.5.Final
2020-10-12 09:41:24 -05:00
Joakim Erdfelt e020fd50d4
Merge pull request #5433 from eclipse/dependabot/maven/jetty-9.4.x/org.conscrypt-conscrypt-openjdk-uber-2.5.1
Bump conscrypt-openjdk-uber from 2.4.0 to 2.5.1
2020-10-12 08:48:34 -05:00
Joakim Erdfelt 961b14ca28
Merge pull request #5440 from eclipse/dependency/jetty-9.4.x/checkstyle-8.36.2
Bump checkstyle from 8.29 to 8.36.2
2020-10-12 08:45:41 -05:00
dependabot[bot] d2e5a9c798
Bump weld-servlet-core from 3.1.3.Final to 3.1.5.Final
Bumps weld-servlet-core from 3.1.3.Final to 3.1.5.Final.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 13:43:14 +00:00
Joakim Erdfelt e4e1e8ec40
Merge pull request #5441 from eclipse/dependency/jetty-9.4.x/build-helper-maven-plugin-3.2.0
Bump build-helper-maven-plugin from 3.0.0 to 3.2.0
2020-10-12 08:42:32 -05:00
Joakim Erdfelt feb36cd465
Merge pull request #5439 from eclipse/dependency/jetty-9.4.x/jboss-logging-3.4.1.Final
Bump jboss-logging from 3.3.2.Final to 3.4.1.Final
2020-10-12 08:42:26 -05:00
Joakim Erdfelt c498504b23
Bump build-helper-maven-plugin from 3.0.0 to 3.2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 07:21:31 -05:00
Joakim Erdfelt f6c1146428
Bump checkstyle from 8.29 to 8.36.2
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 07:04:14 -05:00
Joakim Erdfelt b58f177476
Bump jboss-logging from 3.3.2.Final to 3.4.1.Final
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 06:53:43 -05:00
Joakim Erdfelt 4a4257d4d1
Minimal change to setDefaultHostnameVerifier to allow compilation of tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 06:43:53 -05:00
Joakim Erdfelt 8556ad7496
Merge pull request #5428 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-perf-helper-1.0.6
Bump jetty-perf-helper from 1.0.5 to 1.0.6
2020-10-12 05:02:51 -05:00
Joakim Erdfelt c2266fdd63
Issue #5417 - Cleanup of PR from Review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 04:50:51 -05:00
dependabot[bot] 7641d72e2a
Bump jaxb-api from 2.3.0 to 2.3.1 (#5431)
Bumps [jaxb-api](https://github.com/javaee/jaxb-spec) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/javaee/jaxb-spec/releases)
- [Commits](https://github.com/javaee/jaxb-spec/compare/2.3.0...2.3.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 19:35:40 +10:00
dependabot[bot] 228758ab29
Bump conscrypt-openjdk-uber from 2.4.0 to 2.5.1
Bumps [conscrypt-openjdk-uber](https://github.com/google/conscrypt) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/google/conscrypt/releases)
- [Commits](https://github.com/google/conscrypt/compare/2.4.0...2.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 06:23:43 +00:00
dependabot[bot] b6bd4a2e13
Bump jetty-perf-helper from 1.0.5 to 1.0.6
Bumps [jetty-perf-helper](https://github.com/eclipse/jetty.toolchain) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/eclipse/jetty.toolchain/releases)
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-perf-helper-1.0.5...jetty-perf-helper-1.0.6)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 06:23:31 +00:00
Joakim Erdfelt 74abaabe29
Merge pull request #5411 from eclipse/dependency/jetty-9.4.x/google-cloud-1.105.0
Bumping google-cloud from 1.0.0 to 1.105.0
2020-10-09 13:36:00 -05:00
Joakim Erdfelt 149f389fd8
Issue #5417 - Honoring implied ports on ForwardedRequestCustomizer better
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-09 09:54:57 -05:00
Joakim Erdfelt 72c5ed0ff7
Bumping gcloud from 1.0.0 to 1.105.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 14:59:34 -05:00
Joakim Erdfelt ef0618489a
Fixing EOL on groovy (again) 2020-10-08 14:50:02 -05:00
Joakim Erdfelt 6ffd0454f4
Merge pull request #5408 from eclipse/dependency/jetty-9.4.x/jnr-unixsocket-0.38.3
Bump jnr-unixsocket from 0.24 to 0.38.3
2020-10-08 12:57:26 -05:00
Joakim Erdfelt ba39ee8b1a
Generating unixsocket.mod [files] section with help maven-dependency-plugin details
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 10:50:16 -05:00
Joakim Erdfelt 5e0e99d4bf
Merge pull request #5387 from eclipse/dependabot/maven/jetty-9.4.x/asm.version-9.0
Bump asm.version from 7.3.1 to 9.0
2020-10-08 09:47:49 -05:00
Joakim Erdfelt bc641dcd22
Merge pull request #5332 from eclipse/dependabot/maven/jetty-9.4.x/org.apache.kerby-kerb-simplekdc-2.0.1
Bump kerb-simplekdc from 1.1.1 to 2.0.1
2020-10-08 09:46:54 -05:00
Joakim Erdfelt 05e377d0f2
Bump jnr-unixsocket from 0.24 to 0.38.3
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 09:11:39 -05:00
Joakim Erdfelt c2655295ac
Eliminating no-longer relevant comment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 08:50:37 -05:00
Joakim Erdfelt 20aaf1c321
Merge remote-tracking branch 'origin/dependency/jetty-9.4.x/org.apache.openwebbeans-2.0.18' into jetty-9.4.x 2020-10-08 08:50:16 -05:00
Joakim Erdfelt 30b30a3a3b
Merge remote-tracking branch 'origin/dependency/jetty-9.4.x/maven-assembly-plugin-3.3.0' into jetty-9.4.x 2020-10-08 08:49:47 -05:00
Joakim Erdfelt 8b0f8c8c80
Merge pull request #5383 from eclipse/dependabot/maven/jetty-9.4.x/javax.annotation-javax.annotation-api-1.3.2
Bump javax.annotation-api from 1.3 to 1.3.2
2020-10-08 07:34:30 -05:00
Joakim Erdfelt b7992a89dd
Bump maven-assembly-plugin from 3.1.1 to 3.3.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 07:34:06 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 07:31:20 -05:00
Greg Wilkins 721a05eb9d
Fixes #5378 Setting Holders during STARTING (#5397)
* Fixes #5378 Setting Holders during STARTING

Holders are now started/initialized if needed by a new utility method

* Fixes #5378 Setting Holders during STARTING

Holders are now started/initialized if needed by a new utility method
2020-10-07 23:22:55 +02:00