3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-18 05:50:09 +01:00
Commit graph

1425 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
0b088590a0 Fix license text 2021-10-10 16:39:59 -04:00
Andrew Steinborn
1aaecfff08 Add tests for EventTask#resumeWhenComplete and clarify Javadoc. 2021-10-10 16:37:22 -04:00
Foorcee
08f1b87267
Redirect player without message (#581) 2021-10-09 20:32:04 -04:00
Five (Xer)
4ba4054f23
Snapshot 21w40a 2021-10-09 00:08:51 +02:00
Hugo Manrique
567582b2e2
Fix thread-unsafe command unregistration (#583)
Access to the dispatcher is guarded by `lock`.
2021-10-04 15:17:36 -04:00
Foorcee
aa210b3544
Don't allow illegal characters (#580) 2021-10-03 16:09:29 -04:00
Cubxity
d619bb56fd
feat: added VELOCITY_FORWARDING_SECRET environment variable (#582) 2021-10-03 16:07:45 -04:00
Andrew Steinborn
340e1b23d6 Fix none vhost forwarding with legacy Forge. 2021-09-27 00:37:58 -04:00
Andrew Steinborn
effca0da82 Preserve virtual host the player connected to for modern/none forwarding
This makes these modes in-line with legacy forwarding
2021-09-25 17:51:58 -04:00
sagan
ea07c6661a
Don't crash when attempt servers order is empty, return empty optional instead (#576) 2021-09-15 07:42:14 -04:00
Andrew Steinborn
d1135bd190 Allow the BungeeCord plugin messaging channel to be used by the server at transition time 2021-09-07 07:38:30 -04:00
Joshua Dean Küpper
9e38aec129
fix the order of title packages (#572) 2021-09-01 07:42:44 -04:00
Andrew Steinborn
849e416c8d Fix IPv6 scope issue in legacy forwarding too 2021-09-01 07:14:38 -04:00
Andrew Steinborn
955f6b87e2 Assorted dependency updates 2021-09-01 06:36:00 -04:00
mdxd44
bfe2358386
Fix legacy handshake with hostnames that include IP addresses (#571) 2021-09-01 05:03:49 -04:00
Andrew Steinborn
9a15c7e170 Fix Brigadier command node redirect serialization (#565) 2021-08-24 13:58:13 -04:00
Andrew Steinborn
5303239f66 fix bug 2021-08-21 02:23:29 -04:00
Andrew Steinborn
e6a93ad0c6 Clean up JoinGame packet encoding/decoding
Specifically, the JoinGame packet handling is now split between pre-1.16 encodings of the packet and post-1.16 handlings of the packet. This packet is one of the most amorphous packets in the entire Minecraft protocol, from Velocity's perspective.
2021-08-21 02:17:34 -04:00
Andrew Steinborn
65db0fad6a Fix bug 2021-08-17 13:39:35 -04:00
Andrew Steinborn
6d4cb3b18f Fix TabList population
Bug reported by JakubBien on Discord
2021-08-17 13:30:15 -04:00
Corey Shupe
ec4d2d45a1
Make Mojang Sessionserver Configurable (#560) 2021-08-17 13:14:39 -04:00
Andrew Steinborn
d3ff6f8e33 Make sure to issue a backpressure-solving flush on a future iteration of the event loop
Thanks to @Spottedleaf for finding this issue.
2021-08-04 23:37:27 -04:00
Andrew Steinborn
c32bc88064 Fix not forwarding channelReadComplete events in some cases 2021-08-04 23:01:28 -04:00
Andrew Steinborn
d3e1b358fb Fix repeating "you were kicked from X" message 2021-07-30 15:42:34 -04:00
Andrew Steinborn
211da180b3 Revert 2124b5ec, suspect that event firing may be broken 2021-07-28 13:05:50 -04:00
David Mayr
3d8e9091c0
Custom localization for each player (#537) 2021-07-25 21:50:44 -04:00
Andrew Steinborn
2124b5ec12 Cache all types in EventTypeTracker 2021-07-24 18:30:13 -04:00
Andrew Steinborn
62d234bb26 Improve event system tests
Sleeping in a test is considered bad form. Replace the delay with checks to ensure that threads are spawned appropriately and a new test to ensure that continuation threads do run before other listeners.
2021-07-24 18:15:19 -04:00
Hugo Manrique
76c6827926
Expose registered aliases in API (#549) 2021-07-24 14:34:50 -04:00
Andrew Steinborn
2f82603f65 We don't need the sorted order that a List provides 2021-07-19 13:33:03 -04:00
Andrew Steinborn
349781cff8 Fix licensing stuff 2021-07-19 13:29:33 -04:00
Andrew Steinborn
e017949abf Fix #547 and and #548
The first bug in #548 (and the only issue in #547) was a typo. The second bug was fixed by tracking "friends" of the event types, so we can invalidate everything as needed.
2021-07-19 13:26:37 -04:00
Andrew Steinborn
f79736b8b7 Fix event ordering. 2021-07-12 08:37:26 -04:00
Andrew Steinborn
31aa996623 Minor server-switching code cleanup 2021-07-10 23:36:25 -04:00
Andrew Steinborn
ea577019b8 Don't force-add a tab list entry if it already exists 2021-07-09 10:11:15 -04:00
Andrew Steinborn
0e0a14498f Fix some localization and API issues
Resolves #536
2021-07-08 03:08:02 -04:00
Andrew Steinborn
540d970a4d
Minecraft 1.17.1 support (#530) 2021-07-06 03:32:13 -04:00
Andrew Steinborn
1f7d14f6d1 Checkstyle and friends 2021-06-27 21:18:52 -04:00
Andrew Steinborn
254e8f1a1e Use the "closest" locale from Velocity 2021-06-27 21:15:17 -04:00
Andrew Steinborn
c6ef84eb7f Backport localization support to Velocity 3.0.0 from Polymer 2021-06-27 20:04:43 -04:00
Andrew Steinborn
3b6b73f216 Make announce-player-commands not suggest aliases
Fixes #533
2021-06-24 10:10:34 -04:00
Andrew Steinborn
59ca9a534d Ensure that the in-flight connection is always reset. 2021-06-20 17:36:44 -04:00
Andrew Steinborn
d90952ca3a Fix licensing again 2021-06-14 14:00:35 -04:00
Andrew Steinborn
c979c61155 Add some internal injection points for the benefit of ViaVersion
See #524 for more details
2021-06-14 13:59:56 -04:00
Andrew Steinborn
93724b7b33 Do not emit errors for kicks from servers 2021-06-14 00:04:18 -04:00
Andrew Steinborn
1dfe294b96 Remove GenericArgumentPropertySerializer
This was only used for boolean argument tyoes
2021-06-13 06:55:24 -04:00
Andrew Steinborn
5a337afb00 Include compatible protocol versions in the incompatible version message
Fixes #519
2021-06-13 05:17:09 -04:00
Andrew Steinborn
83dff50bc7
Merge pull request #520 from hugmanrique/feat/3-command-impl-cleanup
[3.0] Command system implementation refactor
2021-06-13 09:12:06 +00:00
Andrew Steinborn
ebd0fcc6b1 Remove unnecessary slicing of uncompressed packets 2021-06-13 04:00:48 -04:00
Andrew Steinborn
c33f9e0466 Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/Player.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-12 20:13:52 -04:00
Andrew Steinborn
c2b82f878b Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/Player.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-12 20:12:31 -04:00
Andrew Steinborn
1b32f56168
Merge pull request #523 from Artuto/dev/1.1.0
Add support for retrieving the Player's client brand
2021-06-12 23:11:41 +00:00
Artuto
f2b20e6398
Remove usage of Optional 2021-06-12 13:48:42 -05:00
lexikiq
72408d5bd8
Remove display name 2021-06-12 12:12:04 -04:00
Andrew Steinborn
b0da4b60c7 Do not check if a plugin message channel is registered before forwarding it
This fixes issues with Servux and probably a crap ton of other bad mods. Purity on this front serves no real purpose than to say we're pedantic.

A future commit may remove all tracking of registered channels altogether. There's strong evidence (back to Minecraft 1.8, at least) that we don't have to track this data and only need to send channels for plugin message channels registered by Velocity itself. This will likely involve more testing to see if this uncovers client bugs with older versions of the game.
2021-06-12 10:30:46 -04:00
Artuto
c8d50f3fdd
Add support for retrieving the Player's client brand 2021-06-11 23:44:51 -05:00
lexikiq
8356b812c3
Cache permission pointers 2021-06-11 23:44:59 -04:00
lexikiq
4003666c27
Cache pointers 2021-06-11 23:32:49 -04:00
lexikiq
19f80bd618
Don't directly implement PermissionChecker 2021-06-11 21:49:40 -04:00
lexikiq
29b409b9f1
Move #pointers to Player
It uses fully API methods so it makes sense to me to use it in Player, open to criticism though
2021-06-11 21:33:15 -04:00
lexikiq
db7e3262a6
Optimize imports 2021-06-11 21:25:51 -04:00
lexikiq
3c4312056b
Switch to #pointers
Ensures that Pointered#getOrDefault[From] works
2021-06-11 21:12:44 -04:00
lexikiq
f59516165f
Rebase onto feature/adventure-pointers 2021-06-11 21:06:59 -04:00
Hugo Manrique
61480544f5
Apply suggested future-related changes
Co-authored-by: A248 <theanandbeh@gmail.com>
2021-06-11 14:03:38 +02:00
Hugo Manrique
f6e6f02a84
Fix checkstyle violations 2021-06-10 20:35:36 +02:00
Hugo Manrique
fb7aafe8ae
Fix Brigadier command alias redirects 2021-06-10 20:25:52 +02:00
Hugo Manrique
b18e78eac7
Add more tests and clean up 2021-06-10 20:00:33 +02:00
Riley Park
f579725002
Provide access to Pointer values 2021-06-10 01:08:27 -07:00
Hugo Manrique
ba34e4729b
Add more suggestion tests 2021-06-09 22:22:15 +02:00
Hugo Manrique
bcb68c8d0f
Test suggestion exception handling 2021-06-09 21:00:17 +02:00
Hugo Manrique
a9d40f3ca3
Fix alias typo in suggestion merge test 2021-06-09 19:15:27 +02:00
Andrew Steinborn
445688b9a1 Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	build.gradle
2021-06-09 01:29:51 -04:00
Andrew Steinborn
e1af30e0fa whoops 2021-06-08 15:42:20 -04:00
Andrew Steinborn
8892e2a5c6 We don't need the hash to go along with the resource pack response 2021-06-08 15:41:54 -04:00
Andrew Steinborn
a65f720f9d Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	build.gradle
2021-06-07 15:32:52 -04:00
Andrew Steinborn
496372d7af Check if the resource pack hash looks like it might be a SHA-1 hash 2021-06-07 15:32:36 -04:00
Hugo Manrique
46b1bee83a
Test suggestions 2021-06-07 15:15:48 +02:00
Hugo Manrique
ea716c15c6
Test CommandManager 2021-06-07 14:36:41 +02:00
Hugo Manrique
d429d8383d
Test execution and injection 2021-06-07 14:13:32 +02:00
A248
6e42f225e2 Bump to Caffeine 3 2021-06-06 08:09:42 -04:00
Andrew Steinborn
ef7aeae4ed Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0 2021-06-06 03:52:03 -04:00
Andrew Steinborn
9d54a03a4b Force SpotBugs to shut up here
This method is indeed called...
2021-06-06 03:51:42 -04:00
Andrew Steinborn
b1b3882fab Merge branch 'Xernium-future/1.17' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-06 03:48:49 -04:00
Hugo Manrique
ff506dfdf8
Add license headers 2021-06-05 23:20:01 +02:00
Hugo Manrique
703b91e0fa
Command implementation refactor 2021-06-05 23:19:01 +02:00
Hugo Manrique
ff504c21ef
Suggestions provider 2021-06-05 18:31:00 +02:00
FivePB
59b29a075e
Improve new Resource-pack API 2021-06-05 16:07:24 +02:00
Andrew Steinborn
7fbfdb2f23
Merge pull request #513 from CoreyShupe/feature/Allow-Raw-Registered-Server-Creation
Initial implementation of raw registered server creation.
2021-06-01 13:12:41 +00:00
CoreyShupe
61c0c0d083 Initial change to allow for server info equality. 2021-06-01 02:17:35 -04:00
CoreyShupe
150808b4b0 Initial implementation of raw registered server creation. 2021-06-01 02:07:06 -04:00
A248
2cfa3f743f Remove Add-Opens from manifest 2021-05-24 12:02:35 -04:00
Andrew Steinborn
64d30fba81 AsyncEventExecutor -> AwaitingEventExecutor 2021-05-23 17:51:07 -04:00
Andrew Steinborn
e14ea36150 We don't rely on kyori/event any more 2021-05-23 15:52:09 -04:00
Seppe Volkaerts
821ca02ee7 Backport Velocity Polymer's async event API, with changes.
This commit backports the event manager from Velocity Polymer, with some changes for Velocity 1.1.x API compatibility:

- All event handlers run asynchronously. (While EventTask.async() exists, it is not useful in 3.0.0, but is provided as a migration aid for Polymer.)
- Event ordering is currently limited to the 5 levels available in Velocity 1.x.x.
2021-05-23 15:39:06 -04:00
Andrew Steinborn
3f50964f36 Fix CommandManager method naming so that it is in sync with the 1.1.0 API 2021-05-23 14:20:59 -04:00
Andrew Steinborn
977300cc66 Remove text 3.x API and associated deprecated APIs 2021-05-23 14:13:51 -04:00
Andrew Steinborn
569bb4a16b Just import the entire command manager from Polymer, without changing any names 2021-05-23 13:58:27 -04:00
Andrew Steinborn
590f18dbe0 Convert to Java 11 compressor 2021-05-23 13:58:01 -04:00
Andrew Steinborn
d6dcb115f1 Remove remaining deprecated APIs 2021-05-23 13:49:06 -04:00
Andrew Steinborn
6816c15385 Remove bad test 2021-05-23 13:47:20 -04:00
Andrew Steinborn
2f0ee15051 Remove deprecated Velocity 1.0.0 Command API. 2021-05-23 13:46:47 -04:00
FivePB
18466bb595
Snapshot 21w19a 2021-05-13 23:50:00 +02:00
FivePB
8def411b2b
Snapshot 21w15a 2021-05-13 23:49:55 +02:00
Five (Xer)
581303a54c
Snaphot 21w10a 2021-05-12 21:42:27 +02:00
Five (Xer)
6207647aae
Remove leftovers 2021-05-12 21:42:27 +02:00
Five (Xer)
22bc759044
Snapshot 21w08a 2021-05-12 21:42:27 +02:00
Five (Xer)
b19cf16345
Snapshot 21w07a 2021-05-12 21:42:27 +02:00
FivePB
f0d9a445ed
Snapshot 21w03a 2021-05-12 21:42:27 +02:00
Five (Xer)
040cc29c34
Snapshot 20w49a 2021-05-12 21:42:27 +02:00
Five (Xer)
d8a39fc438
Snapshot 20w46a 2021-05-12 21:42:27 +02:00
Five (Xer)
7f0964155c
Snapshot 20w45a 2021-05-12 21:42:27 +02:00
Andrew Steinborn
11ed4b46e4 whoops 2021-05-09 02:57:52 -04:00
Andrew Steinborn
5170da8fd7 Improve writeVarInt inlining by peeling the two most common cases 2021-05-09 02:57:01 -04:00
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
015693090f Fix typo (thanks zml) 2021-03-21 16:17:41 -04:00
Andrew Steinborn
da54a091fb Allow the java.lang module to be opened, as a temporary Java 15+ workaround 2021-03-21 16:16:19 -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
1a768bda9d We're going to need custom hash maps after all. 2021-02-16 01:15:58 -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
Andrew Steinborn
4f5c315ef8 Remove netty-resolver-dns dependency
Geyser has fixed the issue in the latest builds
2020-12-14 04:29:28 -05:00
Andrew Steinborn
991aaa31b1 Revert "Stop bundling the Netty DNS resolver, we don't use it"
This reverts commit 88a57b77df.

Breaks Geyser
2020-12-13 18:47:47 -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
88a57b77df Stop bundling the Netty DNS resolver, we don't use it 2020-12-10 06:56:19 -05:00
Andrew Steinborn
aef0e4a825 Update Netty to 4.1.55.Final. 2020-12-09 22:25:06 -05: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
89e1a07448 Try and explicitly specify Java 8 in the modules. 2020-11-06 18:52:00 -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
derklaro
fae1ee8373
Track some dependency updates
junit: 5.3.0-M1 -> 5.7.0
slf4j: 1.7.25 -> 1.7.30
netty: 4.1.51.Final -> 4.1.52.Final
guava: 25.1-jre -> 29.0-jre
checkerFramework: 2.7.0 -> 3.6.1
jline-terminal-jansi: 3.12.1 -> 3.16.0
fastutil: 8.2.3 -> 8.4.1
async-http-client: 2.10.4 -> 2.12.1
completable-futures: 0.3.2 -> 0.3.3
gradle-wrapper: 6.6 -> 6.6.1

BREAKING CHANGE: No breaking change
2020-09-15 13:27:16 +02: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
Frank van der Heijden
62fac7db32
Merge branch 'dev/1.1.0' into feature/messages 2020-08-19 22:17:15 +02:00
Frank van der Heijden
4c5c641e5f
Fix adventure title times 2020-08-19 20:44:58 +02:00
Frank van der Heijden
3711d56e8c
Move VelocityMessages into config.toml 2020-08-19 20:42:22 +02:00
Frank van der Heijden
9e27dac557
Add configurable messages for disconnect and kick prefix 2020-08-18 23:52:13 +02:00
Andrew Steinborn
26f3cb43c7 Clean up some Adventure support code, implement another sendMessage overload 2020-08-16 14:02:04 -04:00
kashike
5623baf1e7 Use getBoolean/putBoolean, and fix using the wrong field for respawn_anchor_works 2020-08-16 04:13:10 -07:00
Andrew Steinborn
1717d7f9b4 Add SimpleCommand.Invocation#alias function.
It seems like this ability is generally useful outside RawCommand, so let's add this to SimpleCommand too.
2020-08-15 16:41:35 -04:00
Andrew Steinborn
7dffa7ce33 Fix tab complete for proxy commands for 1.12.2 and below and fix command tab complete repeating suggestions 2020-08-11 14:19:00 -04:00
Andrew Steinborn
c88a3807e7 Checkstyle strikes again! 2020-08-11 13:26:00 -04:00
Andrew Steinborn
d363d80a83 Use simplified form for new empty argument types 2020-08-11 13:25:02 -04:00
Andrew Steinborn
717f2a070d Remove any use of the word "dummy" 2020-08-11 13:24:11 -04:00
Andrew Steinborn
c0af5668b9
Merge pull request #338 from xxDark/read-timeout
Make initial read timeout configurable
2020-08-10 23:05:52 -04:00
Andrew Steinborn
24ca6156ac Add missing DimensionData field 2020-08-07 14:30:33 -04:00
Andrew Steinborn
9d36f9094d Fall back to wrapping the name in a component. Should fix #349 for real. 2020-08-07 07:19:22 -04:00
Andrew Steinborn
46e34ddb7f Allow serializing legacy hover events
Should fix #349
2020-08-06 20:53:19 -04:00
Andrew Steinborn
cab6919a46 Switch to adventure-nbt and fix server switching on 1.16.2-pre3 2020-08-06 17:38:52 -04:00
Andrew Steinborn
cb4555fa70 Merge branch 'dev/1.1.0' into future/1.16.2-velocity-1.1.0 2020-08-06 17:37:10 -04:00
Andrew Steinborn
5cceebdffc Read PlayerListItem display names according to the protocol version.
Fixes #349
2020-08-06 15:13:22 -04:00
Andrew Steinborn
b34b198064 1.16.2-pre3 2020-08-06 15:08:50 -04:00
Andrew Steinborn
6cec09974a Properly fix debug logging 2020-08-06 11:09:11 -04:00
Andrew Steinborn
b2d9e11217 Fix packet decode logging not giving useful errors
See #349 for context
2020-08-06 07:42:42 -04:00
Andrew Steinborn
d79c1d0407 Port of #325 for Velocity 1.1.0
Co-authored-by: Five (Xer) <admin@xernium.com>
2020-08-05 18:13:16 -04:00
Andrew Steinborn
3beaeb2df7
Merge pull request #341 from alexstaeding/feature/shutdown-api
Add shutdown methods to ProxyServer
2020-08-05 11:35:38 -04:00
Ivan Pekov
bb4bff7d34
Respect nodes' requirements (#350) 2020-08-05 11:33:03 -04:00
Jacob Allen
76173e4145
Add PRE_SERVER_JOIN to DisconnectEvent#LoginStatus (#346) 2020-08-04 16:30:17 -04:00
Andrew Steinborn
87bff1a123 Remove nextProtocolVersion from MinecraftConnection
ViaVersion was the only intended user. However, ViaVersion for Velocity 1.1.0 no longer uses this functionality, and so it doesn't make sense to keep it in Velocity 1.1.0.
2020-08-04 12:14:28 -04:00
Andrew Steinborn
e57c6d00c0 Move AutoReadHolderHandler after MinecraftDecoder. 2020-08-04 11:57:23 -04:00
Andrew Steinborn
2a04932112 Fix typo in register() where the primary alias would be unregistered if other aliases were specified. 2020-08-03 08:07:42 -04:00