PaperMC/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch

30 lines
1.3 KiB
Diff
Raw Normal View History

From af158b963d4d6ed7fd45b5dd918ce3364ec07f7c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 25 Jul 2013 17:06:02 +1000
2013-06-21 09:45:10 +02:00
Subject: [PATCH] Filter Invalid Names
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
2013-09-21 05:39:32 +02:00
index 8f1c214..d83d475 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
2013-09-21 05:39:32 +02:00
@@ -66,13 +66,14 @@ public class PendingConnection extends Connection {
}
}
+ private static final java.util.regex.Pattern validName = java.util.regex.Pattern.compile("^[a-zA-Z0-9_-]{2,16}$"); // Spigot
public void a(Packet2Handshake packet2handshake) {
2013-09-08 00:36:30 +02:00
if (this.g != null) {
2013-09-20 03:46:45 +02:00
this.disconnect("Quit repeating yourself!");
} else {
2013-09-21 05:39:32 +02:00
this.hostname = packet2handshake.c + ':' + packet2handshake.d; // CraftBukkit - initialize field
2013-09-20 03:46:45 +02:00
this.g = packet2handshake.f();
- if (!this.g.equals(StripColor.a(this.g))) {
+ if (!this.g.equals(StripColor.a(this.g)) || !validName.matcher( this.g ).matches() ) { // Spigot
this.disconnect("Invalid username!");
} else {
PublicKey publickey = this.server.H().getPublic();
--
1.8.1.2