Commit Graph

21338 Commits

Author SHA1 Message Date
Lachlan fe6f0eb87d
Merge pull request #4931 from eclipse/jetty-10.0.x-4919-WebSocketContainerStop
Issue #4919 - WebSocket container graceful stop
2020-07-29 13:19:53 +10:00
Olivier Lamy df85afbc63
Delete maven.yml 2020-07-28 20:32:30 +10:00
Lachlan Roberts a4245d4b3d remove GitHub CI test directory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 20:29:49 +10:00
Lachlan Roberts 1be0220988 Issue #4919 - make the SessionTracker the one to implement Graceful shutdown
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 17:38:41 +10:00
Lachlan Roberts 9e383f0891 Issue #4919 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 16:48:49 +10:00
Lachlan Roberts 7ea35d78c5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-28 13:39:50 +10:00
Lachlan c307c95887
Merge pull request #5080 from eclipse/jetty-9.4.x-OpenID
use OpenID id_token expiry time for the initial authentication only
2020-07-28 13:39:21 +10:00
Lachlan 7e4f32b56c
Merge pull request #5075 from eclipse/jetty-10.0.x-ServletPathMappingInclude
restore old ServletPathMapping even for include dispatch types
2020-07-28 13:36:18 +10:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock.
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Simone Bordet a33b0e290e Avoid using a protected Logger instance.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 16:05:03 +02:00
Lachlan Roberts 5f2c96dc58 use the OpenID Token expiry time for the initial authentication only, and not for expiry of the session.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-27 10:02:38 +10:00
olivier lamy 27e9ff89ce wrong commit
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-26 21:45:04 +10:00
olivier lamy f5550a780a release drafter test
Signed-off-by: olivier lamy <olamy@apache.org>
2020-07-26 21:42:56 +10:00
Lachlan Roberts e13d26ab45 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-24 13:39:07 +10:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Lachlan Roberts 6364490161 restore old ServletPathMapping even for include dispatch types
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 23:41:56 +10:00
Lachlan Roberts 9f3864af7e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-23 18:08:20 +10:00
Lachlan 6b37983c89
Merge pull request #5065 from eclipse/jetty-9.4.x-5062-testKeystoreRemoval
Issue #5062 - fix flaky test KeyStoreScannerTest.testKeystoreRemoval()
2020-07-23 17:28:52 +10:00
Lachlan 76e821e774
Merge pull request #5071 from eclipse/jetty-9.4.x-setuidDocumentation
fix links links to jetty.toolchain in jetty setuid documentation
2020-07-23 17:28:36 +10:00
Lachlan Roberts f1b4bdbbf2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 17:17:53 +10:00
Lachlan 81f6ec6e3d
Merge pull request #5066 from eclipse/jetty-9.4.x-5064-openIdSerializable
Issue #5064 - the OpenIdCredentials should be serializable
2020-07-23 17:16:36 +10:00
Lachlan Roberts d5cf429537 fix websocket tests from merge
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 12:17:20 +10:00
Lachlan Roberts cd3f495e9c disable test until merge of #5058 is fixed
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 11:58:55 +10:00
Lachlan Roberts e77c253267 Issue #5018 - fix merge to jetty-10, WSClient.connect Future should fail upgrade
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 11:17:05 +10:00
Lachlan Roberts 5726fa9364 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 10:19:53 +10:00
Lachlan d8b775c0fb
Merge pull request #5030 from eclipse/jetty-9.4.x-5018-WebSocketClientConnectFuture
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade
2020-07-23 08:36:12 +10:00
Joakim Erdfelt 25a2326221
Merge pull request #5054 from eclipse/jetty-10.0.x-5043-AnonymousWebSocketListener
Issue #5043 - allow anonymous WebSocketListener / Endpoint classes to be used
2020-07-22 14:49:48 -05:00
Joakim Erdfelt 980ad4c666
Reverting accidental upgrade to surefire
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-22 14:38:33 -05:00
Lachlan Roberts 695d239ac5 Issue #4919 - all websocket containers to implement Graceful shutdown interface
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 00:09:43 +10:00
Jan Bartel b5eff0eb6b Skip javadoc for test-jetty-osgi-webapp-resources war. 2020-07-22 11:21:33 +02:00
Lachlan Roberts d9f930fcaa fix links links to jetty.toolchain in jetty setuid documentation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-22 18:57:20 +10:00
Joakim Erdfelt 1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-21 16:04:27 -05:00
Jan Bartel 3f5d94f80f Fix TestJettyOSGiClasspathResources test.
Also remove unnecessary deploy of tinybundle for
TestJettyOSGiBootWithJavaxWebSocket.
2020-07-21 18:41:57 +02:00
Jan Bartel c4ffb65791 Fix new pom and TestJettyOSGiClasspathResource.
Test is still a WIP: in jetty-10 there are errors that don't occur in
jetty-9, still investigating.
2020-07-21 15:48:06 +02:00
Jan Bartel c791c58a92 Fix pom for test-jetty-osgi-webapp-resources 2020-07-21 14:29:56 +02:00
Lachlan Roberts 38a94879f9 Issue #5062 - KeyStoreScannerTest should use manual scanning to avoid timing issues
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 11:31:40 +10:00
Lachlan Roberts e03c740ee8 Issue #5064 - the OpenIdCredentials should be serializable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 09:48:30 +10:00
Greg Wilkins 65de149f84
Issue #5057 - Included root context path (#5058)
* Fixes #5057 Included root context path

Root context path in include should be empty string.

* Issue #5057

merged context path methods as result of review.
ServletContent.getContextPath now returns the encoded contextPath (if anybody is silly enough to have one).
2020-07-20 17:35:48 +02:00
gregw 965e73e9e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-20 12:01:53 +02:00
Jan Bartel 89045959ac
Issue #5013 Classloader.getResources resolves preferentially from osgi bundle loader (#5034)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-20 11:05:18 +02:00
Lachlan Roberts 9f7f2e3e56 WebSocket server now only closes gracefully if the Server stopTimeout is set
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-20 15:49:15 +10:00
Lachlan Roberts 0818f54be8 cleanup the ws javax EchoSocket test class
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-20 15:32:46 +10:00
gregw 6125a07a63 Issue #5053
removed weak random from Masker.
2020-07-17 17:59:57 +02:00
gregw 88ec429b9c Issue #5053
removed weak random from digest.
2020-07-17 13:02:46 +02:00
gregw f6d39849e8 Improves #5053 by giving option of secure or pseudo random
Allow random to be passed in and can default to a weak pseudo random.
2020-07-17 12:19:22 +02:00
Lachlan Roberts c94e82470d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 2020-07-17 15:32:10 +10:00
Joakim Erdfelt 8e7bfa0ee5
Some jetty-servlet test cleanup
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-16 14:28:08 -05:00
Joakim Erdfelt f87711b2da
Adding jmh test to compare String.substring() vs String.repeat()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-16 13:30:47 -05:00
Joakim Erdfelt c564c9647e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4572-message-indent 2020-07-16 13:21:32 -05:00