fixed regex

This commit is contained in:
Steven Lawson 2011-10-05 15:09:02 -04:00
parent 879ecfd279
commit 33f7d9c7b6

View file

@ -34,7 +34,7 @@ public class TelnetListener extends Handler implements CommandSender
MCTelnet parent; MCTelnet parent;
String ip; String ip;
String passRegex = "[^a-zA-Z0-9\\-\\.\\_]"; String passRegex = "[^a-zA-Z0-9\\-\\.\\_]";
String commandRegex = "[^a-zA-Z0-9 \\-\\.\\_\\\"]"; String commandRegex = "[^\\x20-\\x7E§]";
public TelnetListener(Socket inSock, MCTelnet iparent) public TelnetListener(Socket inSock, MCTelnet iparent)
{ {
@ -42,7 +42,7 @@ public class TelnetListener extends Handler implements CommandSender
clientSocket = inSock; clientSocket = inSock;
parent = iparent; parent = iparent;
passRegex = parent.getConfiguration().getString("passwordRegex", passRegex); passRegex = parent.getConfiguration().getString("passwordRegex", passRegex);
commandRegex = parent.getConfiguration().getString("commandRegex", commandRegex); //commandRegex = parent.getConfiguration().getString("commandRegex", commandRegex);
ip = clientSocket.getInetAddress().toString(); ip = clientSocket.getInetAddress().toString();
listenThread = new Thread(new Runnable() listenThread = new Thread(new Runnable()
{ {
@ -170,7 +170,7 @@ public class TelnetListener extends Handler implements CommandSender
while (run && clientSocket.isConnected() && isAuth) while (run && clientSocket.isConnected() && isAuth)
{ {
String command = ""; String command = "";
command = instream.readLine().replaceAll(commandRegex, ""); command = instream.readLine().replaceAll(commandRegex, "").trim();
if (command.equals("exit")) if (command.equals("exit"))
{ {
run = false; run = false;