3986 Commits

Author SHA1 Message Date
Greg Wilkins
97cb063a57 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-11-23 17:01:39 +01:00
Greg Wilkins
92317a7bb4 Issue #3132 improve dump readability
fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-23 16:54:36 +01:00
Jan Bartel
4e672c6b27
Issue #2646 - Better handle concurrent calls to change session id and invalidate within a context (#2670)
* Issue #2646 handle concurrent invalidate/changeid calls

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-23 16:15:27 +01:00
Lachlan Roberts
771f120508 Issue #113 - customrequestlog module
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 20:01:19 +01:00
Lachlan Roberts
112d57f474 Issue #113 - CustomRequestLog
added missing copyright header in some new files

added CustomRequestLogTest in jetty-servlet to test things like
logFilename and logRequestHandler

the log strings produced do no longer contain a trailing newline

implemented more tests in CustomRequestLogTest
and finished implementing some of the logging in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 10:32:22 +01:00
Greg Wilkins
8c4ee8496f
Jetty 9.4.x 3038 ssl connection leak (#3121)
Issue #3038 - SSL connection leak.

Fixed SSL spin caused when fill had NEED_WRAP, but a flush/wrap
produced 0 bytes and stayed in NEED_WRAP

Removed check of isInputShutdown prior to filling that allowed EOF to
overtake data already read.

Fix for leak by shutting down output in HttpConnection if
filled -1 and the HttpChannelState was no longer processing
current request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-20 13:53:42 +01:00
Lachlan Roberts
6040bd3497 Issue #113 - AbstractNCSARequestLog no longer abstract and test cleanups
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 15:05:47 +01:00
Lachlan Roberts
cc1ae54feb Issue #113 - Parameterized RequestLogTest to test NCSA format string
renamed to NcsaRequestLogTest as is only testing NCSA log formats

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 14:53:48 +01:00
Lachlan Roberts
e4d30b367c Issue #113 - Added Request Log Writers
Introduced the RequestLog.Writer where a RequestLog takes a writer
which manages what to do with the log strings produced by the RequestLog

deprecated the NCSA and SLF4J RequestLogs in favor of CustomRequestLog

Implemented more format codes in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 13:58:53 +01:00
Greg Wilkins
7dd3cfffe6 Issue #113 channel persistance and completed getters
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-15 14:36:40 +01:00
Joakim Erdfelt
29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt
c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Lachlan Roberts
7ca6577ac6 Issue 113 - CustomRequestLog
fixed parsing issues for the format string by parsing left to right
and reversing the list of parsed tokens

reduced to parsing to single regex expression

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-13 14:51:06 +01:00
Joakim Erdfelt
a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt
49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
Simone Bordet
422f4d9341 Issue #3085 - Restore Dump methods for backwards compatibility reasons.
Removed dead code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-09 18:53:50 +01:00
Simone Bordet
f814354bb5 Issue #3085 - Restore Dump methods for backwards compatibility reasons.
Restored removed methods to maintain backwards compatibility.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-09 17:47:46 +01:00
Lachlan Roberts
1e50b371fe Issue 113 - CustomRequestLog
javadoc cleanup

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-08 18:39:29 +01:00
Lachlan Roberts
0d8369c5c1 Issue 113 - CustomRequestLog
added test methods for all format codes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-08 18:07:53 +01:00
Lachlan Roberts
3ce7016a35 Issue 113 - CustomRequestLog
added methods for each of the format codes described in javadoc

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-08 11:17:59 +01:00
Greg Wilkins
cf2de4411c
Issue #3041 separate CookieCompliance for parsing and generation (#3048)
* Issue #3041 separate CookieCompliance for parsing and generation

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

* improved documentation

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

* use only getters

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

* Rename setters to avoid setSetXxxx

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-07 10:03:18 +01:00
Lachlan Roberts
22e7679dd6 Issue 113 - CustomRequestLog
changed the log type to include the response

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-06 12:21:30 +01:00
Lachlan Roberts
4be4b4e7b4 Issue #113 - CustomRequestLog
update logHandle directly rather than creating list of tokens

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-06 12:16:22 +01:00
Lachlan Roberts
012d412ccb Issue #113 - CustomRequestLog
javadoc detailing the custom log formats

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-06 11:48:08 +01:00
Lachlan Roberts
557f40f41f Issue #113 - CustomRequestLog
created new CustomRequestLog class

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-06 11:46:26 +01:00
Jan Bartel
871f73cdf6
Jetty 9.4.x 2932 switchable classloader for session attribute values (#2964) 2018-11-06 10:03:48 +01:00
Greg Wilkins
3995cd2ec0
Issue #3023 redirect to / when pathInfoOnly (#3047)
Issue #3023 redirect to / when pathInfoOnly (#3047)
2018-11-02 16:38:43 +01:00
Greg Wilkins
b69f8e4084
Issue #2886 Handle SNI with non SNI certificates (#2888)
* Issue #2886 Handle SNI with non SNI certificates

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

* Issue #2886 Single SNI with default certificate
2018-11-02 05:20:17 +01:00
Greg Wilkins
bb045f641e
Issue #3049 Warn on common SslContext vulnerable configurations (#3050)
* Issue #3049 Warn on common SslContext vulnerable configurations

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

* Adding documentation notes for weak cipher warnings

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Issue #3049 - SslContextFactory warnings on known bad config

+ Changes warnings from being a boolean on SslContextFactory
  to being a logger named
  "org.eclipse.jetty.util.ssl.SslContextFactory.config"

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

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

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

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-02 05:19:03 +01:00
Jan Bartel
58c1d547a0
Issue #3044 Use unwrapped session for SessionAsyncListener (#3053)
* Issue #3044 Use unwrapped session for SessionAsyncListener
2018-11-02 04:14:24 +11:00
Greg Wilkins
161f1698cf
Jetty 9.4.x 3018 request logging bad messages (#3020)
Issue #3018 improve logging and handling of slow data rates.

* Slow data rates now result in aborted channels, but exception is still thrown.  Test for 408 in requestLog
* Updated many RequestLog usages to use Server.setRequestLog rather than a RequestLogHandler
* Fixed javadoc
* removed BadRequestLogHandlerTest (tested in RequestLogTest)
* added JMH to show the future of request logging for #113
* copyright header.
* Updates from review
* Revert to throwing BadMessageException
* BME ensures a 408 is logged rather than a 500

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 17:06:04 +01:00
Greg Wilkins
8dcd7e44d8
Allows commas to separate cookies in RFC2965 compliance mode (#3045)
* Allows commas to separate cookies in RFC2965 compliance mode

* cleanup after review

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

* revert accidental change

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 11:43:11 +01:00
Greg Wilkins
898560bec5
Issue #3030 Enforce Content-Encoding check only on parameter extraction. (#3031) 2018-10-26 06:44:40 +11:00
Jan Bartel
4ababf9888
Issue #294 Initial enter scope for DebugListener (#3021)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-10-23 17:29:54 +11:00
Jan Bartel
8eb21f84a3 Issue #2998 Add key to DebugListener dump; ensure LoginService dumped
only once.
2018-10-23 17:18:12 +11:00
Greg Wilkins
15e1c73f9c
Cleanup the dump implementation (#2998)
* Cleanup the dump implementation
* improved the clarity of utility methods for dump and updated most dump methods
* fixed upgrade filter dump
* Improved dump after review
* Moved dumpObjects to Dumpable
* implemented dumpBeans with dumpObjects
* less verbose dump
* Dump streams
* fixed dump test

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-22 11:53:59 +11:00
Greg Wilkins
efdf3c2473
Issue #2970 ensure onComplete is called (#2971)
* Issue #2970 ensure onComplete is called
* Cleanup after review - single try

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-20 10:15:05 +11:00
Joakim Erdfelt
9e84c1ee93 Testing for BindException cause as well
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-19 10:38:09 -05:00
Joakim Erdfelt
35ea653f73 Fixing PR #3003 - formatting and junit5 syntax
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-19 10:36:26 -05:00
Magnus Reftel
37a85152eb Improve error message when binding to in-use port
Signed-off-by: Magnus Reftel <magnus.reftel@skatteetaten.no>
2018-10-19 10:46:13 +02:00
Simone Bordet
bd3eeeaa3f Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-10-04 12:27:31 +02:00
Greg Wilkins
9d37feba3c
Cleanup after #2903 (#2933)
Improved dump output of ServletHandler and ContextHandler
Fixed duplicate listeners
Removed unused fields

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-03 10:00:14 +10:00
Joakim Erdfelt
57ef060325 Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
+ Applying fixes from review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-02 08:39:05 -05:00
Joakim Erdfelt
fe66e3d0cb Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-01 10:43:57 -05:00
Simone Bordet
27e7b3287a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-09-26 13:51:21 +02:00
Simone Bordet
7e68ef1e17 Issue #2191 - JPMS Support.
Now server.mod patches the servlet.api JPMS module with jetty-schemas.jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:22:29 +02:00
Simone Bordet
701a21fb1a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2727-mbeanInfoCaching2'. 2018-09-26 10:07:25 +02:00
Simone Bordet
92e70f2c84 Issue #2727 - Revisit JMX MBean lookup behavior.
Fixed invoke() lookup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-24 10:49:29 +02:00
Greg Wilkins
304eac7460 improved debug (more to do)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-24 16:41:03 +10:00
Olivier Lamy
71a1801433
Issue #2918 restore a TestTracker with junit5 (#2927)
* add TestTracker junit5 extension #2918

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00