Commit Graph

18700 Commits

Author SHA1 Message Date
Lachlan Roberts 6dce1cbffd Make ByteBufferAccumulator direct configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 10:07:18 +11:00
Lachlan Roberts 602cd7e5c0 throw ArithmeticException on integer overflow from size
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 09:51:09 +11:00
Lachlan Roberts a51b5db209 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-01 09:45:45 +11:00
Ludovic Orban df3a32601a reduce test load on jenkins
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-30 18:36:00 +01:00
gregw 69b3c37717 remove test rather than disable
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 17:35:37 +01:00
gregw 7e9b050050 disable test accidentally added for #5737
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 17:23:10 +01:00
gregw 4022be8091 remove anchient README
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 15:25:40 +01:00
gregw b4e2ad0df7 added CVE
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 14:23:45 +01:00
Jan Bartel 5ad130515f
Issue #5713 Remove dependency on derby (#5728)
* Issue #5713 Remove dependency on derby

Signed-off-by: Jan Bartel <janb@webtide.com>

* use the mariadb client version from the property

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

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-30 14:22:50 +01:00
Simone Bordet 68e70b47de
Merge pull request #5634 from eclipse/jetty-9.4.x-5310-http2_goaway
Review HTTP/2 GOAWAY handling
2020-11-26 11:29:44 +01:00
Lachlan Roberts fb408611e2 fix bug with WebSocketProxy ping pong counting
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 20:49:02 +11:00
Lachlan 5941235725
Merge pull request #5726 from eclipse/jetty-9.4.x-websocketProxy
Implement and test a WebSocket Proxy with the 9.4 Jetty API
2020-11-26 16:55:36 +11:00
Lachlan Roberts 104beb9824 add IdleTimeout test, use volatile sessions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 11:22:24 +11:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
Joakim Erdfelt db41fd8811
Removing -T3 and increasing timeout
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-25 15:29:29 -06:00
Lachlan Roberts ce11fb3e94 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-websocketProxy 2020-11-25 23:05:51 +11:00
dependabot[bot] 36d7a90930
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 (#5666)
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-25 10:58:07 +01:00
Lachlan Roberts 6a9acaaa9d do not block for websocket PING and PONG messages
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 11:48:33 +11:00
Chris Walker 8eab5ef101
First pass of fixing links. Resolves #5722 (#5723)
* First pass

Signed-off-by: Chris Walker <WalkerWatch@users.noreply.github.com>

* Fixing license header

Signed-off-by: Chris Walker <WalkerWatch@users.noreply.github.com>
2020-11-24 16:41:41 -06:00
Joakim Erdfelt 1c7c924228
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-11-24 13:29:46 -06:00
Joakim Erdfelt 4582088d89
Reducing test disk space usage on CI
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-24 13:29:34 -06:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718)
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
2020-11-24 18:12:42 +01:00
Lachlan Roberts b89adb8dae Improve WebSocketProxy, and write tests for it
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 18:55:09 +11:00
Lachlan Roberts d7598f3ff2 basic WebSocketProxy implementation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 13:40:48 +11:00
olivier lamy d0a7c881c2 skip tests must be dynamic
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-24 12:35:47 +10:00
dependabot[bot] 056ce8d92e
Bump maven-jxr-plugin from 2.5 to 3.0.0 (#5672)
Bumps [maven-jxr-plugin](https://github.com/apache/maven-jxr) from 2.5 to 3.0.0.
- [Release notes](https://github.com/apache/maven-jxr/releases)
- [Commits](https://github.com/apache/maven-jxr/compare/jxr-2.5...jxr-3.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-24 09:58:43 +10:00
Olivier Lamy 429bec57a4
Issue #5644 Remove all profiles for session tests (#5703)
* remote session tests are now executed per default, new profile to exclude then no-remote-session-tests

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

* remove this no-remote-session-tests profile just use skipTests to skip that

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-24 09:38:30 +10:00
dependabot[bot] fe65023f61
Bump maven-pmd-plugin from 3.13.0 to 3.14.0 (#5709)
Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.13.0...maven-pmd-plugin-3.14.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-24 07:14:32 +10:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Chris Walker 41bf9534eb
Issue #5603 - Single page documentation (#5636)
* First pass of single page doc generation for 9.4.x

* Updates to POM and HTML assembly

* Update snapshot version

* Removing deprecated Docbook assets

* Moving asciidoc config to main pom,  removing sub-order references

* Fixing image links

* Cleaning up code reference formatting

* Fixing missed source formatting

* Flipping Admonitions MK. I

* Replacing underscores for admonitions

* Converting .... to ---- for code blocks

* Reverting accidentally changed KEYS.txt

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

* Clean up

* Fixing icons

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-20 13:05:42 -06:00
dependabot[bot] fcfa72ee40
Bump javax.servlet.jsp.jstl from 1.2.2 to 1.2.5 (#5673)
Bumps [javax.servlet.jsp.jstl](https://github.com/javaee/jstl-api) from 1.2.2 to 1.2.5.
- [Release notes](https://github.com/javaee/jstl-api/releases)
- [Commits](https://github.com/javaee/jstl-api/compare/1.2.2...impl-1.2.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-20 14:21:17 +10:00
Joakim Erdfelt 901a17d197
Issue #5605 - Adding more comments
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-19 10:24:36 -06:00
Joakim Erdfelt a6d432e9e3
Issue #5605 - Adding more comments and fixing logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-19 10:19:31 -06:00
Simone Bordet d4feb4f29d Removed unused code.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 16:08:31 +01:00
dependabot[bot] 248779e195
Bump grpc-core from 1.33.0 to 1.33.1 (#5623)
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.33.0 to 1.33.1.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.33.0...v1.33.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 14:31:24 +10:00
Joakim Erdfelt 5f6e72d2ed
Issue #5605 - Adding more gzip consume all tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-18 11:42:40 -06:00
Simone Bordet 4093af1824 Issue 5310 - Review HTTP/2 GOAWAY handling.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-18 12:03:35 +01:00
Greg Wilkins 14f94f738d
Issue #5605 unconsumed input on sendError (#5637)
* Issue #5605 unconsumed input on sendError

Add Connection:close if content can't be consumed during a sendError. Processed after the request has returned to the container.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Update from review

 + Add close on all uncommitted requests when content cannot be consumed.

* Update from review

 + fixed comment
 + space comma

* Only consume input in COMPLETE if response is >=200 (ie not an upgrade or similar)

* Updated to be less adventurous

I do not think it was valid to always consumeAll in COMPLETE as this could break upgrades with both 101s and 200s
Instead I have reverted to having this consumeAll logic only:
 + in sendError once control has passed back to the container and we are about to generate an error page.
 + in front of all the sendRedirection that we do without calling the application first.

Extra tests also added

* Updated to be less adventurous

reverted test

* Testcase for odd sendError(400) issue.

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

* Fix for odd sendError(400) issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Testcase for odd sendError(400) issue.

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

* Always try to consumeAll on all requests

* Refinements after testing in 10

* Refinements after testing in 10

Fixed test

* Fixed comment from review

* Updates from review

+ added redirect methods that consumeAll
+ ensureContentConsumedOrConnectionClose renamed to ensureConsumeAllOrNotPersistent
+ ensureConsumeAllOrNotPersistent now handles HTTP/1.0 and HTTP/1.1 differently

* better consumeAll implementation

* update from review

 + better javadoc
 + filter out keep-alive
 + added more tests

* update from review

 + better javadoc

* update from review

 + fixed form redirection test for http 1.0 and 1.1

* update from review

 + HttpGenerator removes keep-alive if close present
 + Use isRedirection

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-18 10:40:05 +01:00
Joakim Erdfelt 1448444c65
Merge pull request #5560 from eclipse/jetty-9.4.x-5539-statisticsservlet-output
Issue #5539 - Proper StatisticsServlet output format via content negotiation
2020-11-17 08:52:34 -06:00
Simone Bordet 1d71cabef4 Fixed test that was failing due to TLS 1.3 backport to Java 8.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-17 13:39:28 +01:00
Greg Wilkins 71087e53a6
Minor cleanup SecureRequestCustomizer (#5660)
* For #5650 protect from bad SslSession

Better protection from a bad SslSession like seen in #5650

* review indicated that there is too much depth to defend.  So just a little cleanup in this PR.
2020-11-17 13:21:03 +01:00
Lachlan Roberts 2629845f17 update ByteAccumulator length on copies
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 22:16:35 +11:00
Lachlan Roberts f63a741b0f use local length field for ByteAccumulator.getLength()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11:00
olivier lamy 3c4e259dc2 fail quickly
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:33:39 +10:00
Olivier Lamy 48b89f9394
use @Testcontainers to disable test if docker not available (#5678)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:20:16 +10:00
Lachlan Roberts 7c46d96fce Issue #5499 - add tests for ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11:00
Olivier Lamy 213ac63d2c
Enable gcloud testing in docker (#5651)
* Enable "gcloud" profile for gcloud session testing.

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

* use docker image as google datastore

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

* fix project id

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

* all tests pass here

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

* do not trim stack trace

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

* Try distinguishing between localhost and non-localhost

Signed-off-by: Jan Bartel <janb@webtide.com>

* add some debug

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

* remove non needed pom content

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

Co-authored-by: Jan Bartel <janb@webtide.com>
2020-11-17 11:13:22 +10:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 12:31:28 -06:00
Joakim Erdfelt 7f86f5e9ad
Merge pull request #5663 from eclipse/dependabot/maven/jetty-9.4.x/openwebbeans.version-2.0.20
Bump openwebbeans.version from 2.0.19 to 2.0.20
2020-11-16 09:58:24 -06:00