Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-24 03:05:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from Maxetto/master

Browse Source 
Up
This commit is contained in:
Gabriele C. 2015-07-11 17:09:31 +02:00
commit c54ee31c9c
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/fr/xephi/authme/commands/AdminCommand.java
View File

@ -168,8 +168,9 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage: /authme lastlogin <playername>"); sender.sendMessage("Usage: /authme lastlogin <playername>");
return true; return true;
} }
PlayerAuth auth = null;
try { try {
PlayerAuth auth = plugin.database.getAuth(args[1].toLowerCase()); auth = plugin.database.getAuth(args[1].toLowerCase());
} catch (NullPointerException e) { } catch (NullPointerException e) {
m.send(sender, "unknown_user"); m.send(sender, "unknown_user");
return true; return true;
@ -193,6 +194,8 @@ public class AdminCommand implements CommandExecutor {
return true; return true;
} }
if (!args[1].contains(".")) { if (!args[1].contains(".")) {
final CommandSender fSender = sender;
final String[] arguments = args;
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override @Override
@ -200,23 +203,23 @@ public class AdminCommand implements CommandExecutor {
PlayerAuth auth = null; PlayerAuth auth = null;
String message = "[AuthMe] "; String message = "[AuthMe] ";
try { try {
auth = plugin.database.getAuth(args[1].toLowerCase()); auth = plugin.database.getAuth(arguments[1].toLowerCase());
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
m.send(sender, "unknown_user"); m.send(fSender, "unknown_user");
return true; return;
} }
if (auth == null) { if (auth == null) {
m.send(sender, "unknown_user"); m.send(fSender, "unknown_user");
return true; return;
} }
List<String> accountList = plugin.database.getAllAuthsByName(auth); List<String> accountList = plugin.database.getAllAuthsByName(auth);
if (accountList.isEmpty() || accountList == null) { if (accountList.isEmpty() || accountList == null) {
m.send(sender, "user_unknown"); m.send(fSender, "user_unknown");
return true; return;
} }
if (accountList.size() == 1) { if (accountList.size() == 1) {
sender.sendMessage("[AuthMe] " + args[1] + " is a single account player"); fSender.sendMessage("[AuthMe] " + arguments[1] + " is a single account player");
return true; return;
} }
int i = 0; int i = 0;
for (String account : accountList) { for (String account : accountList) {
@ -228,29 +231,31 @@ public class AdminCommand implements CommandExecutor {
message = message + "."; message = message + ".";
} }
} }
sender.sendMessage("[AuthMe] " + args[1] + " has " + String.valueOf(accountList.size()) + " accounts"); fSender.sendMessage("[AuthMe] " + arguments[1] + " has " + String.valueOf(accountList.size()) + " accounts");
sender.sendMessage(message); fSender.sendMessage(message);
} }
}); });
return true; return true;
} else { } else {
final CommandSender fSender = sender;
final String[] arguments = args;
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
String message = "[AuthMe] "; String message = "[AuthMe] ";
if (args[1] == null) { if (arguments[1] == null) {
sender.sendMessage("[AuthMe] Please put a valid IP"); fSender.sendMessage("[AuthMe] Please put a valid IP");
return true; return;
} }
List<String> accountList = plugin.database.getAllAuthsByIp(args[1]); List<String> accountList = plugin.database.getAllAuthsByIp(arguments[1]);
if (accountList.isEmpty() || accountList == null) { if (accountList.isEmpty() || accountList == null) {
sender.sendMessage("[AuthMe] This IP does not exist in the database"); fSender.sendMessage("[AuthMe] This IP does not exist in the database");
return true; return;
} }
if (accountList.size() == 1) { if (accountList.size() == 1) {
sender.sendMessage("[AuthMe] " + args[1] + " is a single account player"); fSender.sendMessage("[AuthMe] " + arguments[1] + " is a single account player");
return true; return;
} }
int i = 0; int i = 0;
for (String account : accountList) { for (String account : accountList) {
@ -262,8 +267,8 @@ public class AdminCommand implements CommandExecutor {
message = message + "."; message = message + ".";
} }
} }
sender.sendMessage("[AuthMe] " + args[1] + " has " + String.valueOf(accountList.size()) + " accounts"); fSender.sendMessage("[AuthMe] " + arguments[1] + " has " + String.valueOf(accountList.size()) + " accounts");
sender.sendMessage(message); fSender.sendMessage(message);
} }
}); });
return true; return true;
@ -276,20 +281,20 @@ public class AdminCommand implements CommandExecutor {
} }
String lowpass = args[2].toLowerCase(); String lowpass = args[2].toLowerCase();
if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) { if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) {
m.send(player, "password_error"); m.send(sender, "password_error");
return true; return true;
} }
if (lowpass.equalsIgnoreCase(args[1])) { if (lowpass.equalsIgnoreCase(args[1])) {
m.send(player, "password_error_nick"); m.send(sender, "password_error_nick");
return true; return true;
} }
if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) { if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) {
m.send(player, "pass_len"); m.send(sender, "pass_len");
return true; return true;
} }
if (!Settings.unsafePasswords.isEmpty()) { if (!Settings.unsafePasswords.isEmpty()) {
if (Settings.unsafePasswords.contains(lowpass)) { if (Settings.unsafePasswords.contains(lowpass)) {
m.send(player, "password_error_unsafe"); m.send(sender, "password_error_unsafe");
return true; return true;
} }
} }
@ -326,7 +331,7 @@ public class AdminCommand implements CommandExecutor {
m.send(sender, "unknown_user"); m.send(sender, "unknown_user");
return true; return true;
} }
sender.sendMessage("[AuthMe] " + args[1] + "'s email: " + getAuth.getEmail()); sender.sendMessage("[AuthMe] " + args[1] + "'s email: " + auth.getEmail());
return true; return true;
} else if (args[0].equalsIgnoreCase("chgemail")) { } else if (args[0].equalsIgnoreCase("chgemail")) {
if (args.length != 3) { if (args.length != 3) {
@ -334,7 +339,7 @@ public class AdminCommand implements CommandExecutor {
return true; return true;
} }
if (!Settings.isEmailCorrect(args[2])) { if (!Settings.isEmailCorrect(args[2])) {
m.send(player, "email_invalid"); m.send(sender, "email_invalid");
return true; return true;
} }
String playername = args[1].toLowerCase(); String playername = args[1].toLowerCase();
@ -429,20 +434,20 @@ public class AdminCommand implements CommandExecutor {
} }
String lowpass = args[2].toLowerCase(); String lowpass = args[2].toLowerCase();
if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) { if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) {
m.send(player, "password_error"); m.send(sender, "password_error");
return true; return true;
} }
if (lowpass.equalsIgnoreCase(args[1])) { if (lowpass.equalsIgnoreCase(args[1])) {
m.send(player, "password_error_nick"); m.send(sender, "password_error_nick");
return true; return true;
} }
if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) { if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) {
m.send(player, "pass_len"); m.send(sender, "pass_len");
return true; return true;
} }
if (!Settings.unsafePasswords.isEmpty()) { if (!Settings.unsafePasswords.isEmpty()) {
if (Settings.unsafePasswords.contains(lowpass)) { if (Settings.unsafePasswords.contains(lowpass)) {
m.send(player, "password_error_unsafe"); m.send(sender, "password_error_unsafe");
return true; return true;
} }
} }