Commit Graph

18649 Commits

Author SHA1 Message Date
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Joakim Erdfelt f4c55c65e0
Merge pull request #5481 from eclipse/jetty-9.4.x-5480-npe-webinfconfiguration
NPE protection on WebInfConfiguration.deconfigure()
2020-10-20 17:27:33 -05:00
Joakim Erdfelt fa6c8f7dec
Issue #5480 - Only delete non-persist temp dir if not-empty
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 17:19:54 -05:00
Joakim Erdfelt c7ae5b50ab
Issue #5480 - Safer temp directory management
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:53:09 -05:00
Joakim Erdfelt 6be6fae291
Issue #5480 - NPE Check in WebInfConfiguration.deconfigure()
+ Removing Temp dir deletion in configureTempDirectory()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:30:39 -05:00
Joakim Erdfelt 227dd47157
Issue #5480 - Fail in jetty-maven-plugin if unable to create temp directory.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:29:22 -05:00
Joakim Erdfelt 0e98c370fd
Issue #5480 - NPE protection on IO.delete(File)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:28:36 -05:00
Joakim Erdfelt 4ecaf3049c
Merge pull request #5479 from eclipse/jetty-9.4.x-5475-ScanForAsmVersion
Fixes #5475 Scan for updated ASM version
2020-10-20 10:50:29 -05:00
Joakim Erdfelt 7155066d4a
Issue #5475 - Adding debug log output for asmVersion detect
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 10:07:43 -05:00
Joakim Erdfelt a3e3632340
Issue #5475 - Changing ASM API version lookup to use Reflection against ASM Opcodes.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 09:34:38 -05:00
gregw fa713979c0 Fixes #5475 Scan for updated ASM version
Scan for the highest known ASM version so we can always run on latest JVM if the ASM jar is updated.
2020-10-20 13:29:30 +02:00
Jan Bartel 936cd465e7
Bump spifly from 1.2.4 to 1.3.2 (#5477)
* Issue #5475 Update to spifly 1.3.2

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-10-19 17:58:20 +02:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462)
Bumps jsp-api from 2.1 to 2.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 20:42:15 +10:00
dependabot[bot] 68f759ad6c
Bump xslthl from 2.0.1 to 2.1.3 (#5463)
Bumps xslthl from 2.0.1 to 2.1.3.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 19:01:56 +10:00
dependabot[bot] eeb918d530
Bump maven-remote-resources-plugin from 1.5 to 1.7.0 (#5464)
Bumps [maven-remote-resources-plugin](https://github.com/apache/maven-remote-resources-plugin) from 1.5 to 1.7.0.
- [Release notes](https://github.com/apache/maven-remote-resources-plugin/releases)
- [Commits](https://github.com/apache/maven-remote-resources-plugin/compare/maven-remote-resources-plugin-1.5...maven-remote-resources-plugin-1.7.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 18:50:13 +10:00
dependabot[bot] 1eae4ddae2
Bump jmh.version from 1.21 to 1.26 (#5461)
Bumps `jmh.version` from 1.21 to 1.26.

Updates `jmh-core` from 1.21 to 1.26

Updates `jmh-generator-annprocess` from 1.21 to 1.26

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 18:49:47 +10:00
dependabot[bot] d4b7ad66c9
Bump asciidoctor-maven-plugin from 1.5.6 to 2.1.0
Bumps [asciidoctor-maven-plugin](https://github.com/asciidoctor/asciidoctor-maven-plugin) from 1.5.6 to 2.1.0.
- [Release notes](https://github.com/asciidoctor/asciidoctor-maven-plugin/releases)
- [Changelog](https://github.com/asciidoctor/asciidoctor-maven-plugin/blob/master/CHANGELOG.adoc)
- [Commits](https://github.com/asciidoctor/asciidoctor-maven-plugin/compare/asciidoctor-maven-plugin-1.5.6...asciidoctor-maven-plugin-2.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-19 06:12:48 +00:00
Simone Bordet 8de2fbce49 Code cleanup, merging streams[Opened|Closed] from subclasses into HTTP2Session.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-18 13:01:40 +02:00
Joakim Erdfelt fed8484d88
Merge pull request #5458 from eclipse/jetty-9.4.x-5451-temp-perms-cleanup
Issue #5451 - Removing file/dir permission management from codebase
2020-10-17 05:28:13 -05:00
Joakim Erdfelt e6fb4c3ac4 More fixes to allow project to build on Windows 10 2020-10-16 16:45:25 -05:00
Joakim Erdfelt 07d35d32ae Fixing windows build/test issues. 2020-10-16 15:39:38 -05:00
Joakim Erdfelt 97f795160c Fixing windows build/test issues. 2020-10-16 13:54:27 -05:00
Joakim Erdfelt d612f12cf6
Issue #5451 - Removing file/dir permission management from codebase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-16 13:17:28 -05:00
Joakim Erdfelt 91f4516ec2
Merge pull request #5456 from eclipse/jetty-9.4.x-reset-error-context-fixed
Fixes #5454 Reset Error Context
2020-10-16 09:04:18 -05:00
gregw ba477fa5a7
Fixes #5454 Reset Error Context
Reset the error context when a request is recycled.
2020-10-16 08:16:43 -05:00
Joakim Erdfelt 820c79ba5b
Merge pull request #5453 from eclipse/jetty-9.4.x-5451-general-tempdir-cleanup
Issue #5451 - Cleanup of temp file usages.
2020-10-16 07:28:32 -05:00
Joakim Erdfelt 369940c8b6
Issue #5451 - Proper use of WorkDir
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-16 06:43:12 -05:00
Lachlan f99b4ca80c
Merge pull request #5377 from eclipse/jetty-9.4.x-5368-WebSocketInputStream
Issue #5368 - ensure onMessage exits before next frame is read
2020-10-16 15:51:54 +11:00
olivier lamy 6f98b136cf fix tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-16 13:46:08 +10:00
olivier lamy 6726a50e09 fix test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-16 12:06:27 +10:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-15 18:10:38 -05: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
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
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
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
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 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