diff --git a/README.md b/README.md
index 3e8242a83..2f12855f9 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@
- Build status (CircleCI): [![Circle CI](https://circleci.com/gh/Xephi/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/Xephi/AuthMeReloaded)
+- Issue Tracking : [![Stories in Ready](https://badge.waffle.io/Xephi/AuthMeReloaded.png?label=ready&title=Ready)](https://waffle.io/Xephi/AuthMeReloaded) [![Stories in Bugs](https://badge.waffle.io/Xephi/AuthMeReloaded.png?label=bugs&title=Bugs)](https://waffle.io/Xephi/AuthMeReloaded) [![Stories in In%20Progress](https://badge.waffle.io/Xephi/AuthMeReloaded.png?label=in%20progress&title=In%20Progress)](https://waffle.io/Xephi/AuthMeReloaded)
+
- Build Server (DEVELOPMENT BUILDS): Xephi's Jenkins
- JavaDocs: AuthMe Javadoc
diff --git a/pom.xml b/pom.xml
index 2eab19595..e02a3baeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,571 +1,576 @@
- 4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
- fr.xephi
- authme
- 5.0-SNAPSHOT
+ fr.xephi
+ authme
+ 5.0-SNAPSHOT
- AuthMeReloaded
- Authentication plugin for CraftBukkit/Spigot!
- 2013
- http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
-
+ AuthMeReloaded
+ Authentication plugin for CraftBukkit/Spigot!
+ 2013
+ http://dev.bukkit.org/bukkit-plugins/authme-reloaded/
+
-
- scm:git:https://github.com/Xephi/AuthMeReloaded.git
- scm:git:git@github.com:Xephi/AuthMeReloaded.git
- http://github.com/Xephi/AuthMeReloaded
-
+
+ scm:git:https://github.com/Xephi/AuthMeReloaded.git
+ scm:git:git@github.com:Xephi/AuthMeReloaded.git
+ http://github.com/Xephi/AuthMeReloaded
+
-
-
- jenkins
- http://ci.xephi.fr/job/AuthMeReloaded/
-
+
+
+ jenkins
+ http://ci.xephi.fr/job/AuthMeReloaded/
+
-
- GitHub
- https://github.com/Xephi/AuthMeReloaded/issues
-
+
+ GitHub
+ https://github.com/Xephi/AuthMeReloaded/issues
+
-
-
- The GNU General Public Licence version 3 (GPLv3)
- http://www.gnu.org/licenses/gpl-3.0.html
-
-
+
+
+ The GNU General Public Licence version 3 (GPLv3)
+ http://www.gnu.org/licenses/gpl-3.0.html
+
+
-
- UTF-8
-
- 1.7
-
- 1.8.8-R0.1-SNAPSHOT
-
+
+ UTF-8
+
+ 1.7
+
+ 1.8.8-R0.1-SNAPSHOT
+
-
- AuthMe-${project.version}
-
-
- .
- true
- ${basedir}/src/main/resources/
-
- *.yml
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
-
- ${javaVersion}
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 2.4.1
-
-
-
- com.maxmind.geoip:*
- javax.mail:*
- com.sun.mail:*
- com.comphenix.attribute:*
- org.mcstats.*:*
- com.zaxxer:*
- org.slf4j:*
-
-
-
-
- org.mcstats
- fr.xephi.authme
-
-
-
-
-
- package
-
- shade
-
-
-
-
-
-
+
+ AuthMe-${project.version}
+
+
+ .
+ true
+ ${basedir}/src/main/resources/
+
+ *.yml
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.3
+
+
+ ${javaVersion}
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.4.1
+
+
+
+ com.maxmind.geoip:*
+ javax.mail:*
+ com.sun.mail:*
+ com.comphenix.attribute:*
+ org.mcstats.*:*
+ com.zaxxer:*
+ org.slf4j:*
+
+
+
+
+ org.mcstats
+ fr.xephi.authme
+
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
-
+
-
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/groups/public
-
+
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/groups/public
+
-
-
- ess-repo
- https://ci.drtshock.net/plugin/repository/everything
-
+
+
+ ess-repo
+ https://ci.drtshock.net/plugin/repository/everything
+
-
-
- citizensapi-repo
- http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository
-
+
+
+ citizensapi-repo
+ http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository
+
-
-
- minelink-thirdparty
- http://repo.minelink.net/content/repositories/public
-
+
+
+ minelink-thirdparty
+ http://repo.minelink.net/content/repositories/public
+
-
-
- comphenix-snapshots
- http://repo.comphenix.net/content/repositories/public
-
+
+
+ comphenix-snapshots
+ http://repo.comphenix.net/content/repositories/public
+
-
-
- onarandombox
- http://repo.onarandombox.com/content/groups/public
-
+
+
+ onarandombox
+ http://repo.onarandombox.com/content/groups/public
+
-
-
- vault-repo
- http://nexus.theyeticave.net/content/repositories/pub_releases
-
+
+
+ vault-repo
+ http://nexus.theyeticave.net/content/repositories/pub_releases
+
-
-
- luricos-releases
- http://repo.luricos.de/content/repositories/releases
-
+
+
+ luricos-releases
+ http://repo.luricos.de/content/repositories/releases
+
-
-
- xephi-repo
- http://ci.xephi.fr/plugin/repository/everything/
-
+
+
+ xephi-repo
+ http://ci.xephi.fr/plugin/repository/everything/
+
-
-
- mcstats-snapshots
- http://repo.mcstats.org/content/repositories/snapshots/
-
+
+
+ mcstats-snapshots
+ http://repo.mcstats.org/content/repositories/snapshots/
+
-
+
-
+
-
+
-
-
- org.slf4j
- slf4j-simple
- 1.7.12
- compile
-
-
- com.zaxxer
- HikariCP
- 2.4.0
- compile
-
-
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-simple
-
-
-
+
+
+ mysql
+ mysql-connector-java
+ 5.1.36
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.12
+ compile
+
+
+ com.zaxxer
+ HikariCP
+ 2.4.1
+ compile
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ slf4j-simple
+
+
+
-
-
- org.xerial
- sqlite-jdbc
- 3.8.11.1
- compile
-
+
+
+ org.xerial
+ sqlite-jdbc
+ 3.8.11.1
+ compile
+
-
-
- com.sun.mail
- javax.mail
- 1.5.4
- compile
-
+
+
+ com.sun.mail
+ javax.mail
+ 1.5.4
+ compile
+
-
-
- com.maxmind.geoip
- geoip-api
- 1.2.15
- compile
-
+
+
+ com.maxmind.geoip
+ geoip-api
+ 1.2.15
+ compile
+
-
-
- org.mcstats.bukkit
- metrics
- R8-SNAPSHOT
- compile
-
-
- org.bukkit
- bukkit
-
-
-
+
+
+ org.mcstats.bukkit
+ metrics
+ R8-SNAPSHOT
+ compile
+
+
+ org.bukkit
+ bukkit
+
+
+
-
-
- org.bukkit
- bukkit
- ${bukkitVersion}
- provided
-
+
+
+ org.bukkit
+ bukkit
+ ${bukkitVersion}
+ provided
+
-
-
- com.comphenix.attribute
- AttributeStorage
- 0.0.2-SNAPSHOT
- compile
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
-
+
+
+ com.comphenix.attribute
+ AttributeStorage
+ 0.0.2-SNAPSHOT
+ compile
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+
-
-
- net.milkbowl.vault
- VaultAPI
- 1.5
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
-
+
+
+ net.milkbowl.vault
+ VaultAPI
+ 1.5
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+
-
-
- net.citizensnpcs
- citizensapi
- 2.0.16-SNAPSHOT
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
-
+
+
+ net.citizensnpcs
+ citizensapi
+ 2.0.16-SNAPSHOT
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+
-
-
- com.onarandombox.multiversecore
- Multiverse-Core
- 2.5
- jar
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
- AllPay
- com.fernferret.allpay
-
-
- Vault
- net.milkbowl.vault
-
-
- CommandHandler
- com.pneumaticraft.commandhandler
-
-
-
+
+
+ com.onarandombox.multiversecore
+ Multiverse-Core
+ 2.5
+ jar
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+ AllPay
+ com.fernferret.allpay
+
+
+ Vault
+ net.milkbowl.vault
+
+
+ CommandHandler
+ com.pneumaticraft.commandhandler
+
+
+
-
-
- net.ess3
- EssentialsX
- 2.0.1-SNAPSHOT
- provided
-
-
- org.spigotmc
- spigot-api
-
-
-
+
+
+ net.ess3
+ EssentialsX
+ 2.0.1-SNAPSHOT
+ provided
+
+
+ org.spigotmc
+ spigot-api
+
+
+
-
-
- net.minelink
- CombatTagPlus
- 1.2.1-SNAPSHOT
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
- CombatTagPlusHook
- net.minelink
-
-
- CombatTagPlusFactions-v1_6
- net.minelink
-
-
- CombatTagPlusCompat-v1_7_R3
- net.minelink
-
-
- CombatTagPlusFactions-v1_8
- net.minelink
-
-
- CombatTagPlusCompat-v1_7_R4
- net.minelink
-
-
- CombatTagPlusWG-v5
- net.minelink
-
-
- CombatTagPlusWG-v6
- net.minelink
-
-
- CombatTagPlusCompat-API
- net.minelink
-
-
- CombatTagPlusFactions-v2_6
- net.minelink
-
-
- CombatTagPlusCompat-v1_8_R3
- net.minelink
-
-
- CombatTagPlusFactions-v2_7
- net.minelink
-
-
- CombatTagPlusCompat-v1_8_R2
- net.minelink
-
-
- CombatTagPlusCompat-v1_8_R1
- net.minelink
-
-
- metrics-lite
- org.mcstats.bukkit
-
-
-
+
+
+ net.minelink
+ CombatTagPlus
+ 1.2.1-SNAPSHOT
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+ CombatTagPlusHook
+ net.minelink
+
+
+ CombatTagPlusFactions-v1_6
+ net.minelink
+
+
+ CombatTagPlusCompat-v1_7_R3
+ net.minelink
+
+
+ CombatTagPlusFactions-v1_8
+ net.minelink
+
+
+ CombatTagPlusCompat-v1_7_R4
+ net.minelink
+
+
+ CombatTagPlusWG-v5
+ net.minelink
+
+
+ CombatTagPlusWG-v6
+ net.minelink
+
+
+ CombatTagPlusCompat-API
+ net.minelink
+
+
+ CombatTagPlusFactions-v2_6
+ net.minelink
+
+
+ CombatTagPlusCompat-v1_8_R3
+ net.minelink
+
+
+ CombatTagPlusFactions-v2_7
+ net.minelink
+
+
+ CombatTagPlusCompat-v1_8_R2
+ net.minelink
+
+
+ CombatTagPlusCompat-v1_8_R1
+ net.minelink
+
+
+ metrics-lite
+ org.mcstats.bukkit
+
+
+
-
-
- com.trc202
- CombatTag
- 6.2.1-SNAPSHOT
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
-
+
+
+ com.trc202
+ CombatTag
+ 6.2.1-SNAPSHOT
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+
-
-
- de.luricos.bukkit
- xAuth
- 2.6
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
- updater
- net.gravitydevelopment.updater
-
-
- lombok
- org.projectlombok
-
-
- EssentialsGroupManager
- net.ess3
-
-
- PermissionsEx
- ru.tehkode
-
-
- AccountsClient
- com.mojang
-
-
-
+
+
+ de.luricos.bukkit
+ xAuth
+ 2.6
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+ updater
+ net.gravitydevelopment.updater
+
+
+ lombok
+ org.projectlombok
+
+
+ EssentialsGroupManager
+ net.ess3
+
+
+ PermissionsEx
+ ru.tehkode
+
+
+ AccountsClient
+ com.mojang
+
+
+
-
-
- com.acrobot.chestshop
- chestshop
- 3.8.12
- provided
-
-
- org.bukkit
- bukkit
-
-
- org.bukkit
- craftbukkit
-
-
- Vault
- net.milkbowl.vault
-
-
- odditem
- info.somethingodd
-
-
- scrollingmenusign
- me.desht
-
-
- truezip
- de.schlichtherle
-
-
- residence
- net.t00thpick1
-
-
- Heroes
- com.herocraftonline.heroes
-
-
- HeroChat
- com.dthielke.herochat
-
-
- worldguard
- com.sk89q
-
-
- worldedit
- com.sk89q
-
-
- lwc
- com.griefcraft.lwc
-
-
- js
- rhino
-
-
- jchronic
- com.sk89q
-
-
- deadbolt
- com.daemitus.deadbolt
-
-
- bukkit-classloader-check
- com.sk89q.spigot
-
-
- jsr305
- com.google.code.findbugs
-
-
- opencsv
- net.sf.opencsv
-
-
- simplechestlock
-
+
+
+ com.acrobot.chestshop
+ chestshop
+ 3.8.12
+ provided
+
+
+ org.bukkit
+ bukkit
+
+
+ org.bukkit
+ craftbukkit
+
+
+ Vault
+ net.milkbowl.vault
+
+
+ odditem
+ info.somethingodd
+
+
+ scrollingmenusign
+ me.desht
+
+
+ truezip
+ de.schlichtherle
+
+
+ residence
+ net.t00thpick1
+
+
+ Heroes
+ com.herocraftonline.heroes
+
+
+ HeroChat
+ com.dthielke.herochat
+
+
+ worldguard
+ com.sk89q
+
+
+ worldedit
+ com.sk89q
+
+
+ lwc
+ com.griefcraft.lwc
+
+
+ js
+ rhino
+
+
+ jchronic
+ com.sk89q
+
+
+ deadbolt
+ com.daemitus.deadbolt
+
+
+ bukkit-classloader-check
+ com.sk89q.spigot
+
+
+ jsr305
+ com.google.code.findbugs
+
+
+ opencsv
+ net.sf.opencsv
+
+
+ simplechestlock
+
com.webkonsept.bukkit.simplechestlock
-
-
- commandbook
- com.sk89q
-
-
- lockette
- org.yi.acru.bukkit.lockette
-
-
-
+
+
+ commandbook
+ com.sk89q
+
+
+ lockette
+ org.yi.acru.bukkit.lockette
+
+
+
-
+
diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
index 28f4519b9..cdcbf9975 100644
--- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
@@ -47,8 +47,8 @@ public class AdminCommand implements CommandExecutor {
}
@Override
- public boolean onCommand(CommandSender sender, Command cmnd, String label,
- String[] args) {
+ public boolean onCommand(final CommandSender sender, Command cmnd,
+ String label, String[] args) {
if (args.length == 0) {
sender.sendMessage("Usage:");
sender.sendMessage("/authme reload - Reload the config");
@@ -434,34 +434,43 @@ public class AdminCommand implements CommandExecutor {
return true;
}
}
- try {
- String name = args[1].toLowerCase();
- String hash = PasswordSecurity.getHash(Settings.getPasswordHash, args[2], name);
- PlayerAuth auth = null;
- if (PlayerCache.getInstance().isAuthenticated(name)) {
- auth = PlayerCache.getInstance().getAuth(name);
- } else if (plugin.database.isAuthAvailable(name)) {
- auth = plugin.database.getAuth(name);
+ final String name = args[1].toLowerCase();
+ final String raw = args[2];
+ Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+ @Override
+ public void run() {
+ String hash;
+ try {
+ hash = PasswordSecurity.getHash(Settings.getPasswordHash, raw, name);
+ } catch (NoSuchAlgorithmException e) {
+ m.send(sender, "error");
+ return;
+ }
+ PlayerAuth auth = null;
+ if (PlayerCache.getInstance().isAuthenticated(name)) {
+ auth = PlayerCache.getInstance().getAuth(name);
+ } else if (plugin.database.isAuthAvailable(name)) {
+ auth = plugin.database.getAuth(name);
+ }
+ if (auth == null) {
+ m.send(sender, "unknown_user");
+ return;
+ }
+ auth.setHash(hash);
+ if (PasswordSecurity.userSalt.containsKey(name)) {
+ auth.setSalt(PasswordSecurity.userSalt.get(name));
+ plugin.database.updateSalt(auth);
+ }
+ if (!plugin.database.updatePassword(auth)) {
+ m.send(sender, "error");
+ return;
+ }
+ sender.sendMessage("pwd_changed");
+ ConsoleLogger.info(name + "'s password changed");
}
- if (auth == null) {
- m.send(sender, "unknown_user");
- return true;
- }
- auth.setHash(hash);
- if (PasswordSecurity.userSalt.containsKey(name)) {
- auth.setSalt(PasswordSecurity.userSalt.get(name));
- plugin.database.updateSalt(auth);
- }
- if (!plugin.database.updatePassword(auth)) {
- m.send(sender, "error");
- return true;
- }
- sender.sendMessage("pwd_changed");
- ConsoleLogger.info(args[1] + "'s password changed");
- } catch (NoSuchAlgorithmException ex) {
- ConsoleLogger.showError(ex.getMessage());
- m.send(sender, "error");
- }
+
+ });
return true;
} else if (args[0].equalsIgnoreCase("unregister") || args[0].equalsIgnoreCase("unreg") || args[0].equalsIgnoreCase("del")) {
if (args.length != 2) {
diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java
index 9509192d8..1588ac6b8 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQL.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java
@@ -113,6 +113,7 @@ public class MySQL implements DataSource {
throws ClassNotFoundException, SQLException, TimeoutException,
NumberFormatException, PoolInitializationException {
HikariConfig config = new HikariConfig();
+ config.setDriverClassName("com.mysql.jdbc.Driver");
config.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
config.setUsername(this.username);
config.setPassword(this.password);
@@ -121,6 +122,7 @@ public class MySQL implements DataSource {
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
config.addDataSourceProperty("autoReconnect", true);
+ config.setMaxLifetime(30000);
config.setInitializationFailFast(false);
ds = new HikariDataSource(config);
ConsoleLogger.info("Connection pool ready");
@@ -196,7 +198,7 @@ public class MySQL implements DataSource {
pst.setString(1, user);
rs = pst.executeQuery();
return rs.next();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -246,7 +248,7 @@ public class MySQL implements DataSource {
} else {
return null;
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return null;
} finally {
@@ -456,7 +458,7 @@ public class MySQL implements DataSource {
if (rs != null && !rs.isClosed())
rs.close();
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -501,7 +503,7 @@ public class MySQL implements DataSource {
if (rs != null && !rs.isClosed())
rs.close();
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -523,7 +525,7 @@ public class MySQL implements DataSource {
pst.setString(3, auth.getRealName());
pst.setString(4, auth.getNickname());
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -542,7 +544,7 @@ public class MySQL implements DataSource {
pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE " + columnLastLogin + ";");
pst.setLong(1, until);
return pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return 0;
} finally {
@@ -570,7 +572,7 @@ public class MySQL implements DataSource {
pst.setLong(1, until);
pst.executeUpdate();
return list;
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return new ArrayList();
} finally {
@@ -606,7 +608,7 @@ public class MySQL implements DataSource {
pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE LOWER(" + columnName + ")=?;");
pst.setString(1, user);
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -629,7 +631,7 @@ public class MySQL implements DataSource {
pst.setString(4, auth.getWorld());
pst.setString(5, auth.getNickname());
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -654,7 +656,7 @@ public class MySQL implements DataSource {
countIp++;
}
return countIp;
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return 0;
} finally {
@@ -674,7 +676,7 @@ public class MySQL implements DataSource {
pst.setString(1, auth.getEmail());
pst.setString(2, auth.getNickname());
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -697,7 +699,7 @@ public class MySQL implements DataSource {
pst.setString(1, auth.getSalt());
pst.setString(2, auth.getNickname());
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -709,8 +711,11 @@ public class MySQL implements DataSource {
@Override
public synchronized void close() {
- if (ds != null)
- ds.close();
+ try {
+ if (ds != null)
+ ds.close();
+ } catch (Exception e) {
+ }
}
@Override
@@ -732,7 +737,7 @@ public class MySQL implements DataSource {
if (st != null) {
try {
st.close();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
}
}
@@ -742,7 +747,7 @@ public class MySQL implements DataSource {
if (rs != null) {
try {
rs.close();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
}
}
@@ -752,7 +757,7 @@ public class MySQL implements DataSource {
if (con != null) {
try {
con.close();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
}
}
@@ -773,7 +778,7 @@ public class MySQL implements DataSource {
countIp.add(rs.getString(columnName));
}
return countIp;
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return new ArrayList();
} finally {
@@ -798,7 +803,7 @@ public class MySQL implements DataSource {
countIp.add(rs.getString(columnName));
}
return countIp;
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return new ArrayList();
} finally {
@@ -823,7 +828,7 @@ public class MySQL implements DataSource {
countEmail.add(rs.getString(columnName));
}
return countEmail;
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return new ArrayList();
} finally {
@@ -844,7 +849,7 @@ public class MySQL implements DataSource {
pst.setString(1, name);
pst.executeUpdate();
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
} finally {
close(pst);
@@ -890,7 +895,7 @@ public class MySQL implements DataSource {
while (con == null)
try {
con = ds.getConnection();
- } catch (SQLException e) {
+ } catch (Exception e) {
try {
reconnect(false);
con = ds.getConnection();
@@ -914,6 +919,7 @@ public class MySQL implements DataSource {
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
config.addDataSourceProperty("autoReconnect", true);
config.setInitializationFailFast(false);
+ config.setMaxLifetime(12000);
config.setPoolName("AuthMeMYSQLPool");
ds = new HikariDataSource(config);
if (!reload)
@@ -937,7 +943,7 @@ public class MySQL implements DataSource {
rs = pst.executeQuery();
if (rs.next())
return (rs.getInt(columnLogged) == 1);
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return false;
} finally {
@@ -958,7 +964,7 @@ public class MySQL implements DataSource {
pst.setInt(1, 1);
pst.setString(2, user);
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return;
} finally {
@@ -979,7 +985,7 @@ public class MySQL implements DataSource {
pst.setInt(1, 0);
pst.setString(2, user);
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return;
} finally {
@@ -999,7 +1005,7 @@ public class MySQL implements DataSource {
pst.setInt(1, 0);
pst.setInt(2, 1);
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return;
} finally {
@@ -1022,7 +1028,7 @@ public class MySQL implements DataSource {
if (rs != null && rs.next()) {
result = rs.getInt(1);
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return result;
} finally {
@@ -1042,7 +1048,7 @@ public class MySQL implements DataSource {
pst.setString(1, newone);
pst.setString(2, oldone);
pst.executeUpdate();
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return;
} finally {
@@ -1092,7 +1098,7 @@ public class MySQL implements DataSource {
if (pAuth != null)
auths.add(pAuth);
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return auths;
} finally {
@@ -1143,7 +1149,7 @@ public class MySQL implements DataSource {
if (pAuth != null)
auths.add(pAuth);
}
- } catch (SQLException ex) {
+ } catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
return auths;
} finally {
diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
new file mode 100644
index 000000000..6f1350e31
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
@@ -0,0 +1,804 @@
+package fr.xephi.authme.datasource;
+
+import java.io.EOFException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.settings.Settings;
+
+public class SQLite_HIKARI implements DataSource {
+
+ private String database;
+ private String tableName;
+ private String columnName;
+ private String columnPassword;
+ private String columnIp;
+ private String columnLastLogin;
+ private String columnSalt;
+ private String columnGroup;
+ private String lastlocX;
+ private String lastlocY;
+ private String lastlocZ;
+ private String lastlocWorld;
+ private String columnEmail;
+ private String columnID;
+ private HikariDataSource ds;
+ private String columnLogged;
+ private String columnRealName;
+
+ public SQLite_HIKARI() {
+ this.database = Settings.getMySQLDatabase;
+ this.tableName = Settings.getMySQLTablename;
+ this.columnName = Settings.getMySQLColumnName;
+ this.columnPassword = Settings.getMySQLColumnPassword;
+ this.columnIp = Settings.getMySQLColumnIp;
+ this.columnLastLogin = Settings.getMySQLColumnLastLogin;
+ this.columnSalt = Settings.getMySQLColumnSalt;
+ this.columnGroup = Settings.getMySQLColumnGroup;
+ this.lastlocX = Settings.getMySQLlastlocX;
+ this.lastlocY = Settings.getMySQLlastlocY;
+ this.lastlocZ = Settings.getMySQLlastlocZ;
+ this.lastlocWorld = Settings.getMySQLlastlocWorld;
+ this.columnEmail = Settings.getMySQLColumnEmail;
+ this.columnID = Settings.getMySQLColumnId;
+ this.columnLogged = Settings.getMySQLColumnLogged;
+ this.columnRealName = Settings.getMySQLColumnRealName;
+
+ try {
+ this.connect();
+ this.setup();
+ } catch (ClassNotFoundException e) {
+ ConsoleLogger.showError(e.getMessage());
+ if (Settings.isStopEnabled) {
+ ConsoleLogger.showError("Can't use SQLITE... ! SHUTDOWN...");
+ AuthMe.getInstance().getServer().shutdown();
+ }
+ if (!Settings.isStopEnabled)
+ AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
+ return;
+ } catch (SQLException e) {
+ ConsoleLogger.showError(e.getMessage());
+ if (Settings.isStopEnabled) {
+ ConsoleLogger.showError("Can't use SQLITE... ! SHUTDOWN...");
+ AuthMe.getInstance().getServer().shutdown();
+ }
+ if (!Settings.isStopEnabled)
+ AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
+ return;
+ } catch (EOFException e) {
+ ConsoleLogger.showError(e.getMessage());
+ if (Settings.isStopEnabled) {
+ ConsoleLogger.showError("Can't use SQLITE... ! SHUTDOWN...");
+ AuthMe.getInstance().getServer().shutdown();
+ }
+ if (!Settings.isStopEnabled)
+ AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
+ return;
+ }
+ }
+
+ private Connection getConnection() throws SQLException, EOFException {
+ return this.ds.getConnection();
+ }
+
+ private synchronized void connect()
+ throws ClassNotFoundException, SQLException, EOFException {
+ /*
+ * Class.forName("org.sqlite.JDBC"); ConsoleLogger.info(
+ * "SQLite driver loaded"); this.con =
+ * DriverManager.getConnection("jdbc:sqlite:plugins/AuthMe/" + database
+ * + ".db");
+ */
+ Properties props = new Properties();
+ props.setProperty("dataSourceClassName", "org.sqlite.SQLiteDataSource");
+ HikariConfig config = new HikariConfig(props);
+ config.setPoolName("AuthMeSQLiteLPool");
+ ds = new HikariDataSource(config);
+ ConsoleLogger.info("Connection pool ready");
+ }
+
+ private synchronized void setup() throws SQLException, EOFException {
+ Connection con = null;
+ Statement st = null;
+ ResultSet rs = null;
+ try {
+ con = getConnection();
+ st = con.createStatement();
+ st.executeUpdate("CREATE TABLE IF NOT EXISTS " + tableName + " (" + columnID + " INTEGER AUTO_INCREMENT," + columnName + " VARCHAR(255) NOT NULL UNIQUE," + columnPassword + " VARCHAR(255) NOT NULL," + columnIp + " VARCHAR(40) NOT NULL," + columnLastLogin + " BIGINT," + lastlocX + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocY + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocZ + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocWorld + " VARCHAR(255) NOT NULL DEFAULT '" + Settings.defaultWorld + "'," + columnEmail + " VARCHAR(255) DEFAULT 'your@email.com'," + "CONSTRAINT table_const_prim PRIMARY KEY (" + columnID + "));");
+ rs = con.getMetaData().getColumns(null, null, tableName, columnPassword);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnPassword + " VARCHAR(255) NOT NULL;");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, columnIp);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnIp + " VARCHAR(40) NOT NULL;");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, columnLastLogin);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnLastLogin + " BIGINT DEFAULT '0';");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, lastlocX);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + lastlocX + " DOUBLE NOT NULL DEFAULT '0.0';");
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + lastlocY + " DOUBLE NOT NULL DEFAULT '0.0';");
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + lastlocZ + " DOUBLE NOT NULL DEFAULT '0.0';");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, lastlocWorld);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + lastlocWorld + " VARCHAR(255) NOT NULL DEFAULT 'world';");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, columnEmail);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnEmail + " VARCHAR(255) DEFAULT 'your@email.com';");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, columnLogged);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnLogged + " BIGINT DEFAULT '0';");
+ }
+ rs.close();
+ rs = con.getMetaData().getColumns(null, null, tableName, columnRealName);
+ if (!rs.next()) {
+ st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) NOT NULL DEFAULT 'Player';");
+ }
+ } finally {
+ close(rs);
+ close(st);
+ close(con);
+ }
+ ConsoleLogger.info("SQLite Setup finished");
+ }
+
+ private void close(Connection con) {
+ try {
+ if (con != null)
+ con.close();
+ } catch (Exception e) {
+ }
+ }
+
+ @Override
+ public synchronized boolean isAuthAvailable(String user) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=LOWER(?);");
+ pst.setString(1, user);
+ rs = pst.executeQuery();
+ return rs.next();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public synchronized PlayerAuth getAuth(String user) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=LOWER(?);");
+ pst.setString(1, user);
+ rs = pst.executeQuery();
+ if (rs.next()) {
+ if (rs.getString(columnIp).isEmpty()) {
+ return new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), "192.168.0.1", rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ if (!columnSalt.isEmpty()) {
+ return new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnSalt), rs.getInt(columnGroup), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ return new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ }
+ }
+ } else {
+ return null;
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return null;
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public synchronized boolean saveAuth(PlayerAuth auth) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ if (columnSalt.isEmpty() && auth.getSalt().isEmpty()) {
+ pst = con.prepareStatement("INSERT INTO " + tableName + "(" + columnName + "," + columnPassword + "," + columnIp + "," + columnLastLogin + "," + columnRealName + ") VALUES (?,?,?,?,?);");
+ pst.setString(1, auth.getNickname());
+ pst.setString(2, auth.getHash());
+ pst.setString(3, auth.getIp());
+ pst.setLong(4, auth.getLastLogin());
+ pst.setString(5, auth.getRealName());
+ pst.executeUpdate();
+ } else {
+ pst = con.prepareStatement("INSERT INTO " + tableName + "(" + columnName + "," + columnPassword + "," + columnIp + "," + columnLastLogin + "," + columnSalt + "," + columnRealName + ") VALUES (?,?,?,?,?,?);");
+ pst.setString(1, auth.getNickname());
+ pst.setString(2, auth.getHash());
+ pst.setString(3, auth.getIp());
+ pst.setLong(4, auth.getLastLogin());
+ pst.setString(5, auth.getSalt());
+ pst.setString(6, auth.getRealName());
+ pst.executeUpdate();
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public synchronized boolean updatePassword(PlayerAuth auth) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnPassword + "=? WHERE " + columnName + "=?;");
+ pst.setString(1, auth.getHash());
+ pst.setString(2, auth.getNickname());
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean updateSession(PlayerAuth auth) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnIp + "=?, " + columnLastLogin + "=?, " + columnRealName + "=? WHERE " + columnName + "=?;");
+ pst.setString(1, auth.getIp());
+ pst.setLong(2, auth.getLastLogin());
+ pst.setString(3, auth.getRealName());
+ pst.setString(4, auth.getNickname());
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public int purgeDatabase(long until) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE " + columnLastLogin + ";");
+ pst.setLong(1, until);
+ return pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return 0;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public List autoPurgeDatabase(long until) {
+ Connection con = null;
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ List list = new ArrayList();
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnLastLogin + ";");
+ pst.setLong(1, until);
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ list.add(rs.getString(columnName));
+ }
+ return list;
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return new ArrayList();
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public synchronized boolean removeAuth(String user) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE " + columnName + "=?;");
+ pst.setString(1, user);
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean updateQuitLoc(PlayerAuth auth) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + lastlocX + "=?, " + lastlocY + "=?, " + lastlocZ + "=?, " + lastlocWorld + "=? WHERE " + columnName + "=?;");
+ pst.setDouble(1, auth.getQuitLocX());
+ pst.setDouble(2, auth.getQuitLocY());
+ pst.setDouble(3, auth.getQuitLocZ());
+ pst.setString(4, auth.getWorld());
+ pst.setString(5, auth.getNickname());
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public int getIps(String ip) {
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ int countIp = 0;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
+ pst.setString(1, ip);
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ countIp++;
+ }
+ return countIp;
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return 0;
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public boolean updateEmail(PlayerAuth auth) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnEmail + "=? WHERE " + columnName + "=?;");
+ pst.setString(1, auth.getEmail());
+ pst.setString(2, auth.getNickname());
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean updateSalt(PlayerAuth auth) {
+ if (columnSalt.isEmpty()) {
+ return false;
+ }
+ Connection con = null;
+ PreparedStatement pst = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnSalt + "=? WHERE " + columnName + "=?;");
+ pst.setString(1, auth.getSalt());
+ pst.setString(2, auth.getNickname());
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return true;
+ }
+
+ @Override
+ public synchronized void close() {
+ try {
+ if (ds != null)
+ ds.close();
+ } catch (Exception e) {
+ }
+ }
+
+ @Override
+ public void reload() {
+ try {
+ connect();
+ setup();
+ } catch (Exception e) {
+ ConsoleLogger.showError(e.getMessage());
+ if (Settings.isStopEnabled) {
+ ConsoleLogger.showError("Can't reconnect to SQLite database... SHUTDOWN...");
+ AuthMe.getInstance().getServer().shutdown();
+ }
+ if (!Settings.isStopEnabled)
+ AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
+ }
+ }
+
+ private void close(Statement st) {
+ if (st != null) {
+ try {
+ st.close();
+ } catch (SQLException ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ }
+ }
+ }
+
+ private void close(ResultSet rs) {
+ if (rs != null) {
+ try {
+ rs.close();
+ } catch (SQLException ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ }
+ }
+ }
+
+ @Override
+ public List getAllAuthsByName(PlayerAuth auth) {
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ List countIp = new ArrayList();
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
+ pst.setString(1, auth.getIp());
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ countIp.add(rs.getString(columnName));
+ }
+ return countIp;
+ } catch (NullPointerException ex) {
+ return new ArrayList();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return new ArrayList();
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public List getAllAuthsByIp(String ip) {
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ List countIp = new ArrayList();
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
+ pst.setString(1, ip);
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ countIp.add(rs.getString(columnName));
+ }
+ return countIp;
+ } catch (NullPointerException ex) {
+ return new ArrayList();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return new ArrayList();
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public List getAllAuthsByEmail(String email) {
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ List countEmail = new ArrayList();
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnEmail + "=?;");
+ pst.setString(1, email);
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ countEmail.add(rs.getString(columnName));
+ }
+ return countEmail;
+ } catch (NullPointerException ex) {
+ return new ArrayList();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return new ArrayList();
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public void purgeBanned(List banned) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ for (String name : banned) {
+ pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE " + columnName + "=?;");
+ pst.setString(1, name);
+ pst.executeUpdate();
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ } finally {
+ close(pst);
+ close(con);
+ }
+ }
+
+ @Override
+ public DataSourceType getType() {
+ return DataSourceType.SQLITE;
+ }
+
+ @Override
+ public boolean isLogged(String user) {
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=?;");
+ pst.setString(1, user);
+ rs = pst.executeQuery();
+ if (rs.next())
+ return (rs.getInt(columnLogged) == 1);
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return false;
+ } finally {
+ close(rs);
+ close(pst);
+ close(con);
+ }
+ return false;
+ }
+
+ @Override
+ public void setLogged(String user) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE LOWER(" + columnName + ")=?;");
+ pst.setInt(1, 1);
+ pst.setString(2, user);
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return;
+ }
+
+ @Override
+ public void setUnlogged(String user) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ if (user != null)
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE LOWER(" + columnName + ")=?;");
+ pst.setInt(1, 0);
+ pst.setString(2, user);
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return;
+ }
+
+ @Override
+ public void purgeLogged() {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE " + columnLogged + "=?;");
+ pst.setInt(1, 0);
+ pst.setInt(2, 1);
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return;
+ }
+
+ @Override
+ public int getAccountsRegistered() {
+ int result = 0;
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT COUNT(*) FROM " + tableName + ";");
+ rs = pst.executeQuery();
+ if (rs != null && rs.next()) {
+ result = rs.getInt(1);
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return result;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return result;
+ }
+
+ @Override
+ public void updateName(String oldone, String newone) {
+ PreparedStatement pst = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnName + "=? WHERE " + columnName + "=?;");
+ pst.setString(1, newone);
+ pst.setString(2, oldone);
+ pst.executeUpdate();
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return;
+ }
+
+ @Override
+ public List getAllAuths() {
+ List auths = new ArrayList();
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + ";");
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ PlayerAuth pAuth = null;
+ if (rs.getString(columnIp).isEmpty()) {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), "127.0.0.1", rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ if (!columnSalt.isEmpty()) {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnSalt), rs.getInt(columnGroup), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ }
+ }
+ if (pAuth != null)
+ auths.add(pAuth);
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return auths;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return auths;
+ }
+
+ @Override
+ public List getLoggedPlayers() {
+ List auths = new ArrayList();
+ PreparedStatement pst = null;
+ ResultSet rs = null;
+ Connection con = null;
+ try {
+ con = getConnection();
+ pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnLogged + "=1;");
+ rs = pst.executeQuery();
+ while (rs.next()) {
+ PlayerAuth pAuth = null;
+ if (rs.getString(columnIp).isEmpty()) {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), "127.0.0.1", rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ if (!columnSalt.isEmpty()) {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnSalt), rs.getInt(columnGroup), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ } else {
+ pAuth = new PlayerAuth(rs.getString(columnName), rs.getString(columnPassword), rs.getString(columnIp), rs.getLong(columnLastLogin), rs.getDouble(lastlocX), rs.getDouble(lastlocY), rs.getDouble(lastlocZ), rs.getString(lastlocWorld), rs.getString(columnEmail), rs.getString(columnRealName));
+ }
+ }
+ if (pAuth != null)
+ auths.add(pAuth);
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError(ex.getMessage());
+ return auths;
+ } finally {
+ close(pst);
+ close(con);
+ }
+ return auths;
+ }
+}
diff --git a/src/main/java/fr/xephi/authme/events/AuthMeAsyncPreLoginEvent.java b/src/main/java/fr/xephi/authme/events/AuthMeAsyncPreLoginEvent.java
new file mode 100644
index 000000000..1995fbd0b
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/events/AuthMeAsyncPreLoginEvent.java
@@ -0,0 +1,41 @@
+package fr.xephi.authme.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ *
+ * This event is call when a player try to /login
+ *
+ * @author Xephi59
+ */
+public class AuthMeAsyncPreLoginEvent extends Event {
+
+ private Player player;
+ private boolean canLogin = true;
+ private static final HandlerList handlers = new HandlerList();
+
+ public AuthMeAsyncPreLoginEvent(Player player) {
+ super(true);
+ this.player = player;
+ }
+
+ public Player getPlayer() {
+ return player;
+ }
+
+ public boolean canLogin() {
+ return canLogin;
+ }
+
+ public void setCanLogin(boolean canLogin) {
+ this.canLogin = canLogin;
+ }
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+}
diff --git a/src/main/java/fr/xephi/authme/events/CustomEvent.java b/src/main/java/fr/xephi/authme/events/CustomEvent.java
index 227429961..5be14710e 100644
--- a/src/main/java/fr/xephi/authme/events/CustomEvent.java
+++ b/src/main/java/fr/xephi/authme/events/CustomEvent.java
@@ -13,6 +13,14 @@ public class CustomEvent extends Event implements Cancellable {
private boolean isCancelled;
private static final HandlerList handlers = new HandlerList();
+ public CustomEvent() {
+ super(false);
+ }
+
+ public CustomEvent(boolean b) {
+ super(b);
+ }
+
public HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/fr/xephi/authme/events/FirstSpawnTeleportEvent.java b/src/main/java/fr/xephi/authme/events/FirstSpawnTeleportEvent.java
index 079a4614d..e40614602 100644
--- a/src/main/java/fr/xephi/authme/events/FirstSpawnTeleportEvent.java
+++ b/src/main/java/fr/xephi/authme/events/FirstSpawnTeleportEvent.java
@@ -16,6 +16,7 @@ public class FirstSpawnTeleportEvent extends CustomEvent {
private Location from;
public FirstSpawnTeleportEvent(Player player, Location from, Location to) {
+ super(true);
this.player = player;
this.from = from;
this.to = to;
diff --git a/src/main/java/fr/xephi/authme/events/PasswordEncryptionEvent.java b/src/main/java/fr/xephi/authme/events/PasswordEncryptionEvent.java
index 9f6ea0078..4e5a0f5cd 100644
--- a/src/main/java/fr/xephi/authme/events/PasswordEncryptionEvent.java
+++ b/src/main/java/fr/xephi/authme/events/PasswordEncryptionEvent.java
@@ -22,6 +22,7 @@ public class PasswordEncryptionEvent extends Event {
private String playerName = "";
public PasswordEncryptionEvent(EncryptionMethod method, String playerName) {
+ super(true);
this.method = method;
this.playerName = playerName;
}
diff --git a/src/main/java/fr/xephi/authme/events/ProtectInventoryEvent.java b/src/main/java/fr/xephi/authme/events/ProtectInventoryEvent.java
index eebf6f4a1..10d5636b5 100644
--- a/src/main/java/fr/xephi/authme/events/ProtectInventoryEvent.java
+++ b/src/main/java/fr/xephi/authme/events/ProtectInventoryEvent.java
@@ -20,6 +20,7 @@ public class ProtectInventoryEvent extends CustomEvent {
public ProtectInventoryEvent(Player player, ItemStack[] storedinventory,
ItemStack[] storedarmor) {
+ super(true);
this.player = player;
this.storedinventory = storedinventory;
this.storedarmor = storedarmor;
diff --git a/src/main/java/fr/xephi/authme/events/ResetInventoryEvent.java b/src/main/java/fr/xephi/authme/events/ResetInventoryEvent.java
index 84fbe206e..5c7b622e8 100644
--- a/src/main/java/fr/xephi/authme/events/ResetInventoryEvent.java
+++ b/src/main/java/fr/xephi/authme/events/ResetInventoryEvent.java
@@ -13,6 +13,7 @@ public class ResetInventoryEvent extends CustomEvent {
private Player player;
public ResetInventoryEvent(Player player) {
+ super(true);
this.player = player;
}
diff --git a/src/main/java/fr/xephi/authme/events/RestoreInventoryEvent.java b/src/main/java/fr/xephi/authme/events/RestoreInventoryEvent.java
index f51499a9e..c2c36ba42 100644
--- a/src/main/java/fr/xephi/authme/events/RestoreInventoryEvent.java
+++ b/src/main/java/fr/xephi/authme/events/RestoreInventoryEvent.java
@@ -22,6 +22,14 @@ public class RestoreInventoryEvent extends CustomEvent {
this.armor = armor;
}
+ public RestoreInventoryEvent(Player player, ItemStack[] inventory,
+ ItemStack[] armor, boolean b) {
+ super(b);
+ this.player = player;
+ this.inventory = inventory;
+ this.armor = armor;
+ }
+
public ItemStack[] getInventory() {
return this.inventory;
}
diff --git a/src/main/java/fr/xephi/authme/events/StoreInventoryEvent.java b/src/main/java/fr/xephi/authme/events/StoreInventoryEvent.java
index 785075245..c91523d87 100644
--- a/src/main/java/fr/xephi/authme/events/StoreInventoryEvent.java
+++ b/src/main/java/fr/xephi/authme/events/StoreInventoryEvent.java
@@ -28,8 +28,7 @@ public class StoreInventoryEvent extends CustomEvent {
try {
this.inventory = fileCache.readCache(player).getInventory();
this.armor = fileCache.readCache(player).getArmour();
- } catch (Exception e)
- {
+ } catch (Exception e) {
this.inventory = player.getInventory().getContents();
this.armor = player.getInventory().getArmorContents();
}
diff --git a/src/main/java/fr/xephi/authme/modules/ModuleManager.java b/src/main/java/fr/xephi/authme/modules/ModuleManager.java
new file mode 100644
index 000000000..fc1d07f62
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/modules/ModuleManager.java
@@ -0,0 +1,100 @@
+package fr.xephi.authme.modules;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+
+public class ModuleManager implements Module {
+
+ private AuthMe plugin;
+ private ModuleManager instance;
+ private List modules = new ArrayList();
+
+ public ModuleManager(AuthMe plugin) {
+ this.plugin = plugin;
+ }
+
+ @Override
+ public String getName() {
+ return "AuthMe Module Manager";
+ }
+
+ @Override
+ public AuthMe getInstanceOfAuthMe() {
+ return this.plugin;
+ }
+
+ @Override
+ public Module getInstance() {
+ if (this.instance == null)
+ instance = new ModuleManager(AuthMe.getInstance());
+ return instance;
+ }
+
+ @Override
+ public ModuleType getType() {
+ return (Module.ModuleType.MANAGER);
+ }
+
+ @Override
+ public boolean load() {
+ File dir = new File(plugin.getDataFolder() + File.separator + "modules");
+ if (dir == null || !dir.exists() || !dir.isDirectory() || dir.listFiles() == null || dir.listFiles().length <= 0)
+ return false;
+ for (File pathToJar : dir.listFiles()) {
+ JarFile jarFile = null;
+ try {
+ jarFile = new JarFile(pathToJar);
+ Enumeration> e = jarFile.entries();
+ URL[] urls = { new URL("jar:file:" + pathToJar.getAbsolutePath() + "!/") };
+ URLClassLoader cl = URLClassLoader.newInstance(urls);
+
+ while (e.hasMoreElements()) {
+ JarEntry je = (JarEntry) e.nextElement();
+ if (je.isDirectory() || !je.getName().endsWith("Main.class")) {
+ continue;
+ }
+ String className = je.getName().substring(0, je.getName().length() - 6);
+ className = className.replace('/', '.');
+ Class> c = cl.loadClass(className);
+ Module mod = (Module) c.newInstance();
+ mod.load();
+ modules.add(mod);
+ break;
+
+ }
+ } catch (Exception ex) {
+ ConsoleLogger.showError("Cannot load " + pathToJar.getName() + " jar file !");
+ } finally {
+ if (jarFile != null)
+ try {
+ jarFile.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public boolean unload() {
+ try {
+ for (Module mod : modules) {
+ mod.unload();
+ modules.remove(mod);
+ }
+ } catch (Exception e) {
+ }
+ return true;
+ }
+
+}
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index d1ef309d0..3a3e8e1f3 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -6,6 +6,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
@@ -176,25 +177,27 @@ public class AsyncronousJoin {
}
if (Settings.protectInventoryBeforeLogInEnabled) {
- sched.scheduleSyncDelayedTask(plugin, new Runnable() {
+ try {
+ LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(player.getName().toLowerCase());
+ ProtectInventoryEvent ev = new ProtectInventoryEvent(player, limbo.getInventory(), limbo.getArmour());
+ plugin.getServer().getPluginManager().callEvent(ev);
+ if (ev.isCancelled()) {
+ if (!Settings.noConsoleSpam)
+ ConsoleLogger.info("ProtectInventoryEvent has been cancelled for " + player.getName() + " ...");
+ } else {
+ final ItemStack[] inv = ev.getEmptyArmor();
+ final ItemStack[] armor = ev.getEmptyArmor();
+ sched.scheduleSyncDelayedTask(plugin, new Runnable() {
- @Override
- public void run() {
- try {
- LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(player.getName().toLowerCase());
- ProtectInventoryEvent ev = new ProtectInventoryEvent(player, limbo.getInventory(), limbo.getArmour());
- plugin.getServer().getPluginManager().callEvent(ev);
- if (ev.isCancelled()) {
- if (!Settings.noConsoleSpam)
- ConsoleLogger.info("ProtectInventoryEvent has been cancelled for " + player.getName() + " ...");
- } else {
- plugin.api.setPlayerInventory(player, ev.getEmptyInventory(), ev.getEmptyArmor());
+ @Override
+ public void run() {
+ plugin.api.setPlayerInventory(player, inv, armor);
}
- } catch (NullPointerException ex) {
- }
- }
- });
+ });
+ }
+ } catch (NullPointerException ex) {
+ }
}
String[] msg;
if (Settings.emailRegistration) {
@@ -262,21 +265,21 @@ public class AsyncronousJoin {
else {
if (Spawn.getInstance().getFirstSpawn() == null || Spawn.getInstance().getFirstSpawn().getWorld() == null)
return false;
- final Location loc = Spawn.getInstance().getFirstSpawn();
- Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+ FirstSpawnTeleportEvent tpEvent = new FirstSpawnTeleportEvent(player, player.getLocation(), Spawn.getInstance().getFirstSpawn());
+ plugin.getServer().getPluginManager().callEvent(tpEvent);
+ if (!tpEvent.isCancelled()) {
+ if (player.isOnline() && tpEvent.getTo() != null && tpEvent.getTo().getWorld() != null) {
+ final Location fLoc = tpEvent.getTo();
+ Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
- @Override
- public void run() {
- FirstSpawnTeleportEvent tpEvent = new FirstSpawnTeleportEvent(player, player.getLocation(), loc);
- plugin.getServer().getPluginManager().callEvent(tpEvent);
- if (!tpEvent.isCancelled()) {
- if (player.isOnline() && tpEvent.getTo() != null && tpEvent.getTo().getWorld() != null) {
- player.teleport(tpEvent.getTo());
+ @Override
+ public void run() {
+ player.teleport(fLoc);
}
- }
- }
- });
+ });
+ }
+ }
return true;
}
}
diff --git a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
index e7c49af87..302203b7d 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
@@ -13,6 +13,7 @@ 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.AuthMeAsyncPreLoginEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.security.RandomString;
@@ -113,6 +114,10 @@ public class AsyncronousLogin {
m.send(player, "vb_nonActiv");
return null;
}
+ AuthMeAsyncPreLoginEvent event = new AuthMeAsyncPreLoginEvent(player);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (!event.canLogin())
+ return null;
return pAuth;
}
diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
index f926c6949..4cac3864a 100644
--- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
+++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
@@ -56,13 +56,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable {
player.setFlying(true);
}
// Player is now logout... Time to fire event !
- sched.scheduleSyncDelayedTask(plugin, new Runnable() {
-
- @Override
- public void run() {
- Bukkit.getServer().getPluginManager().callEvent(new LogoutEvent(player));
- }
- });
+ Bukkit.getServer().getPluginManager().callEvent(new LogoutEvent(player));
m.send(player, "logout");
ConsoleLogger.info(player.getDisplayName() + " logged out");
}
diff --git a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
index 585ab6fa1..dd84fdc85 100644
--- a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
@@ -13,6 +13,7 @@ import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.events.RestoreInventoryEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.plugin.manager.CombatTagComunicator;
import fr.xephi.authme.settings.Settings;
@@ -21,7 +22,7 @@ public class AsyncronousQuit {
protected AuthMe plugin;
protected DataSource database;
- protected Player p;
+ protected Player player;
protected Utils utils = Utils.getInstance();
private String name;
private ItemStack[] armor = null;
@@ -33,7 +34,7 @@ public class AsyncronousQuit {
public AsyncronousQuit(Player p, AuthMe plugin, DataSource database,
boolean isKick) {
- this.p = p;
+ this.player = p;
this.plugin = plugin;
this.database = database;
this.name = p.getName().toLowerCase();
@@ -41,7 +42,8 @@ public class AsyncronousQuit {
}
public void process() {
- final Player player = p;
+ if (player == null)
+ return;
if (plugin.getCitizensCommunicator().isNPC(player) || Utils.getInstance().isUnrestricted(player) || CombatTagComunicator.isNPC(player)) {
return;
}
@@ -64,7 +66,8 @@ public class AsyncronousQuit {
inv = limbo.getInventory();
armor = limbo.getArmour();
}
- utils.addNormal(player, limbo.getGroup());
+ if (limbo.getGroup() != null && !limbo.getGroup().equals(""))
+ utils.addNormal(player, limbo.getGroup());
needToChange = true;
isOp = limbo.getOperator();
isFlying = limbo.isFlying();
@@ -94,6 +97,16 @@ public class AsyncronousQuit {
database.setUnlogged(name);
}
AuthMePlayerListener.gameMode.remove(name);
- Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSyncronousPlayerQuit(plugin, player, inv, armor, isOp, isFlying, needToChange));
+ final Player p = player;
+ RestoreInventoryEvent ev = new RestoreInventoryEvent(player, inv, armor, true);
+ Bukkit.getPluginManager().callEvent(ev);
+ if (ev.isCancelled()) {
+ inv = null;
+ armor = null;
+ } else {
+ inv = ev.getInventory();
+ armor = ev.getArmor();
+ }
+ Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSyncronousPlayerQuit(plugin, p, inv, armor, isOp, isFlying, needToChange));
}
}
diff --git a/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java b/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java
index b21a78bfe..488134099 100644
--- a/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java
@@ -5,7 +5,6 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.events.RestoreInventoryEvent;
import fr.xephi.authme.settings.Settings;
public class ProcessSyncronousPlayerQuit implements Runnable {
@@ -32,13 +31,8 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
@Override
public void run() {
- if (inv != null && armor != null) {
- RestoreInventoryEvent ev = new RestoreInventoryEvent(player, inv, armor);
- player.getServer().getPluginManager().callEvent(ev);
- if (!ev.isCancelled()) {
- plugin.api.setPlayerInventory(player, ev.getInventory(), ev.getArmor());
- }
- }
+ if (inv != null && armor != null)
+ plugin.api.setPlayerInventory(player, inv, armor);
if (needToChange) {
player.setOp(isOp);
if (player.getGameMode() != GameMode.CREATIVE && !Settings.isMovementAllowed) {
diff --git a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
index a9fd19e53..312b6df01 100644
--- a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
+++ b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
@@ -29,6 +29,7 @@ public enum HashAlgorithm {
ROYALAUTH(fr.xephi.authme.security.crypts.ROYALAUTH.class),
CRAZYCRYPT1(fr.xephi.authme.security.crypts.CRAZYCRYPT1.class),
BCRYPT2Y(fr.xephi.authme.security.crypts.BCRYPT2Y.class),
+ SALTEDSHA512(fr.xephi.authme.security.crypts.SALTEDSHA512.class),
CUSTOM(Null.class);
Class> classe;
diff --git a/src/main/java/fr/xephi/authme/security/PasswordSecurity.java b/src/main/java/fr/xephi/authme/security/PasswordSecurity.java
index bfc2fb2d6..305b89b63 100644
--- a/src/main/java/fr/xephi/authme/security/PasswordSecurity.java
+++ b/src/main/java/fr/xephi/authme/security/PasswordSecurity.java
@@ -96,7 +96,12 @@ public class PasswordSecurity {
userSalt.put(playerName, salt);
break;
case BCRYPT2Y:
- salt = createSalt(22);
+ salt = createSalt(16);
+ userSalt.put(playerName, salt);
+ break;
+ case SALTEDSHA512:
+ salt = createSalt(32);
+ userSalt.put(playerName, salt);
break;
case MD5:
case SHA1:
@@ -165,7 +170,7 @@ public class PasswordSecurity {
PlayerAuth nAuth = AuthMe.getInstance().database.getAuth(playerName);
if (nAuth != null) {
nAuth.setHash(getHash(Settings.getPasswordHash, password, playerName));
- nAuth.setSalt(userSalt.get(playerName));
+ nAuth.setSalt(userSalt.containsKey(playerName) ? userSalt.get(playerName) : "");
AuthMe.getInstance().database.updatePassword(nAuth);
AuthMe.getInstance().database.updateSalt(nAuth);
}
diff --git a/src/main/java/fr/xephi/authme/security/crypts/SALTEDSHA512.java b/src/main/java/fr/xephi/authme/security/crypts/SALTEDSHA512.java
new file mode 100644
index 000000000..0050dd73d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/security/crypts/SALTEDSHA512.java
@@ -0,0 +1,32 @@
+package fr.xephi.authme.security.crypts;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import fr.xephi.authme.AuthMe;
+
+public class SALTEDSHA512 implements EncryptionMethod {
+
+ @Override
+ public String getHash(String password, String salt, String name)
+ throws NoSuchAlgorithmException {
+ return getSHA512(password + salt);
+ }
+
+ @Override
+ public boolean comparePassword(String hash, String password,
+ String playerName) throws NoSuchAlgorithmException {
+ String salt = AuthMe.getInstance().database.getAuth(playerName).getSalt();
+ return hash.equals(getHash(password, salt, ""));
+ }
+
+ private static String getSHA512(String message)
+ throws NoSuchAlgorithmException {
+ MessageDigest sha512 = MessageDigest.getInstance("SHA-512");
+ sha512.reset();
+ sha512.update(message.getBytes());
+ byte[] digest = sha512.digest();
+ return String.format("%0" + (digest.length << 1) + "x", new BigInteger(1, digest));
+ }
+}