Commit Graph

21809 Commits

Author SHA1 Message Date
dependabot[bot] 58a84f2772
Bump asm.version from 8.0.1 to 9.0 and org.apache.aries.spifly.dynamic.bundle to 1.3.1 (#5349)
* Bump asm.version from 8.0.1 to 9.0

Bumps `asm.version` from 8.0.1 to 9.0.

Updates `asm-commons` from 8.0.1 to 9.0

Updates `asm` from 8.0.1 to 9.0

Updates `asm-tree` from 8.0.1 to 9.0

Updates `asm-analysis` from 8.0.1 to 9.0

Updates `asm-util` from 8.0.1 to 9.0

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

* org.apache.aries.spifly.dynamic.bundle 1.3.1

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-16 16:01:24 +10:00
Lachlan Roberts 5800f4605f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 15:37:24 +11:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Joakim Erdfelt 53e0e0e9b2
Merge pull request from GHSA-g3wg-6mcf-8jj6
* Issue #5451 - Improving temp directory creation.

+ Using new Files.createTempDirectory() instead
  of nonsense around File.createTempFile()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Fixes #5451 - Restoring File.deleteOnExit
2020-10-16 00:39:30 +02:00
Simone Bordet c73ad40511 Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-15 15:41:57 +02:00
Jan Bartel 5e60837822
Add more origin info to quickstart-web.xml elements (#5400)
* Issue #5360 Add more origin info to quickstart-web.xml elements

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-14 23:31:24 +02:00
Simone Bordet 210ae6ef5f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-10-14 16:02:22 +02: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
Jan Bartel d78e1f8a30 Issue #5444 Fix deploy-jndi.adoc
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-14 13:03:28 +02: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 68560090fe
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-13 12:36:01 -05: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
Jan Bartel 3c9a5fe252 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-10-13 18:27:37 +02:00
Jan Bartel 95998a2ee3 Add jndi docs to operations guide.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-13 18:27:04 +02: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 f0607273f3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-13 04:54:36 -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
Simone Bordet e99f5835e9 Improvements to the Jetty documentation.
Ported and updated the documentation about configuring Jetty behind a load balancer.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-12 23:10:11 +02:00
Jan Bartel 6d9e9e7d0a Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-10-12 18:16:05 +02:00
Jan Bartel 2f5e4330ef Add jsp documentation to operations guide.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-12 18:15:40 +02:00
Joakim Erdfelt 0644022d92
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-12 09:42:29 -05: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 ea60815dfd
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-12 08:50:32 -05:00
Simone Bordet 1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. (#5398)
* Fixes #5379 - Better handling for wrong SNI.

Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-12 15:48:53 +02: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
Joakim Erdfelt dcf4a835d7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-12 08:43:16 -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 4a382db625
Increasing timeout for success (for busy CI servers)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-12 08:41:37 -05:00
Jan Bartel aedba8e782 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-10-12 14:48:22 +02:00
Jan Bartel 305ad21cc5 Add annotations doc to ops guide.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-12 14:47:54 +02: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 e543018e7b
Merge pull request #5422 from eclipse/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-diagram-2.0.5
Bump asciidoctorj-diagram from 2.0.2 to 2.0.5
2020-10-12 07:13:08 -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 dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester
Move HttpTester to jetty-http
2020-10-12 06:14:44 -05:00
Joakim Erdfelt 01dbbdf173
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-12 05:08:04 -05:00