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

Fix the instance of database

Browse Source
This commit is contained in:
Xephi59
2015-07-09 21:02:37 +02:00
parent f114019e5f
commit 36632bbb58
21 changed files with 126 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/commands/AdminCommand.java
+23 -26
View File
@@ -33,7 +33,6 @@ import fr.xephi.authme.Utils.groupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
@@ -46,10 +45,8 @@ public class AdminCommand implements CommandExecutor {
public AuthMe plugin;
private Messages m = Messages.getInstance();
public DataSource database;
public AdminCommand(AuthMe plugin, DataSource database) {
this.database = database;
public AdminCommand(AuthMe plugin) {
this.plugin = plugin;
}
@@ -107,7 +104,7 @@ public class AdminCommand implements CommandExecutor {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -(Integer.parseInt(args[1])));
long until = calendar.getTimeInMillis();
List<String> purged = database.autoPurgeDatabase(until);
List<String> purged = plugin.database.autoPurgeDatabase(until);
sender.sendMessage("Deleted " + purged.size() + " user accounts");
if (Settings.purgeEssentialsFile && plugin.ess != null)
plugin.dataManager.purgeEssentials(purged);
@@ -161,8 +158,8 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
if (database.getAuth(args[1].toLowerCase()) != null) {
PlayerAuth player = database.getAuth(args[1].toLowerCase());
if (plugin.database.getAuth(args[1].toLowerCase()) != null) {
PlayerAuth player = plugin.database.getAuth(args[1].toLowerCase());
long lastLogin = player.getLastLogin();
Date d = new Date(lastLogin);
final long diff = System.currentTimeMillis() - lastLogin;
@@ -195,13 +192,13 @@ public class AdminCommand implements CommandExecutor {
PlayerAuth pAuth = null;
String message = "[AuthMe] ";
try {
pAuth = database.getAuth(arguments[1].toLowerCase());
pAuth = plugin.database.getAuth(arguments[1].toLowerCase());
} catch (NullPointerException npe) {
fSender.sendMessage("[AuthMe] This player is unknown");
return;
}
if (pAuth != null) {
List<String> accountList = database.getAllAuthsByName(pAuth);
List<String> accountList = plugin.database.getAllAuthsByName(pAuth);
if (accountList.isEmpty() || accountList == null) {
fSender.sendMessage("[AuthMe] This player is unknown");
return;
@@ -238,7 +235,7 @@ public class AdminCommand implements CommandExecutor {
public void run() {
String message = "[AuthMe] ";
if (arguments[1] != null) {
List<String> accountList = database.getAllAuthsByIp(arguments[1]);
List<String> accountList = plugin.database.getAllAuthsByIp(arguments[1]);
if (accountList.isEmpty() || accountList == null) {
fSender.sendMessage("[AuthMe] Please put a valid IP");
return;
@@ -275,7 +272,7 @@ public class AdminCommand implements CommandExecutor {
}
try {
String name = args[1].toLowerCase();
if (database.isAuthAvailable(name)) {
if (plugin.database.isAuthAvailable(name)) {
m.send(sender, "user_regged");
return true;
}
@@ -284,7 +281,7 @@ public class AdminCommand implements CommandExecutor {
if (PasswordSecurity.userSalt.containsKey(name) && PasswordSecurity.userSalt.get(name) != null)
auth.setSalt(PasswordSecurity.userSalt.get(name));
else auth.setSalt("");
if (!database.saveAuth(auth)) {
if (!plugin.database.saveAuth(auth)) {
m.send(sender, "error");
return true;
}
@@ -301,7 +298,7 @@ public class AdminCommand implements CommandExecutor {
return true;
}
String playername = args[1].toLowerCase();
PlayerAuth getAuth = database.getAuth(playername);
PlayerAuth getAuth = plugin.database.getAuth(playername);
if (getAuth == null) {
m.send(sender, "unknown_user");
return true;
@@ -314,13 +311,13 @@ public class AdminCommand implements CommandExecutor {
return true;
}
String playername = args[1].toLowerCase();
PlayerAuth getAuth = database.getAuth(playername);
PlayerAuth getAuth = plugin.database.getAuth(playername);
if (getAuth == null) {
m.send(sender, "unknown_user");
return true;
}
getAuth.setEmail(args[2]);
if (!database.updateEmail(getAuth)) {
if (!plugin.database.updateEmail(getAuth)) {
m.send(sender, "error");
return true;
}
@@ -358,7 +355,7 @@ public class AdminCommand implements CommandExecutor {
for (OfflinePlayer off : plugin.getServer().getBannedPlayers()) {
bannedPlayers.add(off.getName().toLowerCase());
}
database.purgeBanned(bannedPlayers);
plugin.database.purgeBanned(bannedPlayers);
if (Settings.purgeEssentialsFile && plugin.ess != null)
plugin.dataManager.purgeEssentials(bannedPlayers);
if (Settings.purgePlayerDat)
@@ -406,8 +403,8 @@ public class AdminCommand implements CommandExecutor {
PlayerAuth auth = null;
if (PlayerCache.getInstance().isAuthenticated(name)) {
auth = PlayerCache.getInstance().getAuth(name);
} else if (database.isAuthAvailable(name)) {
auth = database.getAuth(name);
} else if (plugin.database.isAuthAvailable(name)) {
auth = plugin.database.getAuth(name);
}
if (auth == null) {
m.send(sender, "unknown_user");
@@ -416,9 +413,9 @@ public class AdminCommand implements CommandExecutor {
auth.setHash(hash);
if (PasswordSecurity.userSalt.containsKey(name)) {
auth.setSalt(PasswordSecurity.userSalt.get(name));
database.updateSalt(auth);
plugin.database.updateSalt(auth);
}
if (!database.updatePassword(auth)) {
if (!plugin.database.updatePassword(auth)) {
m.send(sender, "error");
return true;
}
@@ -435,11 +432,11 @@ public class AdminCommand implements CommandExecutor {
return true;
}
String name = args[1].toLowerCase();
if (!database.isAuthAvailable(name)) {
if (!plugin.database.isAuthAvailable(name)) {
m.send(sender, "user_unknown");
return true;
}
if (!database.removeAuth(name)) {
if (!plugin.database.removeAuth(name)) {
m.send(sender, "error");
return true;
}
@@ -484,7 +481,7 @@ public class AdminCommand implements CommandExecutor {
}
try {
String name = args[1].toLowerCase();
PlayerAuth auth = database.getAuth(name);
PlayerAuth auth = plugin.database.getAuth(name);
if (auth == null) {
sender.sendMessage("The player " + name + " is not registered ");
return true;
@@ -493,7 +490,7 @@ public class AdminCommand implements CommandExecutor {
auth.setQuitLocY(0);
auth.setQuitLocZ(0);
auth.setWorld("world");
database.updateQuitLoc(auth);
plugin.database.updateQuitLoc(auth);
sender.sendMessage(name + " 's last pos location is now reset");
} catch (Exception e) {
ConsoleLogger.showError("An error occured while trying to reset location or player do not exist, please see below: ");
@@ -539,7 +536,7 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage : /authme resetPosition <playerName>");
return true;
}
PlayerAuth auth = database.getAuth(args[1]);
PlayerAuth auth = plugin.database.getAuth(args[1]);
if (auth == null) {
m.send(sender, "unknown_user");
return true;
@@ -548,7 +545,7 @@ public class AdminCommand implements CommandExecutor {
auth.setQuitLocY(0D);
auth.setQuitLocZ(0D);
auth.setWorld("world");
database.updateQuitLoc(auth);
plugin.database.updateQuitLoc(auth);
sender.sendMessage("[AuthMe] Successfully reset position for " + auth.getNickname());
return true;
} else if (args[0].equalsIgnoreCase("forcelogin")) {
src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
+3 -6
View File
@@ -11,7 +11,6 @@ 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.datasource.DataSource;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
@@ -19,11 +18,9 @@ import fr.xephi.authme.settings.Settings;
public class ChangePasswordCommand implements CommandExecutor {
private Messages m = Messages.getInstance();
private DataSource database;
public AuthMe plugin;
public ChangePasswordCommand(DataSource database, AuthMe plugin) {
this.database = database;
public ChangePasswordCommand(AuthMe plugin) {
this.plugin = plugin;
}
@@ -79,11 +76,11 @@ public class ChangePasswordCommand implements CommandExecutor {
if (PasswordSecurity.userSalt.containsKey(name) && PasswordSecurity.userSalt.get(name) != null)
auth.setSalt(PasswordSecurity.userSalt.get(name));
else auth.setSalt("");
if (!database.updatePassword(auth)) {
if (!plugin.database.updatePassword(auth)) {
m.send(player, "error");
return true;
}
database.updateSalt(auth);
plugin.database.updateSalt(auth);
PlayerCache.getInstance().updatePlayer(auth);
m.send(player, "pwd_changed");
ConsoleLogger.info(player.getName() + " changed his password");
src/main/java/fr/xephi/authme/commands/ConverterCommand.java
+6 -9
View File
@@ -16,18 +16,15 @@ import fr.xephi.authme.converter.RoyalAuthConverter;
import fr.xephi.authme.converter.SqlToFlat;
import fr.xephi.authme.converter.vAuthConverter;
import fr.xephi.authme.converter.xAuthConverter;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.settings.Messages;
public class ConverterCommand implements CommandExecutor {
private AuthMe plugin;
private Messages m = Messages.getInstance();
private DataSource database;
public ConverterCommand(AuthMe plugin, DataSource database) {
public ConverterCommand(AuthMe plugin) {
this.plugin = plugin;
this.database = database;
}
@Override
@@ -61,22 +58,22 @@ public class ConverterCommand implements CommandExecutor {
converter = new FlatToSqlite(sender);
break;
case xauth:
converter = new xAuthConverter(plugin, database, sender);
converter = new xAuthConverter(plugin, sender);
break;
case crazylogin:
converter = new CrazyLoginConverter(plugin, database, sender);
converter = new CrazyLoginConverter(plugin, sender);
break;
case rakamak:
converter = new RakamakConverter(plugin, database, sender);
converter = new RakamakConverter(plugin, sender);
break;
case royalauth:
converter = new RoyalAuthConverter(plugin);
break;
case vauth:
converter = new vAuthConverter(plugin, database, sender);
converter = new vAuthConverter(plugin, sender);
break;
case sqltoflat:
converter = new SqlToFlat(plugin, database, sender);
converter = new SqlToFlat(plugin, sender);
break;
default:
break;
src/main/java/fr/xephi/authme/commands/EmailCommand.java
+11 -14
View File
@@ -11,7 +11,6 @@ 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.datasource.DataSource;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages;
@@ -24,12 +23,10 @@ import fr.xephi.authme.settings.Settings;
public class EmailCommand implements CommandExecutor {
public AuthMe plugin;
private DataSource data;
private Messages m = Messages.getInstance();
public EmailCommand(AuthMe plugin, DataSource data) {
public EmailCommand(AuthMe plugin) {
this.plugin = plugin;
this.data = data;
}
@Override
@@ -60,7 +57,7 @@ public class EmailCommand implements CommandExecutor {
return true;
}
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
@@ -76,7 +73,7 @@ public class EmailCommand implements CommandExecutor {
return true;
}
auth.setEmail(args[1]);
if (!data.updateEmail(auth)) {
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
@@ -86,7 +83,7 @@ public class EmailCommand implements CommandExecutor {
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "email_confirm");
} else {
if (!data.isAuthAvailable(name)) {
if (!plugin.database.isAuthAvailable(name)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
@@ -98,7 +95,7 @@ public class EmailCommand implements CommandExecutor {
return true;
}
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) {
m.send(player, "max_reg");
return true;
}
@@ -118,7 +115,7 @@ public class EmailCommand implements CommandExecutor {
return true;
}
auth.setEmail(args[2]);
if (!data.updateEmail(auth)) {
if (!plugin.database.updateEmail(auth)) {
m.send(player, "error");
return true;
}
@@ -128,7 +125,7 @@ public class EmailCommand implements CommandExecutor {
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "email_confirm");
} else {
if (!data.isAuthAvailable(name)) {
if (!plugin.database.isAuthAvailable(name)) {
m.send(player, "login_msg");
} else {
m.send(player, "reg_email_msg");
@@ -144,7 +141,7 @@ public class EmailCommand implements CommandExecutor {
m.send(player, "error");
return true;
}
if (data.isAuthAvailable(name)) {
if (plugin.database.isAuthAvailable(name)) {
if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "logged_in");
return true;
@@ -156,8 +153,8 @@ public class EmailCommand implements CommandExecutor {
PlayerAuth auth = null;
if (PlayerCache.getInstance().isAuthenticated(name)) {
auth = PlayerCache.getInstance().getAuth(name);
} else if (data.isAuthAvailable(name)) {
auth = data.getAuth(name);
} else if (plugin.database.isAuthAvailable(name)) {
auth = plugin.database.getAuth(name);
} else {
m.send(player, "unknown_user");
return true;
@@ -172,7 +169,7 @@ public class EmailCommand implements CommandExecutor {
return true;
}
auth.setHash(hashnew);
data.updatePassword(auth);
plugin.database.updatePassword(auth);
plugin.mail.main(auth, thePass);
m.send(player, "email_send");
} catch (NoSuchAlgorithmException ex) {
src/main/java/fr/xephi/authme/commands/LogoutCommand.java
+1 -9
View File
@@ -6,23 +6,15 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import fr.xephi.authme.cache.backup.FileCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.settings.Messages;
public class LogoutCommand implements CommandExecutor {
private Messages m = Messages.getInstance();
private AuthMe plugin;
private DataSource database;
private Utils utils = Utils.getInstance();
private FileCache playerBackup;
public LogoutCommand(AuthMe plugin, DataSource database) {
public LogoutCommand(AuthMe plugin) {
this.plugin = plugin;
this.database = database;
this.playerBackup = new FileCache(plugin);
}
@Override
src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
+2 -5
View File
@@ -20,7 +20,6 @@ import fr.xephi.authme.Utils.groupType;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.backup.FileCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
@@ -32,12 +31,10 @@ public class UnregisterCommand implements CommandExecutor {
private Messages m = Messages.getInstance();
public AuthMe plugin;
private DataSource database;
private FileCache playerCache;
public UnregisterCommand(AuthMe plugin, DataSource database) {
public UnregisterCommand(AuthMe plugin) {
this.plugin = plugin;
this.database = database;
this.playerCache = new FileCache(plugin);
}
@@ -67,7 +64,7 @@ public class UnregisterCommand implements CommandExecutor {
}
try {
if (PasswordSecurity.comparePasswordWithHash(args[0], PlayerCache.getInstance().getAuth(name).getHash(), player.getName())) {
if (!database.removeAuth(name)) {
if (!plugin.database.removeAuth(name)) {
player.sendMessage("error");
return true;
}