SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität
1.755 Commits 1 Branch 0 Tags 14 MiB
311133a4d3
Commit graph

1143 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
150fd9a9cf Add highly-optimized VarInt writing method 2021-05-08 23:26:43 -04:00
Andrew Steinborn
6369a95ec9 Readd safe and slow compression handling and hide it behind a system property 2021-05-08 18:40:23 -04:00
Leymooo
a8e0516d18 Also do not copy memory in case when packet needs to compress 2021-05-07 19:36:30 +03:00
Andrew Steinborn
37a4199d43 Combine VarInt prefix encoding with compression 
This saves us a memory copy in the common "there is no need to compress this packet" case.
 2021-05-06 19:56:45 -04:00
Andrew Steinborn
fb3f21abc6 More bitshifting magic 2021-05-06 00:48:19 -04:00
Andrew Steinborn
1cef82d54d Unroll the VarInt writing loop 
This is about as optimized as it can get. Thanks to @Leymooo for the idea, I simply expanded on it. We optimize for the common 1-3 byte cases, and punt more "complicated" cases to the original VarInt writing function we had before.
 2021-05-05 22:13:54 -04:00
Andrew Steinborn
d42cc4f984 Force a flush after a certain threshold of packets have been queued for sending 
Fixes #486.
 2021-05-04 18:51:01 -04:00
Nicolas RAYNAUD
e0153267db
Fixed copyright year (#490) 2021-05-04 18:22:50 -04:00
Andrew Steinborn
7c76ae9a27 Make sure to check not only the entire array but also how much was written 2021-05-04 16:32:37 -04:00
Andrew Steinborn
3dc8e25ec7 Fix varint writing (for real!) 
Thanks to @Leymooo for reporting and providing test cases. (I also added one of my own tests which proved the most useful to debugging the issue.)
 2021-05-04 16:30:32 -04:00
Riley Park
2713831f77 Revert "Avoid calling writeVarInt in the (very) common uncompressed packet case" 
This reverts commit c041bea1b6.
 2021-05-03 19:38:39 -07:00
Andrew Steinborn
c041bea1b6 Avoid calling writeVarInt in the (very) common uncompressed packet case 2021-05-03 20:17:51 -04:00
Andrew Steinborn
0debb81392 I was nagged to make it more consistent 2021-05-03 20:08:16 -04:00
Andrew Steinborn
0811ebb312 Gotta add the license header to the test file 2021-05-03 19:18:06 -04:00
Andrew Steinborn
4ca97a6df9 Reapply "Optimize varint writing" 
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.

This includes a test to ensure that the behavior is as expected and fixes the initialization loop so that the correct results will be given. Much thanks to @octylFractal for acting as my duck while trying to figure this out.
 2021-05-03 19:14:48 -04:00
Andrew Steinborn
e531cdb373 Revert "Optimize varint writing" 
This reverts commit 3db2fe8d63.
 2021-05-03 18:07:25 -04:00
Andrew Steinborn
3db2fe8d63 Optimize varint writing 
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.
 2021-05-03 17:31:32 -04:00
Andrew Steinborn
347853b945 Disable hinting test for now 2021-04-25 10:18:58 -04:00
Andrew Steinborn
81311e7516 Don't attempt to decode empty buffers (fixes #482) 
Stuff like this makes me want to drop support for <=1.13 versions of Minecraft.
 2021-04-25 10:14:13 -04:00
Andrew Steinborn
ce26ae76c2 Fix case-sensitivity for ping passthrough 2021-04-22 11:23:42 -04:00
Andrew Steinborn
ca52f8989e Load forced hosts as lowercase too, see #464 2021-04-18 08:22:36 -04:00
Andrew Steinborn
ff54622663 Forced hosts should be case-insensitive. Fixes #464 2021-04-18 08:20:04 -04:00
Andrew Steinborn
f1cb3eb1a2 Move timeout handler to after frame decoder 
Mitigates attacks like the one described in SpigotMC/BungeeCord#3066. This cannot be considered a full protection, only a mitigation that expects full packets. The attack described is essentially the infamous Slowloris attack.
 2021-04-15 22:56:37 -04:00
Andrew Steinborn
c51359e893 Move away from deprecated percent() method. 
Also fixed another small nit.
 2021-04-15 04:23:59 -04:00
Andrew Steinborn
4de71fe942 Fix color and overlay packets for Adventure boss bar 
Someone discovered this bug but decided not to tell anyone. For the record, I'm the one who was brain-damaged... well, I made that particular copy-paste error.
 2021-04-15 04:22:44 -04:00
Cubxity
5ea6728d1a
Added ListenerBoundEvent and ListenerCloseEvent. (#454) 2021-04-02 13:24:45 -04:00
Rocco
c34aee76ae
Fix Forge/Client Proxy Connections mismatch in config (#456) 2021-04-02 12:36:32 -04:00
A248
7ba2318506
Fix one more case of a possibly swallowed exception (#455) 
Maybe spotbugs will add a rule for this in the future
 2021-04-02 01:45:58 -04:00
Andrew Steinborn
c747120b20
Relicense the Velocity proxy under the terms of GPLv3 (#448) 2021-03-31 16:04:06 -04:00
Andrew Steinborn
514115a85c Do not use an ASCII string for handshake 2021-03-30 12:10:55 -04:00
Andrew Steinborn
f88283f127 Revert "Revert strict handshake hostname checks" 
This reverts commit 4f80d2b261.

Experience elsewhere (Waterfall PR) and confirmation from TCPShield means
this ought to work. Let's hope.
 2021-03-30 12:08:08 -04:00
Andrew Steinborn
8aad6e2ece clear input buffer in case of bad varints 2021-03-30 12:05:43 -04:00
Andrew Steinborn
0cc300b621 don't swap these two around 2021-03-23 07:38:07 -04:00
Andrew Steinborn
3111816545 Warn about null permission functions. 2021-03-23 07:32:01 -04:00
A248
0016f4ce19
Relay more exceptions (#446) 2021-03-22 08:11:25 -04:00
Andrew Steinborn
72d47b5a3d Don't advertise the BungeeCord plugin messaging channel if it is disabled. 2021-02-18 18:12:51 -05:00
David Mayr
648624d333
Check permissions before providing suggestions (#430) 2021-02-16 19:13:48 -05:00
Andrew Steinborn
b94303d2be Map command nodes being serialized by their identities 
Fixes #429
 2021-02-16 01:14:22 -05:00
Bastian
7a713e9379 Update bStats and migrate to new config file 
This commit simplifies the Metrics class by using the new base module
from bStats. It also migrates to the new bStats config file that will
be used by plugins that integrate bStats. If a user disabled bStats in
the old config file, this setting will be copied to the new config file.
 2021-02-12 20:29:07 +01:00
Camotoy
fb879cb498
Apply initial requested changes 2021-02-09 14:13:33 -05:00
Camotoy
d47b339908
Add PlayerPluginMessageRegisterEvent 2021-02-09 13:51:43 -05:00
Andrew Steinborn
7e42c5b2e7 Turn some APIs into no-ops if they apply to clients without the relevant client functionality. 2021-02-07 15:19:59 -05:00
Andrew Steinborn
b88c573eb1 Correctly forward the player's virtual host to the remote server. 2021-02-01 16:17:02 -05:00
Andrew Steinborn
4f80d2b261 Revert strict handshake hostname checks 
These will break TCPShield and Cosmic Guard plugins. Sad as this was a worthwhile mitigation.
 2021-01-29 23:08:14 -05:00
Andrew Steinborn
501853e807 Fix Checkstyle issue for the umpteenth time... 2021-01-29 17:59:00 -05:00
Andrew Steinborn
4f6d238b39 Strictly limit the hostname size and limit it to ASCII characters only 2021-01-29 17:56:50 -05:00
Andrew Steinborn
4219bf7b09 *Actually* fix Checkstyle issues 2021-01-26 20:02:07 -05:00
Andrew Steinborn
b982c5b6ed Fix Checkstyle issues 2021-01-26 19:59:29 -05:00
Andrew Steinborn
0c90e94e85 fix 2021-01-26 19:50:43 -05:00
Andrew Steinborn
5ceac16a82 Add upfront size checks for some packets. 
This is simply a further protection against certain attacks which send malformed packets to the proxy.
 2021-01-26 12:33:35 -05:00
Andrew Steinborn
959e75d16d Revert "Also provide a "proper" java.util.logger logger to plugins." 
This reverts commit 8d71ea7135.

Totally broken
 2021-01-25 09:46:42 -05:00
Andrew Steinborn
8d71ea7135 Also provide a "proper" java.util.logger logger to plugins. 2021-01-25 01:54:50 -05:00
Andrew Steinborn
4bc76b3012 Add JUL support to log4j 
Certain badly behaved plugins insist on logging with java.util.logging. Accommodate them.
 2021-01-25 01:51:32 -05:00
Andrew Steinborn
68ae92f977
Merge pull request #419 from 0-x-2-2/dev/1.1.0 
Use keepalive queue instead of just the last keepalive.
 2021-01-23 20:18:14 -05:00
0x22
7aed76ee3d
Use keepalive queue instead of just the last keepalive. 2021-01-23 18:35:14 -05:00
Andrew Steinborn
03e9fa79d6 Raise limit on JoinGame NBT reading to 2MiB. 
This is required for particularly large mod packs (think All of Fabric 3 for instance).
 2021-01-23 12:55:28 -05:00
Andrew Steinborn
fcffccf0d8 Fix typo 2021-01-23 01:35:49 -05:00
Andrew Steinborn
ce7d1dcb26 A new year, a new color for Velocity! 2021-01-23 01:34:46 -05:00
Andrew Steinborn
892ac6f626 Accept changes to compression treshold on the fly. 
Vanilla allows this for some reason, and there has been one case where Velocity's strict behavior has caused a bug. Fix this.
 2021-01-21 17:58:09 -05:00
Andrew Steinborn
567a3b2365 Swallow and more usefully log exceptions in scheduler task running. 2021-01-09 16:39:38 -05:00
Andrew Steinborn
ba1c1eef64 More clarification 2021-01-06 13:30:57 -05:00
Andrew Steinborn
4df8f70156 Rename proxy-protocol setting to haproxy-protocol to make it clearer this is for HAProxy. 2021-01-06 13:29:30 -05:00
Andrew Steinborn
1f9c24566d Fix off-by-one error in MinecraftCompressEncoder 2020-12-31 13:18:01 -05:00
Andrew Steinborn
dc7ab0f7f5 Log server backpressure 2020-12-27 18:36:54 -05:00
Andrew Steinborn
2a1e83902d Add support for server-side backpressure 2020-12-27 18:05:27 -05:00
Andrew Steinborn
7329d165f6 2021 2020-12-26 21:56:19 -05:00
Andrew Steinborn
6a8ec21f26 Use a different quiet exception type to indicate the user should enable a debugging flag if needed 2020-12-26 20:59:17 -05:00
Andrew Steinborn
f6078e9b74 Fix several problems and clean up the BungeeCord plugin messaging support. 
Fixes #402
 2020-12-26 20:52:12 -05:00
Andrew Steinborn
b1f7980c5d Fix ForwardToPlayer subchannel, closes #406 2020-12-26 19:49:28 -05:00
Andrew Steinborn
7fe2fc71e9 Add some small debug for refcount issues with plugin messages. 2020-12-25 17:03:38 -05:00
Andrew Steinborn
07b95d46ac Delay sending stats to bStats for 3-5 minutes after server startup 2020-12-21 20:14:57 -05:00
Andrew Steinborn
eb3868d911 Do not try to override colors in messages or server-sent messages 2020-12-21 19:56:17 -05:00
Andrew Steinborn
98b74fd220 Correctly retain message buffer for LoginPluginMessage. 
Fixes #407
 2020-12-21 13:14:38 -05:00
Andrew Steinborn
523b61e0c7 Make sure unit tests actually run(!) and fix command hints 2020-12-14 14:39:39 -05:00
Jk C
5bd60a4b77
Fix spelling issues and grammer issue 2020-12-11 18:57:01 -07:00
Jk C
808205302e
Spelling issue 2020-12-11 16:57:13 -07:00
Andrew Steinborn
2a5bb1e487 Fix tab list clearing bug. 
Fixes regression introduced in 5da085d
 2020-12-07 02:28:03 -05:00
Riley Park
5da085d82f
Adventure 4.3.0: Player list header/footer 2020-12-06 17:50:57 -08:00
Andrew Steinborn
fa2655d49b Fix the debug message 2020-11-24 12:09:49 -05:00
Andrew Steinborn
aa7aee9dd7 Add another validation case although it's not strictly required 2020-11-24 12:05:27 -05:00
Andrew Steinborn
084b741375 Don't repeat validation in AvailableCommands 
When deserializing an AvailableCommands packet, we do a few sanity checks to ensure the packet is valid. Some of this work was repeated for each cycle (notably the root) so we now check the children and any redirects are defined only once.
 2020-11-24 12:03:34 -05:00
Andrew Steinborn
329e2b0dc9 Use our fork's removeChildByName 2020-11-16 13:09:47 -05:00
Andrew Steinborn
7ead4add67
Support custom mod argument tunneling (#390) 2020-11-16 02:58:00 -05:00
Andrew Steinborn
511165415d Switch to our internal Brigadier fork 2020-11-15 23:33:16 -05:00
Andrew Steinborn
44f872eea4 Better validate addresses in configuration. Fixes #385 2020-11-07 20:43:58 -05:00
A248
46da2553fb Permit passing PluginContainer to PluginManager#addToClasspath 2020-11-07 14:53:09 -05:00
Andrew Steinborn
d51f357fa8 Avoid unneeded copy in BackendPlaySessionHandler plugin messages 2020-11-07 10:57:03 -05:00
Andrew Steinborn
8a3b6403da Wrap plugin message copies in unreleasable copies. 
Trying to track down a very weird issue that barely makes sense to me.
 2020-11-07 09:40:09 -05:00
Andrew Steinborn
fb888c3b8a Store players in VelocityRegisteredServer by UUID instead. 
Fixes an issue where players would be repeated in /glist and the like.
 2020-11-06 09:38:26 -05:00
Andrew Steinborn
cc89a2a1e5 We don't need to retain/release the mod list buffer in readModList 2020-11-05 20:04:31 -05:00
Gabik21
18f9368427
Fix ping response being delayed on 1.7 2020-11-05 12:32:35 +01:00
Andrew Steinborn
54c5effe27 Fix typos. 2020-11-03 16:06:30 -05:00
Andrew Steinborn
d708716ef6 Use slower server switching sequence for Legacy Forge clients 2020-11-03 15:58:03 -05:00
Andrew Steinborn
325ab19102 Move out VarintByteDecoder to improve escape analysis 2020-11-03 12:55:02 -05:00
Andrew Steinborn
9adba81d23 Use ByteBuf#clear() instead of skipping readable bytes 2020-11-02 22:44:53 -05:00
Andrew Steinborn
7944544606 Small cleanup in TransitionSessionHandler 2020-10-31 18:32:42 -04:00
Andrew Steinborn
4fb7e02326 Fix Checkstyle error 2020-10-30 06:35:35 -04:00
Andrew Steinborn
9a0affbca9 Fix disconnect issues in 1.7-specific logic. 2020-10-30 06:34:28 -04:00
Andrew Steinborn
cace7cc428 Fix typo resulting in BungeeCord plugin messaging not working 2020-10-28 20:44:50 -04:00
Andrew Steinborn
ba8d6fe42a Really Velocity 1.1.1. Fix a missed case of 7bec4b2f1. 2020-10-28 19:06:43 -04:00
Andrew Steinborn
7bec4b2f12 Don't let clients fake being the BungeeCord plugin message channel 2020-10-28 18:54:51 -04:00
Andrew Steinborn
36ff6f63ae Use the fallback description if the backend server description is null 
This is technically incorrect but it seems like this is the best we can do...
 2020-10-28 17:11:19 -04:00
Andrew Steinborn
4ccbb2cde2 Fix TabCompleteResponse not using Adventure to read tooltips. 2020-10-27 07:29:08 -04:00
Andrew Steinborn
9f424522ac Authors should be a JSON array 2020-10-26 21:00:08 -04:00
Andrew Steinborn
536049995d Fix SpotBugs complaint 2020-10-26 20:58:20 -04:00
Five (Xer)
01070f8fd2
Velocity Dump Cleanup 2020-10-27 01:43:09 +01:00
Five (Xer)
140eaaf5ab
Velocity Dump WIP Part 2 2020-10-27 01:40:32 +01:00
Five (Xer)
6331e1af3e
Velocity Dump WIP 2020-10-27 01:36:20 +01:00
A248
278930a008 Handle exceptions relating to CompletableFuture operations 
Solves #374
 2020-10-26 13:52:04 -04:00
Andrew Steinborn
8995b64dc6 Do not use the GAME_INFO chat type. 2020-10-22 03:02:09 -04:00
Andrew Steinborn
a6e708c98e Fix Adventure sendActionBar implementation and add proper action bar sending for 1.16.2 2020-10-20 14:26:08 -04:00
Andrew Steinborn
e20c37fcba Reintroduce two-packet respawn sequence for older clients 
Fixes #372
 2020-10-15 15:38:51 -04:00
Andrew Steinborn
6e00dbe2b7 Fix compile errors 2020-10-14 16:08:20 -04:00
Andrew Steinborn
cffc6d0a81 Fix Checkstyle error 2020-10-14 13:58:28 -04:00
Riley Park
60e917b4a1
Player has an identity 2020-10-13 22:36:51 -07:00
Andrew Steinborn
59d8bd4c78 Plugins need to be stored in a LinkedHashMap too. 2020-10-11 14:36:56 -04:00
Andrew Steinborn
7fea1c4cb2 Fix modern forwarding if a user connects over IPv6(?!?) 
You don't see this every day...
 2020-10-10 10:58:32 -04:00
Andrew Steinborn
f58b78e896 Fix typo that emitted full responses for basic ones and vice versa 2020-10-08 14:43:34 -04:00
Andrew Steinborn
5072e1085a Revert server list ping changes 
They are broken with ping passthrough.
 2020-10-06 11:05:36 -04:00
Andrew Steinborn
706fea8a3c Fix checkstyle error 2020-10-04 15:31:59 -04:00
Andrew Steinborn
3bf252cf45 Start optimizing server list ping. 2020-10-04 15:30:28 -04:00
Andrew Steinborn
cb74210cd8 Ensure synchronous shutdown if the user kills the process. 2020-10-02 00:23:08 -04:00
Riley Park
cc6546bea9
Update for Adventure changes 2020-09-28 05:36:35 -07:00
Andrew Steinborn
a0a0966f99 Minor code cleanup 2020-09-23 01:02:19 -04:00
Andrew Steinborn
b61321f4f7 Shorten name of DurationUtils#toTicks 2020-09-21 11:27:47 -04:00
Frank van der Heijden
2b6c271cc7
Add ability to check for command alias existence in api module 2020-09-13 19:11:40 +02:00
Andrew Steinborn
7650eedb7a Fix compile error due to yet another breaking change in Adventure 2020-09-10 10:58:00 -04:00
Andrew Steinborn
1dd900194d Share instances of the custom Gson type serializers 2020-09-03 16:04:21 -04:00
Andrew Steinborn
5d287306c2 Small code cleanups 2020-09-01 03:25:15 -04:00
Andrew Steinborn
5a26b4e03d Fix coding error that caused players to time out if moving to another server fails 
Thanks to @Gabik21 for noticing this bug.
 2020-08-30 20:58:15 -04:00
Andrew Steinborn
764c8ed3e5 Fix compile error 
While we're at it, change the newly-introduced shutdown API to use a generic Adventure component instead.
 2020-08-30 07:09:52 -04:00
Andrew Steinborn
fe0d31b0f0 Update comments in MinecraftCompressEncoder to be more accurate. 2020-08-29 19:11:23 -04:00
Andrew Steinborn
d28022ab60 Move connectedServer clearing check to be done later. 2020-08-27 15:24:48 -04:00
Andrew Steinborn
80687c9e1b Redundant word removed 2020-08-25 19:01:57 -04:00
Andrew Steinborn
7df1a9636e Explicitly warn against offline-mode 2020-08-25 19:01:06 -04:00
Andrew Steinborn
ba7cdac812 If a command is defined on the proxy, don't include suggestions from the backend too 2020-08-24 14:53:01 -04:00
Andrew Steinborn
10a14af2ea Include success message too 2020-08-24 14:13:46 -04:00
Andrew Steinborn
6cc173d337 Correctly handle disconnect if there is no opportunity to kick the player to another server. 2020-08-24 14:08:35 -04:00
Andrew Steinborn
01158b08a7 Implement BungeeCord IPOther message. Fixes #361 2020-08-24 10:40:50 -04:00
Andrew Steinborn
6b26daa281 Small cleanup in closeWith 2020-08-22 15:52:29 -04:00
Andrew Steinborn
005c12fb0f Fix build on Java 11 2020-08-22 13:57:13 -04:00
Andrew Steinborn
154b50992c Fix try list giving up after the first server. 2020-08-22 13:36:34 -04:00
Andrew Steinborn
1f621300f6 Revert #338 
This is creating more problems than it actually solves
 2020-08-22 02:40:35 -04:00
Andrew Steinborn
c47d25c88a Upgrade to Gradle 6.6 and use SpotBugs. 
As a result, at least one real bug was fixed! Nice.
 2020-08-21 19:09:04 -04:00
Andrew Steinborn
d8dba436d6 Fix starting the proxy without any config. Fixes #359 2020-08-21 12:42:15 -04:00
Andrew Steinborn
a6ddc137ee Reduce varint reading cost from max(1, 2n) to n+1 operations on ByteBuf 
The previous code, in an attempt to avoid exceptions, checked in.isReadable() each iteration of the loop. This isn't very efficient since it's possible for us to know the maximum size of the varint to read: it's the minimum of either the largest size a varint can be (5 bytes) or the size of the remaining readable bytes in the buffer.
 2020-08-21 01:05:04 -04:00
Andrew Steinborn
ade9deec47 Fix recent PR not loading default messages from config correctly. 2020-08-21 00:10:34 -04:00
Andrew Steinborn
c15a49ce7d
Merge pull request #356 from FrankHeijden/feature/messages 
Make hardcoded messages configurable
 2020-08-20 23:16:11 -04:00
Andrew Steinborn
1d4da8c32d Correctly implement status protocol specification according to vanilla. 2020-08-20 15:03:38 -04:00
Frank van der Heijden
e3fe538491
Create temp default config for getting defaults 2020-08-19 23:30:34 +02:00