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

29 lines
1.2 KiB
Diff
Raw Normal View History

2013-09-20 01:46:45 +00:00
From 1df832542a0945bd61df1795a36fb891a537d31c 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 07:45:10 +00: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-20 01:46:45 +00:00
index 9080831..3be39d7 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
2013-09-20 01:46:45 +00:00
@@ -66,12 +66,13 @@ 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-07 22:36:30 +00:00
if (this.g != null) {
2013-09-20 01:46:45 +00:00
this.disconnect("Quit repeating yourself!");
} else {
2013-09-20 01:46:45 +00: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