Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98 from sgdc3/master

Browse Source 
Add more password error messages
This commit is contained in:
Alexandre Vanhecke
2015-07-06 00:44:34 +02:00
parent 1beab7b40b 79dde2caf3
commit 6bb4788769
24 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
+6 -2
View File
@@ -54,17 +54,21 @@ public class ChangePasswordCommand implements CommandExecutor {
}
String lowpass = args[1].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) || lowpass.equalsIgnoreCase(name)) {
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");
return true;
}
if ((lowpass.equalsIgnoreCase(name))){
m.send(player, "password_error_nick");
return true;
}
if (lowpass.length() < Settings.getPasswordMinLen || lowpass.length() > Settings.passwordMaxLength) {
m.send(player, "pass_len");
return true;
}
if (!Settings.unsafePasswords.isEmpty()) {
if (Settings.unsafePasswords.contains(lowpass)) {
m.send(player, "password_error");
m.send(player, "password_error_unsafe");
return true;
}
}
src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
+7 -2
View File
@@ -52,11 +52,16 @@ public class AsyncronousRegister {
allowRegister = false;
}
else if ((lowpass.equalsIgnoreCase(player.getName()) || 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)) {
else 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");
allowRegister = false;
}
else if ((lowpass.equalsIgnoreCase(player.getName()))) {
m.send(player, "password_error_nick");
allowRegister = false;
}
else if (database.isAuthAvailable(name)) {
m.send(player, "user_regged");
if (plugin.pllog.getStringList("players").contains(name)) {
@@ -126,7 +131,7 @@ public class AsyncronousRegister {
}
if (!Settings.unsafePasswords.isEmpty()) {
if (Settings.unsafePasswords.contains(password.toLowerCase())) {
m.send(player, "password_error");
m.send(player, "password_error_unsafe");
return;
}
}