Commit Graph

1549 Commits

Author SHA1 Message Date
Joakim Erdfelt 9d1809f43e Issue #1027 - Adding raw browser multipart captures to jetty-http
+ Many more decoding issues identified in MultiPartParsingTest
 + Including Part.getInputStream() related issues

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-22 13:24:47 -05:00
Joakim Erdfelt 2004f0eb78 Issue #1027 - Adding jetty-http version of newer MultiPartParsingTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-22 10:21:57 -05:00
Greg Wilkins 8312f4567b Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-03-21 16:50:29 +11:00
Lachlan Roberts 0f28107a9c Implemented warnings for old MultiPartInputStreamParser when successfully parsing content not conforming to RFC.
Modified tests in new MultiPartInputStreamTest which were failing because they didn't comply with RFC.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-21 16:24:21 +11:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
Lachlan Roberts 93b8161afb Reworked MultipartParser with additional option to accept CR as CRLF.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-20 11:40:55 +11:00
Lachlan Roberts 0ce3ccd4eb Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-03-18 22:05:29 +11:00
Lachlan Roberts df83cca010 Rewrote the parse method to use the MultiPartParser, some error handling not implemented so only passing half of the tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-18 21:53:54 +11:00
Greg Wilkins a5d3b01659 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-03-14 16:25:56 +11:00
Lachlan Roberts fcd2d49da1 Moved a copy of MultipartInputStreamParser and MultipartInputStreamTest into jetty.http
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-14 15:51:43 +11:00
Greg Wilkins a77a127da0 tests and fixes for binary keys and content
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 15:02:56 +11:00
Lachlan Roberts 4dce09c067 Completed the split test.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-14 14:27:03 +11:00
Greg Wilkins c1f038d3bf Merge branch 'jetty-9.4.x' into jetty-9.4.x-2232-HttpParser-cleanup 2018-03-14 09:32:51 +11:00
Joakim Erdfelt 7374d6563d Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-03-13 14:24:57 -05:00
Joakim Erdfelt aafda1a279 Issue #2280 - adding default utf-8 encoding to application/json 2018-03-13 14:24:37 -05:00
Lachlan Roberts 20c9fb45f8 Reworked the tests on EPILOGUE and multiple content. All tests are passing.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 20:21:10 +11:00
Greg Wilkins faa32f0c71 improved handler signature
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 18:25:32 +11:00
Lachlan Roberts d670b60e4d Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 17:58:53 +11:00
Lachlan Roberts a51542ee03 work in progress EPILOGUE and END states implemented, in process of testing them
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 17:52:57 +11:00
Greg Wilkins 46a8fb5dc4 fixes for partial pattern matches and optional CRLF
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 17:40:26 +11:00
Lachlan Roberts 0435eea708 work in progress implemented OCTETS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 16:13:07 +11:00
Greg Wilkins 915af401e1 HttpParser cleanup #2232
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 13:22:01 +11:00
Lachlan Roberts 0d4e202343 Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-03-13 11:49:00 +11:00
Lachlan Roberts 66a76dae3c work in progress
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 11:48:41 +11:00
Greg Wilkins 267150c940 cleanup field parsing
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 11:09:14 +11:00
Simone Bordet 8b391a88dd Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException.
Changed the signature of HttpParser.Listener.onBadMessage()
to take a BadMessageException and updated dependent code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-12 19:51:57 +01:00
Greg Wilkins 1352be4308 added some unit tests for part content
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:39:11 +11:00
Greg Wilkins add08caec0 update after lachlan affb436433
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:27:05 +11:00
Greg Wilkins b0325f8299 work in progress
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-09 09:38:23 +11:00
Greg Wilkins dc67cb5241 Work in progres #1027
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 17:47:46 +11:00
Greg Wilkins bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11:00
Lachlan Roberts 020ebde77c found additional ReferenceEquality warnings which have been resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
Lachlan Roberts 016c8076e0 updates after review #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 16:02:47 +11:00
Lachlan Roberts 0cfc25d4ed Resolved errorprone ReferenceEquality warnings #2206
Objects which inherit or implement an `equals()` method should not be compared with == or !=
When the comparison of references is intentional `@SuppressWarnings("ReferenceEquality")` can be used

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 14:26:02 +11:00
Joakim Erdfelt 3001c8af2f Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x 2018-02-07 15:35:04 -06:00
Greg Wilkins c7e03d6175 Better name for no HTTP/0.9 #2022
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-12 18:33:46 +01:00
Greg Wilkins 1cbc1cf5e0 removed old javadoc 2018-01-11 16:58:26 +01:00
Greg Wilkins 3ae5abdda6 updated header for 2018
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-11 14:55:32 +01:00
Greg Wilkins 8b7480f088 Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes 2018-01-10 22:25:49 +01:00
Greg Wilkins 3a15419047 deprecated CUSTOM enums
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-10 22:18:47 +01:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Greg Wilkins 88f64b8abf fixed compliance names in formats
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-09 14:02:09 +01:00
Greg Wilkins 54f49dec7d Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes 2018-01-09 13:32:19 +01:00
Greg Wilkins 9f8d3e5b32 fixes after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-08 16:14:03 +01:00
Greg Wilkins a81c1f3880 fixes after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-08 16:09:22 +01:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06:00
Greg Wilkins f046bdc2c6 Removed RFC from enum names
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-05 10:43:00 +01:00
Greg Wilkins 22beb1d02a Updated tests to use _LEGACY modes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 14:16:23 +01:00
Greg Wilkins 30e9c84b33 Added RFC7230_LEGACY compliance mode as the default
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 13:50:10 +01:00
Greg Wilkins 278b9b01c2 Added javadoc and STRICT compliance modes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 13:24:13 +01:00
Greg Wilkins 7e516e29fb pass existing compliance tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 18:00:03 +01:00
Greg Wilkins d8dead35ae Issue #2022 Fine Gramed Compliance Modes
Added HttpComplianceSection and an EnumSet within HttpCompliance

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 14:41:18 +01:00
olivier lamy 3a189ab254 #2056 javadoc warning fixes WIP
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-20 10:52:45 +11:00
Joakim Erdfelt 2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Greg Wilkins a25d749101 work in progress of fine grained compliance
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-16 18:06:42 +01:00
Greg Wilkins 71b775724f work in progress of fine grained compliance
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-16 17:15:37 +01:00
fb 7ee8bb82c6 Same code style fixes and remove unnecessary code reformatting
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:23:17 +01:00
fb a324a5ad77 Implement weak http header parsing and make the compliance mode configurable in the client
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:13:48 +01:00
fb b76240e678 Fixes #2022 - Ignore invalid chars in http header names, when the compliance mode is not RFC7230
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:12:34 +01:00
Greg Wilkins d4061fcfeb
Issue #1966 Case Sensitive method (PR #1967)
Issue #1966 Case Sensitive method (PR #1967)

* Modified the compliance violations to warn if case insensitivety is applied to a header
* removed duplicated if
* Fixed string comparison
* Improved compliance messages and comments
* updated expected violation messages
* Require a header colon only when in 7230 compliance mode
2017-11-29 18:56:54 +01:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Greg Wilkins b5a38d82ce
HttpParser is not using cached HTTP Field values (#1979)
* HttpParser is not using cached HTTP Field values

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-16 16:55:43 +01:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
Jesse McConnell 705048cc49 Updating to version 9.3.22.v20171030 2017-10-30 15:16:29 -05:00
Greg Wilkins af80b2c044 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 11:09:48 +11:00
Greg Wilkins 3c6934c24b Fix #1840 2017-10-20 11:09:20 +11:00
Simone Bordet a4d7b4c4dc Removed unnecessary code. 2017-10-03 10:19:06 +02:00
Greg Wilkins 31a9b6f2e8 Issue #215 Conscrypt module for SSL and ALPN
Squash of the following commits:

commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:27:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:26:45 2017 +1000

    Issue #215 Conscrypt module debug

commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 18:23:51 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed server-side ALPN negotiation for Conscrypt.

commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 16:56:20 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed client-side ALPN negotiation for Conscrypt.

commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 15:26:45 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Code cleanups.

    Changed ALPNProcessor.init(boolean) to init().
    Removed unnecessary try/catches and simplified exception handling.

commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 18:07:30 2017 +1000

    Issue #215 Conscrypt SSL pom cleanups

commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:57:20 2017 +1000

    Issue #215 Conscrypt SSL ALPN cleanups

commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:46:13 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 14:56:06 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 17:19:49 2017 +1000

    Fix #1823 MimeTypes for ResourceHandler mp4

commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:21:39 2017 +1000

    Issue #215

commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:08:05 2017 +1000

    Issue #215

    Use conscrypt 1.0.0.RC10 uber jar

commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 10:35:43 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 16:04:05 2017 +1000

    Issue #215 Conscrypt ALPN provider

    First attempt at client support

commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 09:48:43 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 08:49:10 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 15:24:27 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 11:04:24 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:04:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:03:52 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 21:19:28 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:22:19 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:16:35 2017 +1000

    Issue #215 Conscrypt ALPN provider
2017-09-21 07:34:25 +10:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Greg Wilkins 57e86c5c41 Issue #1416 GzipHandler If-Match 2017-09-05 18:31:56 +10:00
Greg Wilkins ca750cf582 #1792 Accept ISO-8859-1 in Response reason 2017-09-05 17:29:49 +10:00
Greg Wilkins eb1320f56c Issue #1116 Allow empty HTTP header value 2017-08-30 16:42:47 +10:00
Greg Wilkins bd111264f5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-08-30 16:41:29 +10:00
Greg Wilkins afaa170cd9 Issue #1116 Allow empty HTTP header value 2017-08-30 16:40:58 +10:00
Greg Wilkins db249c09d0 Issue #1729 Correct exception message 2017-08-14 09:52:33 +10:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Greg Wilkins 3b297a2557 Apply #1649 2017-08-08 09:15:56 -07:00
Greg Wilkins 91e7087fcd Fix #1672 Proxy tests HttpTester.from usage 2017-08-08 09:14:49 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Greg Wilkins 58a4d9e115 Fixes #1592 bad compressed etag comparison 2017-08-08 09:10:25 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00