mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
Add handshake event to allow plugins to handle client handshaking logic themselves
This commit is contained in:
kashike
parent
0084b02703
commit
66d3688b39
@ -0,0 +1,227 @@
|
|||||||
|
From b83384a668c8df232f4c3a7174ea16dfa704617f Mon Sep 17 00:00:00 2001
|
||||||
|
From: kashike <kashike@vq.lc>
|
||||||
|
Date: Wed, 13 Apr 2016 20:20:18 -0700
|
||||||
|
Subject: [PATCH] Add handshake event to allow plugins to handle client
|
||||||
|
handshaking logic themselves
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..e44d03a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
|
||||||
|
@@ -0,0 +1,211 @@
|
||||||
|
+package com.destroystokyo.paper.event.player;
|
||||||
|
+
|
||||||
|
+import org.apache.commons.lang.Validate;
|
||||||
|
+import org.bukkit.event.Cancellable;
|
||||||
|
+import org.bukkit.event.Event;
|
||||||
|
+import org.bukkit.event.HandlerList;
|
||||||
|
+
|
||||||
|
+import java.util.UUID;
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * This event is fired during a player handshake.
|
||||||
|
+ *
|
||||||
|
+ * <p>If there are no listeners listening to this event, the logic default
|
||||||
|
+ * to your server platform will be ran.</p>
|
||||||
|
+ *
|
||||||
|
+ * <p>WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS</p>
|
||||||
|
+ */
|
||||||
|
+public class PlayerHandshakeEvent extends Event implements Cancellable {
|
||||||
|
+
|
||||||
|
+ private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
+ private final String originalHandshake;
|
||||||
|
+ private boolean cancelled;
|
||||||
|
+ private String serverHostname;
|
||||||
|
+ private String socketAddressHostname;
|
||||||
|
+ private UUID uniqueId;
|
||||||
|
+ private String propertiesJson;
|
||||||
|
+ private boolean failed;
|
||||||
|
+ private String failMessage = "If you wish to use IP forwarding, please enable it in your BungeeCord config as well!";
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Creates a new {@link PlayerHandshakeEvent}.
|
||||||
|
+ *
|
||||||
|
+ * @param originalHandshake the original handshake string
|
||||||
|
+ * @param cancelled if this event is enabled
|
||||||
|
+ */
|
||||||
|
+ public PlayerHandshakeEvent(String originalHandshake, boolean cancelled) {
|
||||||
|
+ this.originalHandshake = originalHandshake;
|
||||||
|
+ this.cancelled = cancelled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Determines if this event is cancelled.
|
||||||
|
+ *
|
||||||
|
+ * <p>When this event is cancelled, custom handshake logic will not
|
||||||
|
+ * be processed.</p>
|
||||||
|
+ *
|
||||||
|
+ * @return {@code true} if this event is cancelled, {@code false} otherwise
|
||||||
|
+ */
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isCancelled() {
|
||||||
|
+ return this.cancelled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets if this event is cancelled.
|
||||||
|
+ *
|
||||||
|
+ * <p>When this event is cancelled, custom handshake logic will not
|
||||||
|
+ * be processed.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param cancelled {@code true} if this event is cancelled, {@code false} otherwise
|
||||||
|
+ */
|
||||||
|
+ @Override
|
||||||
|
+ public void setCancelled(boolean cancelled) {
|
||||||
|
+ this.cancelled = cancelled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the original handshake string.
|
||||||
|
+ *
|
||||||
|
+ * @return the original handshake string
|
||||||
|
+ */
|
||||||
|
+ public String getOriginalHandshake() {
|
||||||
|
+ return this.originalHandshake;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the server hostname string.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should not include the port.</p>
|
||||||
|
+ *
|
||||||
|
+ * @return the server hostname string
|
||||||
|
+ */
|
||||||
|
+ public String getServerHostname() {
|
||||||
|
+ return this.serverHostname;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the server hostname string.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should not include the port.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param serverHostname the server hostname string
|
||||||
|
+ */
|
||||||
|
+ public void setServerHostname(String serverHostname) {
|
||||||
|
+ this.serverHostname = serverHostname;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the socket address hostname string.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should not include the port.</p>
|
||||||
|
+ *
|
||||||
|
+ * @return the socket address hostname string
|
||||||
|
+ */
|
||||||
|
+ public String getSocketAddressHostname() {
|
||||||
|
+ return this.socketAddressHostname;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the socket address hostname string.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should not include the port.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param socketAddressHostname the socket address hostname string
|
||||||
|
+ */
|
||||||
|
+ public void setSocketAddressHostname(String socketAddressHostname) {
|
||||||
|
+ this.socketAddressHostname = socketAddressHostname;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the unique id.
|
||||||
|
+ *
|
||||||
|
+ * @return the unique id
|
||||||
|
+ */
|
||||||
|
+ public UUID getUniqueId() {
|
||||||
|
+ return this.uniqueId;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the unique id.
|
||||||
|
+ *
|
||||||
|
+ * @param uniqueId the unique id
|
||||||
|
+ */
|
||||||
|
+ public void setUniqueId(UUID uniqueId) {
|
||||||
|
+ this.uniqueId = uniqueId;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the profile properties.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should be a valid JSON string.</p>
|
||||||
|
+ *
|
||||||
|
+ * @return the profile properties, as JSON
|
||||||
|
+ */
|
||||||
|
+ public String getPropertiesJson() {
|
||||||
|
+ return this.propertiesJson;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Determines if authentication failed.
|
||||||
|
+ *
|
||||||
|
+ * <p>When {@code true}, the client connecting will be disconnected
|
||||||
|
+ * with the {@link #getFailMessage() fail message}.</p>
|
||||||
|
+ *
|
||||||
|
+ * @return {@code true} if authentication failed, {@code false} otherwise
|
||||||
|
+ */
|
||||||
|
+ public boolean isFailed() {
|
||||||
|
+ return this.failed;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets if authentication failed and the client should be disconnected.
|
||||||
|
+ *
|
||||||
|
+ * <p>When {@code true}, the client connecting will be disconnected
|
||||||
|
+ * with the {@link #getFailMessage() fail message}.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param failed {@code true} if authentication failed, {@code false} otherwise
|
||||||
|
+ */
|
||||||
|
+ public void setFailed(boolean failed) {
|
||||||
|
+ this.failed = failed;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the profile properties.
|
||||||
|
+ *
|
||||||
|
+ * <p>This should be a valid JSON string.</p>
|
||||||
|
+ *
|
||||||
|
+ * @param propertiesJson the profile properties, as JSON
|
||||||
|
+ */
|
||||||
|
+ public void setPropertiesJson(String propertiesJson) {
|
||||||
|
+ this.propertiesJson = propertiesJson;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the message to display to the client when authentication fails.
|
||||||
|
+ *
|
||||||
|
+ * @return the message to display to the client
|
||||||
|
+ */
|
||||||
|
+ public String getFailMessage() {
|
||||||
|
+ return this.failMessage;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the message to display to the client when authentication fails.
|
||||||
|
+ *
|
||||||
|
+ * @param failMessage the message to display to the client
|
||||||
|
+ */
|
||||||
|
+ public void setFailMessage(String failMessage) {
|
||||||
|
+ Validate.notEmpty(failMessage, "fail message cannot be null or empty");
|
||||||
|
+ this.failMessage = failMessage;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public HandlerList getHandlers() {
|
||||||
|
+ return HANDLERS;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static HandlerList getHandlerList() {
|
||||||
|
+ return HANDLERS;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From 838f52d11032d2a8ae0d3d6a7032fff0b7d58a0b Mon Sep 17 00:00:00 2001
|
||||||
|
From: kashike <kashike@vq.lc>
|
||||||
|
Date: Wed, 13 Apr 2016 20:21:38 -0700
|
||||||
|
Subject: [PATCH] Add handshake event to allow plugins to handle client
|
||||||
|
handshaking logic themselves
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
|
index 5f8d853..4d496fd 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
|
@@ -73,8 +73,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
||||||
|
this.b.close(chatcomponenttext);
|
||||||
|
} else {
|
||||||
|
this.b.setPacketListener(new LoginListener(this.a, this.b));
|
||||||
|
+ // Paper start - handshake event
|
||||||
|
+ boolean proxyLogicEnabled = org.spigotmc.SpigotConfig.bungee;
|
||||||
|
+ boolean handledByEvent = false;
|
||||||
|
+ // Try and handle the handshake through the event
|
||||||
|
+ if (com.destroystokyo.paper.event.player.PlayerHandshakeEvent.getHandlerList().getRegisteredListeners().length != 0) { // Hello? Can you hear me?
|
||||||
|
+ com.destroystokyo.paper.event.player.PlayerHandshakeEvent event = new com.destroystokyo.paper.event.player.PlayerHandshakeEvent(packethandshakinginsetprotocol.hostname, !proxyLogicEnabled);
|
||||||
|
+ if (event.callEvent()) {
|
||||||
|
+ // If we've failed somehow, let the client know so and go no further.
|
||||||
|
+ if (event.isFailed()) {
|
||||||
|
+ chatcomponenttext = new ChatComponentText(event.getFailMessage());
|
||||||
|
+ this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext));
|
||||||
|
+ this.b.close(chatcomponenttext);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ packethandshakinginsetprotocol.hostname = event.getServerHostname();
|
||||||
|
+ this.b.l = new java.net.InetSocketAddress(event.getSocketAddressHostname(), ((java.net.InetSocketAddress) this.b.getSocketAddress()).getPort());
|
||||||
|
+ this.b.spoofedUUID = event.getUniqueId();
|
||||||
|
+ this.b.spoofedProfile = gson.fromJson(event.getPropertiesJson(), com.mojang.authlib.properties.Property[].class);
|
||||||
|
+ handledByEvent = true; // Hooray, we did it!
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Don't try and handle default logic if it's been handled by the event.
|
||||||
|
+ if (!handledByEvent && proxyLogicEnabled) {
|
||||||
|
+ // Paper end
|
||||||
|
// Spigot Start
|
||||||
|
- if (org.spigotmc.SpigotConfig.bungee) {
|
||||||
|
+ //if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
|
||||||
|
String[] split = packethandshakinginsetprotocol.hostname.split("\00");
|
||||||
|
if ( split.length == 3 || split.length == 4 ) {
|
||||||
|
packethandshakinginsetprotocol.hostname = split[0];
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user