21878 Commits

Author SHA1 Message Date
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
Lachlan Roberts
7ed6998a9c
changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
Lachlan Roberts
dc74bcf4cc
throw ISE if WebSocketSCI.configure() is called on started ServletContextHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
Simone Bordet
c73ad40511 Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-15 15:41:57 +02:00
Lachlan Roberts
be041d3044 Issue #5368 - add tests for not reading to end of InputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:10:33 +11:00
Lachlan Roberts
680020dcb2 Issue #5368 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:08:57 +11: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
Joakim Erdfelt
b2f2fb9fea
Fix archived assemblies (tar.gz and zip) to have fixed modes.
+ Not taking the modes from whatever defaults the filesystem
  that ran the build is currently on.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-14 13:25:56 -05: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
Lachlan Roberts
4690aa51ba allow override of shared CompressionPools in WebSocketServerComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
0e3cfe8fc2 Issue #5287 - share compression pools and size with max num threads
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
7cac3d76bb Issue #5287 - close deflater on release if non-pooled entry
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
608a895aab Issue #5287 - make default CompressionPool capacity 1024
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
ef816fcc42 DeflaterPoolBenchmark should manage lifecycle of the CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
dd06008ff4 Issue #5287 - remove IllegalArgumentException from CompressionPool Entry
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
5dc0242986 Issue #5287 - Changes from review & fix broken tests from NPE
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
d241c6694b Issue #5287 - Pool the entries instead of just the Deflater/Inflaters
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
21576f2312 Issue #5287 - fix usages of new CompressionPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
Lachlan Roberts
b239fa07c6 Issue #5287 - rework CompressionPool to use the jetty-util pool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11: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
Lachlan Roberts
419eefc2ef move logic from messageComplete into appendFrame with fin==true
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 10:26:08 +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
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