Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Steinborn 65608bb360 Bump Gson version 2021-06-06 04:22:08 -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
Andrew SteinbornandGitHub f4550c3a37 Merge pull request #515 from hugmanrique/dev-3/command-api-changes
[3.0] Document some restrictions in the command API
2021-06-05 18:27:18 +00:00
Andrew SteinbornandGitHub 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
Andrew SteinbornandGitHub dffbaba716 Merge pull request #514 from CoreyShupe/feature/CheckServerInfoEquality
Initial change to allow for server info equality.
2021-06-01 13:05:43 +00:00
Andrew SteinbornandGitHub 04db382a18 Merge pull request #507 from A248/remove-add-opens
Remove Add-Opens from manifest
2021-05-24 13:03:14 -04:00
Andrew Steinborn 64d30fba81 AsyncEventExecutor -> AwaitingEventExecutor 2021-05-23 17:51:07 -04:00
Andrew Steinborn 51f923bf2d Fix Java 11 Javadoc URL 2021-05-23 17:21:44 -04:00
Andrew Steinborn b9823085af Update Guice to 5.0.1
This (aside from removal of deprecated methods) is the only notable API break in Velocity 3.0.0.
2021-05-23 17:20:52 -04:00
Andrew Steinborn e14ea36150 We don't rely on kyori/event any more 2021-05-23 15:52:09 -04:00
Andrew Steinborn 3944eec491 Add async parameter to @Subscribe, also as a migration aid. 2021-05-23 15:42:17 -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 b632431ae9 don't build on Java 8 2021-05-23 14:15:22 -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 59f358441a Bump Velocity to Java 11 minimum
Fixes #381. There is generally a consensus that we should move forward with this. We do not anticipate a Velocity 2.0.0 release until well after the release of the next Java LTS version (Java 17).

This commit doesn't clean up anything for the new Java version yet.
2021-05-23 13:50:14 -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
Andrew Steinborn cceeeb3490 Velocity 3.0.0-SNAPSHOT 2021-05-19 16:11:40 -04:00
Andrew SteinbornandGitHub 06ecab2627 Merge pull request #493 from VelocityPowered/feature/combine-varint-prefix-with-compression
Further packet handling performance improvements
2021-05-09 03:07:44 -04: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
Andrew SteinbornandGitHub 0a4e226571 Merge pull request #492 from Leymooo/feature/combine-varint-prefix-with-compression
Do not copy memory in case when packet needs to compress
2021-05-08 17:01:56 -04:00
Andrew Steinborn 9318fe3dca Update link to Adventure documentation 2021-05-06 21:08:57 -04: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 3d9a166892 Fix Checkstyle 2021-05-06 16:46:43 -04:00
Andrew Steinborn 3fdacd30d1 Explain why Player#sendPluginMessage may not do what some people think it ought to do 2021-05-06 16:43:45 -04:00
Andrew SteinbornandGitHub bbc53da87e Create FUNDING.yml 2021-05-06 16:10:56 -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
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
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 d7435fcbb6 Velocity 1.1.6-SNAPSHOT 2021-04-22 11:28:49 -04:00
Andrew Steinborn 92865b0307 Velocity 1.1.5 2021-04-22 11:23:57 -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
Andrew SteinbornandGitHub be21ac5a30 [ci-skip] Update license in README 2021-03-31 20:36:08 -04:00
Andrew SteinbornandGitHub 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
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 4206457fbc Bump Adventure to 4.6.0 2021-03-02 12:33:47 -05:00
Andrew Steinborn 72d47b5a3d Don't advertise the BungeeCord plugin messaging channel if it is disabled. 2021-02-18 18:12:51 -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
Andrew Steinborn 2a8a982538 Velocity 1.1.5-SNAPSHOT 2021-02-13 18:08:50 -05:00
Andrew Steinborn d1229ddca8 Velocity 1.1.4 2021-02-13 18:06:26 -05:00
Andrew Steinborn ae6f2cba2a Bump to Adventure 4.5.0 2021-02-13 18:02:09 -05:00
Andrew SteinbornandGitHub 27ccb9d387 Merge pull request #421 from Bastian/bstats-update
Update bStats and migrate to new config file
2021-02-13 02:04:43 -05:00
Andrew Steinborn 3aee47166f Allow clearing favicon in ServerPing builder. 2021-02-09 14:36:16 -05:00
Andrew SteinbornandGitHub 55cc416b52 Merge pull request #428 from Camotoy/registerevent
Add PlayerRegisterChannelEvent
2021-02-09 14:26:34 -05:00
Andrew Steinborn a6a9d1e0fb Forward slashes are allowed in channel IDs
Fixes an issue where the Fabric registry sync packet would not be allowed by Velocity.
2021-02-09 14:25:12 -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 SteinbornandGitHub 77656615bb Fix job name 2021-01-26 19:56:17 -05:00
Andrew SteinbornandGitHub db959b6051 Add GitHub Actions to replace Travis 2021-01-26 19:55:26 -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 SteinbornandGitHub 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
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 SteinbornandGitHub a2a799a8a7 Update CONTRIBUTING.md 2021-01-22 19:50:31 -05:00
Andrew SteinbornandGitHub 13ee59d20b Update CONTRIBUTING.md 2021-01-22 19:49:38 -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 0fa61216e7 Bump to Adventure 4.4.0 2021-01-19 02:40:32 -05:00
Andrew Steinborn 919319438d Bump Netty version to 4.1.58.Final 2021-01-17 00:43:35 -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