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

update email commands to use new async process

Browse Source
This commit is contained in:
DNx5 2015-11-03 14:41:05 +07:00
parent 4eb94787ac
commit 375162ab67
6 changed files with 37 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
View File

@ -1,25 +1,20 @@
package fr.xephi.authme.command.executable.email; package fr.xephi.authme.command.executable.email;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.command.CommandParts; import fr.xephi.authme.command.CommandParts;
import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.command.ExecutableCommand;
import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class AddEmailCommand extends ExecutableCommand { public class AddEmailCommand extends ExecutableCommand {
/** /**
* Execute the command. * Execute the command.
* *
* @param sender The command sender. * @param sender The command sender.
* @param commandReference The command reference. * @param commandReference The command reference.
* @param commandArguments The command arguments. * @param commandArguments The command arguments.
*
* @return True if the command was executed successfully, false otherwise. * @return True if the command was executed successfully, false otherwise.
*/ */
@Override @Override
@ -35,57 +30,16 @@ public class AddEmailCommand extends ExecutableCommand {
String playerMailVerify = commandArguments.get(1); String playerMailVerify = commandArguments.get(1);
// Make sure the current command executor is a player // Make sure the current command executor is a player
if(!(sender instanceof Player)) { if (!(sender instanceof Player)) {
return true; return true;
} }
// Get the player instance and name // Get the player instance and name
final Player player = (Player) sender; final Player player = (Player) sender;
final String playerName = player.getName(); final String playerName = player.getName().toLowerCase();
// Command logic // Command logic
if (Settings.getmaxRegPerEmail > 0) { plugin.management.performAddEmail(player, playerMail, playerMailVerify);
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMail).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
}
if (playerMail.equals(playerMailVerify) && PlayerCache.getInstance().isAuthenticated(playerName)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
m.send(player, "usage_email_change");
return true;
}
if (!Settings.isEmailCorrect(playerMail)) {
m.send(player, "email_invalid");
return true;
}
auth.setEmail(playerMail);
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m.send(player, "email_added");
player.sendMessage(auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
m.send(player, "email_confirm");
} else {
if (!plugin.database.isAuthAvailable(playerName)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
}
}
return true; return true;
} }
} }

54
src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
View File

@ -1,18 +1,12 @@
package fr.xephi.authme.command.executable.email; package fr.xephi.authme.command.executable.email;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.command.CommandParts; import fr.xephi.authme.command.CommandParts;
import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.command.ExecutableCommand;
import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Arrays;
public class ChangeEmailCommand extends ExecutableCommand { public class ChangeEmailCommand extends ExecutableCommand {
/** /**
@ -45,51 +39,7 @@ public class ChangeEmailCommand extends ExecutableCommand {
final String playerName = player.getName(); final String playerName = player.getName();
// Command logic // Command logic
plugin.management.performChangeEmail(player, playerMailOld, playerMailNew);
try { return true;
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMailNew).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
}
if (PlayerCache.getInstance().isAuthenticated(playerName)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
m.send(player, "usage_email_add");
return true;
}
if (!playerMailOld.equals(auth.getEmail())) {
m.send(player, "old_email_invalid");
return true;
}
if (!Settings.isEmailCorrect(playerMailNew)) {
m.send(player, "new_email_invalid");
return true;
}
auth.setEmail(playerMailNew);
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m.send(player, "email_changed");
player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
m.send(player, "email_confirm");
} else {
if (!plugin.database.isAuthAvailable(playerName)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
}
}
return true;
} catch (Exception e) {
ConsoleLogger.showError(e.getMessage());
ConsoleLogger.writeStackTrace(e);
m.send(sender, "error");
return false;
}
} }
} }

91
src/main/java/fr/xephi/authme/commands/EmailCommand.java
View File

@ -1,13 +1,5 @@
package fr.xephi.authme.commands; package fr.xephi.authme.commands;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerAuth;
@ -16,9 +8,14 @@ import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.security.RandomString; import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.security.NoSuchAlgorithmException;
/** /**
*
* @author Xephi59 * @author Xephi59
*/ */
public class EmailCommand implements CommandExecutor { public class EmailCommand implements CommandExecutor {
@ -32,7 +29,7 @@ public class EmailCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command cmnd, String label, public boolean onCommand(CommandSender sender, Command cmnd, String label,
String[] args) { String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
return true; return true;
} }
@ -57,81 +54,13 @@ public class EmailCommand implements CommandExecutor {
m.send(player, "usage_email_add"); m.send(player, "usage_email_add");
return true; return true;
} }
if (Settings.getmaxRegPerEmail > 0) { plugin.management.performAddEmail(player, args[1], args[2]);
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
}
if (args[1].equals(args[2]) && PlayerCache.getInstance().isAuthenticated(name)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
m.send(player, "usage_email_change");
return true;
}
if (!Settings.isEmailCorrect(args[1])) {
m.send(player, "email_invalid");
return true;
}
auth.setEmail(args[1]);
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m.send(player, "email_added");
player.sendMessage(auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "email_confirm");
} else {
if (!plugin.database.isAuthAvailable(name)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
}
}
} else if (args[0].equalsIgnoreCase("change")) { } else if (args[0].equalsIgnoreCase("change")) {
if (args.length != 3) { if (args.length != 3) {
m.send(player, "usage_email_change"); m.send(player, "usage_email_change");
return true; return true;
} }
if (Settings.getmaxRegPerEmail > 0) { plugin.management.performChangeEmail(player, args[1], args[2]);
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
}
if (PlayerCache.getInstance().isAuthenticated(name)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
m.send(player, "usage_email_add");
return true;
}
if (!args[1].equals(auth.getEmail())) {
m.send(player, "old_email_invalid");
return true;
}
if (!Settings.isEmailCorrect(args[2])) {
m.send(player, "new_email_invalid");
return true;
}
auth.setEmail(args[2]);
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m.send(player, "email_changed");
player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "email_confirm");
} else {
if (!plugin.database.isAuthAvailable(name)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
}
}
} }
if (args[0].equalsIgnoreCase("recovery")) { if (args[0].equalsIgnoreCase("recovery")) {
if (args.length != 2) { if (args.length != 2) {
@ -151,7 +80,7 @@ public class EmailCommand implements CommandExecutor {
RandomString rand = new RandomString(Settings.getRecoveryPassLength); RandomString rand = new RandomString(Settings.getRecoveryPassLength);
String thePass = rand.nextString(); String thePass = rand.nextString();
String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, thePass, name); String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, thePass, name);
PlayerAuth auth = null; PlayerAuth auth;
if (PlayerCache.getInstance().isAuthenticated(name)) { if (PlayerCache.getInstance().isAuthenticated(name)) {
auth = PlayerCache.getInstance().getAuth(name); auth = PlayerCache.getInstance().getAuth(name);
} else if (plugin.database.isAuthAvailable(name)) { } else if (plugin.database.isAuthAvailable(name)) {

27
src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
View File

@ -9,10 +9,7 @@ import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Callable; import java.util.concurrent.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class CacheDataSource implements DataSource { public class CacheDataSource implements DataSource {
@ -229,23 +226,15 @@ public class CacheDataSource implements DataSource {
@Override @Override
public synchronized boolean updateEmail(final PlayerAuth auth) { public synchronized boolean updateEmail(final PlayerAuth auth) {
if (!cache.containsKey(auth.getNickname())) { try {
return exec.submit(new Callable<Boolean>() {
public Boolean call() {
return source.updateEmail(auth);
}
}).get();
} catch (Exception e) {
return false; return false;
} }
PlayerAuth cachedAuth = cache.get(auth.getNickname());
final String oldEmail = cachedAuth.getEmail();
cachedAuth.setEmail(auth.getEmail());
exec.execute(new Runnable() {
@Override
public void run() {
if (!source.updateEmail(auth)) {
if (cache.containsKey(auth.getNickname())) {
cache.get(auth.getNickname()).setEmail(oldEmail);
}
}
}
});
return true;
} }
@Override @Override

1
src/main/java/fr/xephi/authme/datasource/MySQL.java
View File

@ -692,6 +692,7 @@ public class MySQL implements DataSource {
pst.executeUpdate(); pst.executeUpdate();
} catch (Exception ex) { } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage()); ConsoleLogger.showError(ex.getMessage());
ConsoleLogger.writeStackTrace(ex);
return false; return false;
} finally { } finally {
close(pst); close(pst);

12
src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
View File

@ -71,13 +71,21 @@ public class AsyncChangeEmail {
return; return;
} }
PlayerCache.getInstance().updatePlayer(auth); PlayerCache.getInstance().updatePlayer(auth);
if (oldEmail == null) {
m.send(player, "email_added");
player.sendMessage(auth.getEmail());
return;
}
m.send(player, "email_changed"); m.send(player, "email_changed");
player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail()); player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
} else { } else {
if (!plugin.database.isAuthAvailable(playerName)) { if (plugin.database.isAuthAvailable(playerName)) {
m.send(player, "login_msg"); m.send(player, "login_msg");
} else { } else {
m.send(player, "reg_email_msg"); if (Settings.emailRegistration)
m.send(player, "reg_email_msg");
else
m.send(player, "reg_msg");
} }
} }
} catch (Exception e) { } catch (Exception e) {