Commit Graph

16240 Commits

Author SHA1 Message Date
Lachlan Roberts b97c80b3c1 Issue #113 - testing of logConnectionStatus implemented
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-27 14:26:31 +01:00
Lachlan Roberts b35df419bb Issue #113 - reformat, javadoc update and changes after review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-27 14:26:12 +01:00
Lachlan Roberts 2cd579353c Issue #113 - fix javadoc errors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-26 14:12:16 +01:00
Lachlan Roberts 7c0ea57923 Issue #113 - CustomRequestLog terminology refactor
replaced terminology for addresses and ports to use
client and server referring to the logical connection and
local and remote referring to the physical connection to the first hop

finished implementing tests in CustomRequestLogTest otherwise
disabled tests which will be verified manually instead

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-24 10:28:57 +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
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
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
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
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
Greg Wilkins 4a9265d4b4 backports from 10.0.x websocket refactor
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-03 17:53:32 +01:00
Joakim Erdfelt 5a17a33045 Fixed #2458 - Removing jdk9 and jdk10 CI builds
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-02 11:34:05 -05:00
Joakim Erdfelt e6716a0539
Merge pull request #3052 from eclipse/jetty-9.4.x-issue-3015-simplified-Jenkinsfile
Issue #3051 - New Simplified Jenkinsfile
2018-11-02 10:57:24 -05: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
olivier lamy af7dba1249 make compiler.target/source as a property so we can override those with the command line
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-02 19:20:35 +10: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
Simone Bordet d33f65d322
Merge pull request #2957 from eclipse/jetty-9.4.x-2941-asm_jdk11
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
2018-11-01 17:49:22 +01:00
Simone Bordet 97c37f998b Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
Updated ASM version in the main POM to 7.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-01 17:48:39 +01:00
Simone Bordet 9d7d47f0a8 Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
Updated ASM Import-Package version to be "5", which means from ASM 5 onwards.
Updated ASM version in the main POM to 7.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-01 17:40:15 +01:00
Greg Wilkins 0fe4b8aa34 increased timeouts to check for flaky test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 17:35:21 +01:00
Simone Bordet 11abe53df7
Merge pull request #2965 from eclipse/jetty-9.4.x-2796-http2_max_concurrent_streams
Issue #2796 - Max local stream count exceeded when request fails.
2018-11-01 17:28:08 +01: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
Joakim Erdfelt 7b8bda8070 Issue #3051 - New Simplified Jenkinsfile
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-01 10:21:52 -05: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
olivier lamy 392260a232 maven-plugin-plugin 3.6.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-01 12:38:48 +10:00
WalkerWatch 94bfeacba5 Added note on stopping the server. Resolves #3033 2018-10-31 16:56:25 -04:00
Olivier Lamy bc1e58b0f5
*issue #2923 add LICENSE and NOTICE files (#2940)
*remove html license version
* use org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.2 released version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-31 09:24:20 +10:00
Simone Bordet 31cab3dc08 Issue #2796 - Max local stream count exceeded when request fails.
Restored smaller maxContentLength to avoid that the test takes
too much time and fails.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-30 19:36:02 +01:00
Simone Bordet 5d837309c3 Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
Downgraded OSGi ASM version to 6.2.
Waiting for the SPI Fly library to support JDK 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-30 17:42:11 +01:00
Simone Bordet b70323d55f Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2796-http2_max_concurrent_streams'. 2018-10-29 19:05:35 +01:00
Olivier Lamy 542872cd75
fix duplicate dependency javax.transaction-api 2018-10-29 18:18:02 +10:00
olivier lamy b19d9b27ab use maven pmd plugin 3.11.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-26 12:38:11 +10:00
Greg Wilkins 898560bec5
Issue #3030 Enforce Content-Encoding check only on parameter extraction. (#3031) 2018-10-26 06:44:40 +11:00
Olivier Lamy 8500e806ec
align used algorithm to detect java bin to use (#3025)
add javaPath for JettyRunDistro mojo to force a java executable to use

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-24 19:02:31 +10:00
Simone Bordet 66d6ea6799 Issue #2998 - Cleanup the dump implementation.
Fixed dump() in QueuedThreadPool.
When the dump was not detailed, it was printing jobs=0 even if there
were jobs in the queue.
Given that it was adding no information (actually misleading information)
and that the queue size is already reported by QueuedThreadPool.toString()
the jobs are not dumped if the dump is not detailed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-23 12:05:32 +02:00
Jan Bartel a0cefea29f
Issue #2903 Fix ListenerHolder.setListner (#3019)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-10-23 17:59:24 +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
Simone Bordet 0236f4064a Issue #2998 - Cleanup the dump implementation.
Fixed dump() in HTTP2Session.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-22 22:47:54 +02: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