mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-12-02 23:23:39 +01:00
First attempt to implement MsSQL datasource
needs review
This commit is contained in:
parent
a801f03cf2
commit
b7304397b4
25
pom.xml
25
pom.xml
@ -176,6 +176,18 @@
|
|||||||
<pattern>com.zaxxer.hikari</pattern>
|
<pattern>com.zaxxer.hikari</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.zaxxer.hikari</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.zaxxer.hikari</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>mssql</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.mssql</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.microsoft.sqlserver</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.com.microsoft.sqlserver</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>microsoft.sql</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.microsoft.sql</shadedPattern>
|
||||||
|
</relocation>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>org.slf4j</pattern>
|
<pattern>org.slf4j</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.slf4j.slf4j</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.slf4j.slf4j</shadedPattern>
|
||||||
@ -379,11 +391,22 @@
|
|||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- MsSQL driver -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.microsoft.sqlserver</groupId>
|
||||||
|
<artifactId>mssql-jdbc</artifactId>
|
||||||
|
<version>6.3.0.jre8-preview</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- PBKDF2 implementation -->
|
<!-- PBKDF2 implementation -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.rtner</groupId>
|
<groupId>de.rtner</groupId>
|
||||||
<artifactId>PBKDF2</artifactId>
|
<artifactId>PBKDF2</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.1.2</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Spigot API, http://www.spigotmc.org/ -->
|
<!-- Spigot API, http://www.spigotmc.org/ -->
|
||||||
@ -423,6 +446,8 @@
|
|||||||
<groupId>org.bstats</groupId>
|
<groupId>org.bstats</groupId>
|
||||||
<artifactId>bstats-bukkit</artifactId>
|
<artifactId>bstats-bukkit</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- ProtocolLib -->
|
<!-- ProtocolLib -->
|
||||||
|
@ -7,6 +7,8 @@ public enum DataSourceType {
|
|||||||
|
|
||||||
MYSQL,
|
MYSQL,
|
||||||
|
|
||||||
|
MSSQL,
|
||||||
|
|
||||||
SQLITE,
|
SQLITE,
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
54
src/main/java/fr/xephi/authme/datasource/MsSQL.java
Normal file
54
src/main/java/fr/xephi/authme/datasource/MsSQL.java
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
package fr.xephi.authme.datasource;
|
||||||
|
|
||||||
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.Statement;
|
||||||
|
|
||||||
|
public class MsSQL extends SqlDataSource {
|
||||||
|
|
||||||
|
public MsSQL(Settings settings, SqlExtensionsFactory extensionsFactory) throws SQLException {
|
||||||
|
super(settings, extensionsFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
MsSQL(Settings settings, HikariDataSource hikariDataSource, SqlExtensionsFactory extensionsFactory) {
|
||||||
|
super(settings, hikariDataSource, extensionsFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setConnectionArguments() {
|
||||||
|
super.setConnectionArguments();
|
||||||
|
|
||||||
|
// Database URL
|
||||||
|
ds.setDataSourceClassName("com.microsoft.sqlserver.jdbc.SQLServerDataSource");
|
||||||
|
ds.addDataSourceProperty("serverName", host);
|
||||||
|
ds.addDataSourceProperty("port", port);
|
||||||
|
ds.addDataSourceProperty("databaseName", database);
|
||||||
|
|
||||||
|
// Auth
|
||||||
|
ds.addDataSourceProperty("user", username);
|
||||||
|
ds.addDataSourceProperty("password", password);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void checkTables() throws SQLException {
|
||||||
|
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
||||||
|
// Create table with ID column if it doesn't exist
|
||||||
|
String sql = "IF object_id('" + tableName + "') IS NOT NULL\n" +
|
||||||
|
" CREATE TABLE " + tableName
|
||||||
|
+ " (" + col.ID + " INT CHECK (" + col.ID + " > 0) IDENTITY" +
|
||||||
|
", PRIMARY KEY (" + col.ID + ")) CHARACTER SET = utf8;";
|
||||||
|
st.executeUpdate(sql);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DataSourceType getType() {
|
||||||
|
return DataSourceType.MSSQL;
|
||||||
|
}
|
||||||
|
}
|
@ -2,120 +2,36 @@ package fr.xephi.authme.datasource;
|
|||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
import fr.xephi.authme.ConsoleLogger;
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
|
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
|
|
||||||
import fr.xephi.authme.security.crypts.HashedPassword;
|
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
||||||
import fr.xephi.authme.settings.properties.HooksSettings;
|
|
||||||
import fr.xephi.authme.util.StringUtils;
|
|
||||||
import fr.xephi.authme.util.Utils;
|
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DatabaseMetaData;
|
|
||||||
import java.sql.PreparedStatement;
|
|
||||||
import java.sql.ResultSet;
|
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
||||||
import java.sql.Types;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
|
public class MySQL extends SqlDataSource {
|
||||||
|
|
||||||
public class MySQL implements DataSource {
|
|
||||||
|
|
||||||
private boolean useSsl;
|
private boolean useSsl;
|
||||||
private String host;
|
|
||||||
private String port;
|
|
||||||
private String username;
|
|
||||||
private String password;
|
|
||||||
private String database;
|
|
||||||
private String tableName;
|
|
||||||
private int poolSize;
|
|
||||||
private int maxLifetime;
|
|
||||||
private List<String> columnOthers;
|
|
||||||
private Columns col;
|
|
||||||
private MySqlExtension sqlExtension;
|
|
||||||
private HikariDataSource ds;
|
|
||||||
|
|
||||||
public MySQL(Settings settings, MySqlExtensionsFactory extensionsFactory) throws SQLException {
|
public MySQL(Settings settings, SqlExtensionsFactory extensionsFactory) throws SQLException {
|
||||||
setParameters(settings, extensionsFactory);
|
super(settings, extensionsFactory);
|
||||||
|
|
||||||
// Set the connection arguments (and check if connection is ok)
|
|
||||||
try {
|
|
||||||
this.setConnectionArguments();
|
|
||||||
} catch (RuntimeException e) {
|
|
||||||
if (e instanceof IllegalArgumentException) {
|
|
||||||
ConsoleLogger.warning("Invalid database arguments! Please check your configuration!");
|
|
||||||
ConsoleLogger.warning("If this error persists, please report it to the developer!");
|
|
||||||
}
|
|
||||||
if (e instanceof PoolInitializationException) {
|
|
||||||
ConsoleLogger.warning("Can't initialize database connection! Please check your configuration!");
|
|
||||||
ConsoleLogger.warning("If this error persists, please report it to the developer!");
|
|
||||||
}
|
|
||||||
ConsoleLogger.warning("Can't use the Hikari Connection Pool! Please, report this error to the developer!");
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize the database
|
|
||||||
try {
|
|
||||||
checkTablesAndColumns();
|
|
||||||
} catch (SQLException e) {
|
|
||||||
closeConnection();
|
|
||||||
ConsoleLogger.logException("Can't initialize the MySQL database:", e);
|
|
||||||
ConsoleLogger.warning("Please check your database settings in the config.yml file!");
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
MySQL(Settings settings, HikariDataSource hikariDataSource, MySqlExtensionsFactory extensionsFactory) {
|
MySQL(Settings settings, HikariDataSource hikariDataSource, SqlExtensionsFactory extensionsFactory) {
|
||||||
ds = hikariDataSource;
|
super(settings, hikariDataSource, extensionsFactory);
|
||||||
setParameters(settings, extensionsFactory);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* Retrieves various settings.
|
protected void setParameters(Settings settings, SqlExtensionsFactory extensionsFactory) {
|
||||||
*
|
super.setParameters(settings, extensionsFactory);
|
||||||
* @param settings the settings to read properties from
|
|
||||||
* @param extensionsFactory factory to create the MySQL extension
|
|
||||||
*/
|
|
||||||
private void setParameters(Settings settings, MySqlExtensionsFactory extensionsFactory) {
|
|
||||||
this.host = settings.getProperty(DatabaseSettings.MYSQL_HOST);
|
|
||||||
this.port = settings.getProperty(DatabaseSettings.MYSQL_PORT);
|
|
||||||
this.username = settings.getProperty(DatabaseSettings.MYSQL_USERNAME);
|
|
||||||
this.password = settings.getProperty(DatabaseSettings.MYSQL_PASSWORD);
|
|
||||||
this.database = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
|
|
||||||
this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
|
|
||||||
this.columnOthers = settings.getProperty(HooksSettings.MYSQL_OTHER_USERNAME_COLS);
|
|
||||||
this.col = new Columns(settings);
|
|
||||||
sqlExtension = extensionsFactory.buildExtension(col);
|
|
||||||
this.poolSize = settings.getProperty(DatabaseSettings.MYSQL_POOL_SIZE);
|
|
||||||
if (poolSize == -1) {
|
|
||||||
poolSize = Utils.getCoreCount() * 3;
|
|
||||||
}
|
|
||||||
this.maxLifetime = settings.getProperty(DatabaseSettings.MYSQL_CONNECTION_MAX_LIFETIME);
|
|
||||||
this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
|
this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* Sets up the connection arguments to the database.
|
protected void setConnectionArguments() {
|
||||||
*/
|
super.setConnectionArguments();
|
||||||
private void setConnectionArguments() {
|
|
||||||
ds = new HikariDataSource();
|
|
||||||
ds.setPoolName("AuthMeMYSQLPool");
|
|
||||||
|
|
||||||
// Pool Settings
|
|
||||||
ds.setMaximumPoolSize(poolSize);
|
|
||||||
ds.setMaxLifetime(maxLifetime * 1000);
|
|
||||||
|
|
||||||
|
|
||||||
// Database URL
|
// Database URL
|
||||||
ds.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
|
ds.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
|
||||||
@ -140,27 +56,10 @@ public class MySQL implements DataSource {
|
|||||||
ds.addDataSourceProperty("cachePrepStmts", "true");
|
ds.addDataSourceProperty("cachePrepStmts", "true");
|
||||||
ds.addDataSourceProperty("prepStmtCacheSize", "275");
|
ds.addDataSourceProperty("prepStmtCacheSize", "275");
|
||||||
ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
|
ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
|
||||||
|
|
||||||
ConsoleLogger.info("Connection arguments loaded, Hikari ConnectionPool ready!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reload() {
|
protected void checkTables() throws SQLException {
|
||||||
if (ds != null) {
|
|
||||||
ds.close();
|
|
||||||
}
|
|
||||||
setConnectionArguments();
|
|
||||||
ConsoleLogger.info("Hikari ConnectionPool arguments reloaded!");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Connection getConnection() throws SQLException {
|
|
||||||
return ds.getConnection();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates the table or any of its required columns if they don't exist.
|
|
||||||
*/
|
|
||||||
private void checkTablesAndColumns() throws SQLException {
|
|
||||||
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
||||||
// Create table with ID column if it doesn't exist
|
// Create table with ID column if it doesn't exist
|
||||||
String sql = "CREATE TABLE IF NOT EXISTS " + tableName + " ("
|
String sql = "CREATE TABLE IF NOT EXISTS " + tableName + " ("
|
||||||
@ -168,357 +67,6 @@ public class MySQL implements DataSource {
|
|||||||
+ "PRIMARY KEY (" + col.ID + ")"
|
+ "PRIMARY KEY (" + col.ID + ")"
|
||||||
+ ") CHARACTER SET = utf8;";
|
+ ") CHARACTER SET = utf8;";
|
||||||
st.executeUpdate(sql);
|
st.executeUpdate(sql);
|
||||||
|
|
||||||
DatabaseMetaData md = con.getMetaData();
|
|
||||||
if (isColumnMissing(md, col.NAME)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName
|
|
||||||
+ " ADD COLUMN " + col.NAME + " VARCHAR(255) NOT NULL UNIQUE AFTER " + col.ID + ";");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.REAL_NAME)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName
|
|
||||||
+ " ADD COLUMN " + col.REAL_NAME + " VARCHAR(255) NOT NULL AFTER " + col.NAME + ";");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.PASSWORD)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName
|
|
||||||
+ " ADD COLUMN " + col.PASSWORD + " VARCHAR(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL;");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!col.SALT.isEmpty() && isColumnMissing(md, col.SALT)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.SALT + " VARCHAR(255);");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.IP)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName
|
|
||||||
+ " ADD COLUMN " + col.IP + " VARCHAR(40) CHARACTER SET ascii COLLATE ascii_bin NOT NULL;");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.LAST_LOGIN)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName
|
|
||||||
+ " ADD COLUMN " + col.LAST_LOGIN + " BIGINT NOT NULL DEFAULT 0;");
|
|
||||||
} else {
|
|
||||||
migrateLastLoginColumn(con, md);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.LASTLOC_X)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.LASTLOC_X + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LAST_LOGIN + " , ADD "
|
|
||||||
+ col.LASTLOC_Y + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LASTLOC_X + " , ADD "
|
|
||||||
+ col.LASTLOC_Z + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LASTLOC_Y);
|
|
||||||
} else {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " MODIFY "
|
|
||||||
+ col.LASTLOC_X + " DOUBLE NOT NULL DEFAULT '0.0', MODIFY "
|
|
||||||
+ col.LASTLOC_Y + " DOUBLE NOT NULL DEFAULT '0.0', MODIFY "
|
|
||||||
+ col.LASTLOC_Z + " DOUBLE NOT NULL DEFAULT '0.0';");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.LASTLOC_WORLD)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.LASTLOC_WORLD + " VARCHAR(255) NOT NULL DEFAULT 'world' AFTER " + col.LASTLOC_Z);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.LASTLOC_YAW)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.LASTLOC_YAW + " FLOAT;");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.LASTLOC_PITCH)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.LASTLOC_PITCH + " FLOAT;");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.EMAIL)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.EMAIL + " VARCHAR(255) DEFAULT 'your@email.com' AFTER " + col.LASTLOC_WORLD);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isColumnMissing(md, col.IS_LOGGED)) {
|
|
||||||
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
|
||||||
+ col.IS_LOGGED + " SMALLINT NOT NULL DEFAULT '0' AFTER " + col.EMAIL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ConsoleLogger.info("MySQL setup finished");
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isColumnMissing(DatabaseMetaData metaData, String columnName) throws SQLException {
|
|
||||||
try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
|
|
||||||
return !rs.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAuthAvailable(String user) {
|
|
||||||
String sql = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, user.toLowerCase());
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
return rs.next();
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public HashedPassword getPassword(String user) {
|
|
||||||
boolean useSalt = !col.SALT.isEmpty();
|
|
||||||
String sql = "SELECT " + col.PASSWORD
|
|
||||||
+ (useSalt ? ", " + col.SALT : "")
|
|
||||||
+ " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, user.toLowerCase());
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
if (rs.next()) {
|
|
||||||
return new HashedPassword(rs.getString(col.PASSWORD),
|
|
||||||
useSalt ? rs.getString(col.SALT) : null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public PlayerAuth getAuth(String user) {
|
|
||||||
String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
PlayerAuth auth;
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, user.toLowerCase());
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
if (rs.next()) {
|
|
||||||
int id = rs.getInt(col.ID);
|
|
||||||
auth = buildAuthFromResultSet(rs);
|
|
||||||
sqlExtension.extendAuth(auth, id, con);
|
|
||||||
return auth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean saveAuth(PlayerAuth auth) {
|
|
||||||
try (Connection con = getConnection()) {
|
|
||||||
String sql;
|
|
||||||
|
|
||||||
boolean useSalt = !col.SALT.isEmpty() || !StringUtils.isEmpty(auth.getPassword().getSalt());
|
|
||||||
sql = "INSERT INTO " + tableName + "("
|
|
||||||
+ col.NAME + "," + col.PASSWORD + "," + col.IP + ","
|
|
||||||
+ col.LAST_LOGIN + "," + col.REAL_NAME + "," + col.EMAIL
|
|
||||||
+ (useSalt ? "," + col.SALT : "")
|
|
||||||
+ ") VALUES (?,?,?,?,?,?" + (useSalt ? ",?" : "") + ");";
|
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, auth.getNickname());
|
|
||||||
pst.setString(2, auth.getPassword().getHash());
|
|
||||||
pst.setString(3, auth.getIp());
|
|
||||||
pst.setLong(4, auth.getLastLogin());
|
|
||||||
pst.setString(5, auth.getRealName());
|
|
||||||
pst.setString(6, auth.getEmail());
|
|
||||||
if (useSalt) {
|
|
||||||
pst.setString(7, auth.getPassword().getSalt());
|
|
||||||
}
|
|
||||||
pst.executeUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!columnOthers.isEmpty()) {
|
|
||||||
for (String column : columnOthers) {
|
|
||||||
try (PreparedStatement pst = con.prepareStatement("UPDATE " + tableName + " SET " + column + "=? WHERE " + col.NAME + "=?;")) {
|
|
||||||
pst.setString(1, auth.getRealName());
|
|
||||||
pst.setString(2, auth.getNickname());
|
|
||||||
pst.executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sqlExtension.saveAuth(auth, con);
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updatePassword(PlayerAuth auth) {
|
|
||||||
return updatePassword(auth.getNickname(), auth.getPassword());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updatePassword(String user, HashedPassword password) {
|
|
||||||
user = user.toLowerCase();
|
|
||||||
try (Connection con = getConnection()) {
|
|
||||||
boolean useSalt = !col.SALT.isEmpty();
|
|
||||||
if (useSalt) {
|
|
||||||
String sql = String.format("UPDATE %s SET %s = ?, %s = ? WHERE %s = ?;",
|
|
||||||
tableName, col.PASSWORD, col.SALT, col.NAME);
|
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, password.getHash());
|
|
||||||
pst.setString(2, password.getSalt());
|
|
||||||
pst.setString(3, user);
|
|
||||||
pst.executeUpdate();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
String sql = String.format("UPDATE %s SET %s = ? WHERE %s = ?;",
|
|
||||||
tableName, col.PASSWORD, col.NAME);
|
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, password.getHash());
|
|
||||||
pst.setString(2, user);
|
|
||||||
pst.executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sqlExtension.changePassword(user, password, con);
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updateSession(PlayerAuth auth) {
|
|
||||||
String sql = "UPDATE " + tableName + " SET "
|
|
||||||
+ col.IP + "=?, " + col.LAST_LOGIN + "=?, " + col.REAL_NAME + "=? WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, auth.getIp());
|
|
||||||
pst.setLong(2, auth.getLastLogin());
|
|
||||||
pst.setString(3, auth.getRealName());
|
|
||||||
pst.setString(4, auth.getNickname());
|
|
||||||
pst.executeUpdate();
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Set<String> getRecordsToPurge(long until, boolean includeEntriesWithLastLoginZero) {
|
|
||||||
Set<String> list = new HashSet<>();
|
|
||||||
String select = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.LAST_LOGIN + " < ?";
|
|
||||||
if (!includeEntriesWithLastLoginZero) {
|
|
||||||
select += " AND " + col.LAST_LOGIN + " <> 0";
|
|
||||||
}
|
|
||||||
try (Connection con = getConnection();
|
|
||||||
PreparedStatement selectPst = con.prepareStatement(select)) {
|
|
||||||
selectPst.setLong(1, until);
|
|
||||||
try (ResultSet rs = selectPst.executeQuery()) {
|
|
||||||
while (rs.next()) {
|
|
||||||
list.add(rs.getString(col.NAME));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean removeAuth(String user) {
|
|
||||||
user = user.toLowerCase();
|
|
||||||
String sql = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
sqlExtension.removeAuth(user, con);
|
|
||||||
pst.setString(1, user.toLowerCase());
|
|
||||||
pst.executeUpdate();
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updateQuitLoc(PlayerAuth auth) {
|
|
||||||
String sql = "UPDATE " + tableName
|
|
||||||
+ " SET " + col.LASTLOC_X + " =?, " + col.LASTLOC_Y + "=?, " + col.LASTLOC_Z + "=?, "
|
|
||||||
+ col.LASTLOC_WORLD + "=?, " + col.LASTLOC_YAW + "=?, " + col.LASTLOC_PITCH + "=?"
|
|
||||||
+ " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setDouble(1, auth.getQuitLocX());
|
|
||||||
pst.setDouble(2, auth.getQuitLocY());
|
|
||||||
pst.setDouble(3, auth.getQuitLocZ());
|
|
||||||
pst.setString(4, auth.getWorld());
|
|
||||||
pst.setFloat(5, auth.getYaw());
|
|
||||||
pst.setFloat(6, auth.getPitch());
|
|
||||||
pst.setString(7, auth.getNickname());
|
|
||||||
pst.executeUpdate();
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updateEmail(PlayerAuth auth) {
|
|
||||||
String sql = "UPDATE " + tableName + " SET " + col.EMAIL + " =? WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, auth.getEmail());
|
|
||||||
pst.setString(2, auth.getNickname());
|
|
||||||
pst.executeUpdate();
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void closeConnection() {
|
|
||||||
if (ds != null && !ds.isClosed()) {
|
|
||||||
ds.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getAllAuthsByIp(String ip) {
|
|
||||||
List<String> result = new ArrayList<>();
|
|
||||||
String sql = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.IP + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, ip);
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
while (rs.next()) {
|
|
||||||
result.add(rs.getString(col.NAME));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int countAuthsByEmail(String email) {
|
|
||||||
String sql = "SELECT COUNT(1) FROM " + tableName + " WHERE UPPER(" + col.EMAIL + ") = UPPER(?)";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, email);
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
if (rs.next()) {
|
|
||||||
return rs.getInt(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void purgeRecords(Collection<String> toPurge) {
|
|
||||||
String sql = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
for (String name : toPurge) {
|
|
||||||
pst.setString(1, name.toLowerCase());
|
|
||||||
pst.executeUpdate();
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -526,235 +74,4 @@ public class MySQL implements DataSource {
|
|||||||
public DataSourceType getType() {
|
public DataSourceType getType() {
|
||||||
return DataSourceType.MYSQL;
|
return DataSourceType.MYSQL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isLogged(String user) {
|
|
||||||
String sql = "SELECT " + col.IS_LOGGED + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, user);
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
return rs.next() && (rs.getInt(col.IS_LOGGED) == 1);
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setLogged(String user) {
|
|
||||||
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setInt(1, 1);
|
|
||||||
pst.setString(2, user.toLowerCase());
|
|
||||||
pst.executeUpdate();
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setUnlogged(String user) {
|
|
||||||
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setInt(1, 0);
|
|
||||||
pst.setString(2, user.toLowerCase());
|
|
||||||
pst.executeUpdate();
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void purgeLogged() {
|
|
||||||
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.IS_LOGGED + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setInt(1, 0);
|
|
||||||
pst.setInt(2, 1);
|
|
||||||
pst.executeUpdate();
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getAccountsRegistered() {
|
|
||||||
int result = 0;
|
|
||||||
String sql = "SELECT COUNT(*) FROM " + tableName;
|
|
||||||
try (Connection con = getConnection();
|
|
||||||
Statement st = con.createStatement();
|
|
||||||
ResultSet rs = st.executeQuery(sql)) {
|
|
||||||
if (rs.next()) {
|
|
||||||
result = rs.getInt(1);
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean updateRealName(String user, String realName) {
|
|
||||||
String sql = "UPDATE " + tableName + " SET " + col.REAL_NAME + "=? WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, realName);
|
|
||||||
pst.setString(2, user);
|
|
||||||
pst.executeUpdate();
|
|
||||||
return true;
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DataSourceResult<String> getEmail(String user) {
|
|
||||||
String sql = "SELECT " + col.EMAIL + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
|
||||||
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.setString(1, user);
|
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
|
||||||
if (rs.next()) {
|
|
||||||
return DataSourceResult.of(rs.getString(1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return DataSourceResult.unknownPlayer();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<PlayerAuth> getAllAuths() {
|
|
||||||
List<PlayerAuth> auths = new ArrayList<>();
|
|
||||||
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
|
||||||
try (ResultSet rs = st.executeQuery("SELECT * FROM " + tableName)) {
|
|
||||||
while (rs.next()) {
|
|
||||||
PlayerAuth auth = buildAuthFromResultSet(rs);
|
|
||||||
sqlExtension.extendAuth(auth, rs.getInt(col.ID), con);
|
|
||||||
auths.add(auth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return auths;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getLoggedPlayersWithEmptyMail() {
|
|
||||||
List<String> players = new ArrayList<>();
|
|
||||||
String sql = "SELECT " + col.REAL_NAME + " FROM " + tableName + " WHERE " + col.IS_LOGGED + " = 1"
|
|
||||||
+ " AND (" + col.EMAIL + " = 'your@email.com' OR " + col.EMAIL + " IS NULL);";
|
|
||||||
try (Connection con = getConnection();
|
|
||||||
Statement st = con.createStatement();
|
|
||||||
ResultSet rs = st.executeQuery(sql)) {
|
|
||||||
while (rs.next()) {
|
|
||||||
players.add(rs.getString(1));
|
|
||||||
}
|
|
||||||
} catch (SQLException ex) {
|
|
||||||
logSqlException(ex);
|
|
||||||
}
|
|
||||||
return players;
|
|
||||||
}
|
|
||||||
|
|
||||||
private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
|
|
||||||
String salt = col.SALT.isEmpty() ? null : row.getString(col.SALT);
|
|
||||||
int group = col.GROUP.isEmpty() ? -1 : row.getInt(col.GROUP);
|
|
||||||
return PlayerAuth.builder()
|
|
||||||
.name(row.getString(col.NAME))
|
|
||||||
.realName(row.getString(col.REAL_NAME))
|
|
||||||
.password(row.getString(col.PASSWORD), salt)
|
|
||||||
.lastLogin(row.getLong(col.LAST_LOGIN))
|
|
||||||
.ip(row.getString(col.IP))
|
|
||||||
.locWorld(row.getString(col.LASTLOC_WORLD))
|
|
||||||
.locX(row.getDouble(col.LASTLOC_X))
|
|
||||||
.locY(row.getDouble(col.LASTLOC_Y))
|
|
||||||
.locZ(row.getDouble(col.LASTLOC_Z))
|
|
||||||
.locYaw(row.getFloat(col.LASTLOC_YAW))
|
|
||||||
.locPitch(row.getFloat(col.LASTLOC_PITCH))
|
|
||||||
.email(row.getString(col.EMAIL))
|
|
||||||
.groupId(group)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the last login column has a type that needs to be migrated.
|
|
||||||
*
|
|
||||||
* @param con connection to the database
|
|
||||||
* @param metaData lastlogin column meta data
|
|
||||||
*
|
|
||||||
* @throws SQLException .
|
|
||||||
*/
|
|
||||||
private void migrateLastLoginColumn(Connection con, DatabaseMetaData metaData) throws SQLException {
|
|
||||||
final int columnType;
|
|
||||||
try (ResultSet rs = metaData.getColumns(null, null, tableName, col.LAST_LOGIN)) {
|
|
||||||
if (!rs.next()) {
|
|
||||||
ConsoleLogger.warning("Could not get LAST_LOGIN meta data. This should never happen!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
columnType = rs.getInt("DATA_TYPE");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (columnType == Types.TIMESTAMP) {
|
|
||||||
migrateLastLoginColumnFromTimestamp(con);
|
|
||||||
} else if (columnType == Types.INTEGER) {
|
|
||||||
migrateLastLoginColumnFromInt(con);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Performs conversion of lastlogin column from timestamp type to bigint.
|
|
||||||
*
|
|
||||||
* @param con connection to the database
|
|
||||||
*/
|
|
||||||
private void migrateLastLoginColumnFromTimestamp(Connection con) throws SQLException {
|
|
||||||
ConsoleLogger.info("Migrating lastlogin column from timestamp to bigint");
|
|
||||||
final String lastLoginOld = col.LAST_LOGIN + "_old";
|
|
||||||
|
|
||||||
// Rename lastlogin to lastlogin_old
|
|
||||||
String sql = String.format("ALTER TABLE %s CHANGE COLUMN %s %s BIGINT",
|
|
||||||
tableName, col.LAST_LOGIN, lastLoginOld);
|
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
|
||||||
pst.execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create lastlogin column
|
|
||||||
sql = String.format("ALTER TABLE %s ADD COLUMN %s "
|
|
||||||
+ "BIGINT NOT NULL DEFAULT 0 AFTER %s",
|
|
||||||
tableName, col.LAST_LOGIN, col.IP);
|
|
||||||
con.prepareStatement(sql).execute();
|
|
||||||
|
|
||||||
// Set values of lastlogin based on lastlogin_old
|
|
||||||
sql = String.format("UPDATE %s SET %s = UNIX_TIMESTAMP(%s) * 1000",
|
|
||||||
tableName, col.LAST_LOGIN, lastLoginOld);
|
|
||||||
con.prepareStatement(sql).execute();
|
|
||||||
|
|
||||||
// Drop lastlogin_old
|
|
||||||
sql = String.format("ALTER TABLE %s DROP COLUMN %s",
|
|
||||||
tableName, lastLoginOld);
|
|
||||||
con.prepareStatement(sql).execute();
|
|
||||||
ConsoleLogger.info("Finished migration of lastlogin (timestamp to bigint)");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Performs conversion of lastlogin column from int to bigint.
|
|
||||||
*
|
|
||||||
* @param con connection to the database
|
|
||||||
*/
|
|
||||||
private void migrateLastLoginColumnFromInt(Connection con) throws SQLException {
|
|
||||||
// Change from int to bigint
|
|
||||||
ConsoleLogger.info("Migrating lastlogin column from int to bigint");
|
|
||||||
String sql = String.format("ALTER TABLE %s MODIFY %s BIGINT;", tableName, col.LAST_LOGIN);
|
|
||||||
con.prepareStatement(sql).execute();
|
|
||||||
|
|
||||||
// Migrate timestamps in seconds format to milliseconds format if they are plausible
|
|
||||||
int rangeStart = 1262304000; // timestamp for 2010-01-01
|
|
||||||
int rangeEnd = 1514678400; // timestamp for 2017-12-31
|
|
||||||
sql = String.format("UPDATE %s SET %s = %s * 1000 WHERE %s > %d AND %s < %d;",
|
|
||||||
tableName, col.LAST_LOGIN, col.LAST_LOGIN, col.LAST_LOGIN, rangeStart, col.LAST_LOGIN, rangeEnd);
|
|
||||||
int changedRows = con.prepareStatement(sql).executeUpdate();
|
|
||||||
|
|
||||||
ConsoleLogger.warning("You may have entries with invalid timestamps. Please check your data "
|
|
||||||
+ "before purging. " + changedRows + " rows were migrated from seconds to milliseconds.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
728
src/main/java/fr/xephi/authme/datasource/SqlDataSource.java
Normal file
728
src/main/java/fr/xephi/authme/datasource/SqlDataSource.java
Normal file
@ -0,0 +1,728 @@
|
|||||||
|
package fr.xephi.authme.datasource;
|
||||||
|
|
||||||
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
|
import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
|
||||||
|
import fr.xephi.authme.ConsoleLogger;
|
||||||
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtension;
|
||||||
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
|
import fr.xephi.authme.security.crypts.HashedPassword;
|
||||||
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
||||||
|
import fr.xephi.authme.settings.properties.HooksSettings;
|
||||||
|
import fr.xephi.authme.util.StringUtils;
|
||||||
|
import fr.xephi.authme.util.Utils;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.DatabaseMetaData;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.Statement;
|
||||||
|
import java.sql.Types;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
|
||||||
|
|
||||||
|
public abstract class SqlDataSource implements DataSource {
|
||||||
|
|
||||||
|
protected String host;
|
||||||
|
protected String port;
|
||||||
|
protected String username;
|
||||||
|
protected String password;
|
||||||
|
protected String database;
|
||||||
|
protected String tableName;
|
||||||
|
private int poolSize;
|
||||||
|
private int maxLifetime;
|
||||||
|
private List<String> columnOthers;
|
||||||
|
protected Columns col;
|
||||||
|
private SqlExtension sqlExtension;
|
||||||
|
protected HikariDataSource ds;
|
||||||
|
|
||||||
|
public SqlDataSource(Settings settings, SqlExtensionsFactory extensionsFactory) throws SQLException {
|
||||||
|
setParameters(settings, extensionsFactory);
|
||||||
|
|
||||||
|
// Set the connection arguments (and check if connection is ok)
|
||||||
|
try {
|
||||||
|
this.setConnectionArguments();
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
if (e instanceof IllegalArgumentException) {
|
||||||
|
ConsoleLogger.warning("Invalid database arguments! Please check your configuration!");
|
||||||
|
ConsoleLogger.warning("If this error persists, please report it to the developer!");
|
||||||
|
}
|
||||||
|
if (e instanceof PoolInitializationException) {
|
||||||
|
ConsoleLogger.warning("Can't initialize database connection! Please check your configuration!");
|
||||||
|
ConsoleLogger.warning("If this error persists, please report it to the developer!");
|
||||||
|
}
|
||||||
|
ConsoleLogger.warning("Can't use the Hikari Connection Pool! Please, report this error to the developer!");
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize the database
|
||||||
|
try {
|
||||||
|
checkTables();
|
||||||
|
checkColumns();
|
||||||
|
ConsoleLogger.info("MySQL setup finished");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
closeConnection();
|
||||||
|
ConsoleLogger.logException("Can't initialize the SQL database:", e);
|
||||||
|
ConsoleLogger.warning("Please check your database settings in the config.yml file!");
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
SqlDataSource(Settings settings, HikariDataSource hikariDataSource, SqlExtensionsFactory extensionsFactory) {
|
||||||
|
ds = hikariDataSource;
|
||||||
|
setParameters(settings, extensionsFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves various settings.
|
||||||
|
*
|
||||||
|
* @param settings the settings to read properties from
|
||||||
|
* @param extensionsFactory factory to create the MySQL extension
|
||||||
|
*/
|
||||||
|
protected void setParameters(Settings settings, SqlExtensionsFactory extensionsFactory) {
|
||||||
|
this.host = settings.getProperty(DatabaseSettings.MYSQL_HOST);
|
||||||
|
this.port = settings.getProperty(DatabaseSettings.MYSQL_PORT);
|
||||||
|
this.username = settings.getProperty(DatabaseSettings.MYSQL_USERNAME);
|
||||||
|
this.password = settings.getProperty(DatabaseSettings.MYSQL_PASSWORD);
|
||||||
|
this.database = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
|
||||||
|
this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
|
||||||
|
this.columnOthers = settings.getProperty(HooksSettings.MYSQL_OTHER_USERNAME_COLS);
|
||||||
|
this.col = new Columns(settings);
|
||||||
|
sqlExtension = extensionsFactory.buildExtension(col);
|
||||||
|
this.poolSize = settings.getProperty(DatabaseSettings.MYSQL_POOL_SIZE);
|
||||||
|
if (poolSize == -1) {
|
||||||
|
poolSize = Utils.getCoreCount() * 3;
|
||||||
|
}
|
||||||
|
this.maxLifetime = settings.getProperty(DatabaseSettings.MYSQL_CONNECTION_MAX_LIFETIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets up the connection arguments to the database.
|
||||||
|
*/
|
||||||
|
protected void setConnectionArguments() {
|
||||||
|
ds = new HikariDataSource();
|
||||||
|
ds.setPoolName("AuthMeSQLPool");
|
||||||
|
|
||||||
|
// Pool Settings
|
||||||
|
ds.setMaximumPoolSize(poolSize);
|
||||||
|
ds.setMaxLifetime(maxLifetime * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void reload() {
|
||||||
|
if (ds != null) {
|
||||||
|
ds.close();
|
||||||
|
}
|
||||||
|
setConnectionArguments();
|
||||||
|
ConsoleLogger.info("Hikari ConnectionPool arguments reloaded!");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Connection getConnection() throws SQLException {
|
||||||
|
return ds.getConnection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the table if it don't exist.
|
||||||
|
*/
|
||||||
|
protected abstract void checkTables() throws SQLException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates any required column if they don't exist.
|
||||||
|
*/
|
||||||
|
private void checkColumns() throws SQLException {
|
||||||
|
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
||||||
|
DatabaseMetaData md = con.getMetaData();
|
||||||
|
if (isColumnMissing(md, col.NAME)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName
|
||||||
|
+ " ADD COLUMN " + col.NAME + " VARCHAR(255) NOT NULL UNIQUE AFTER " + col.ID + ";");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.REAL_NAME)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName
|
||||||
|
+ " ADD COLUMN " + col.REAL_NAME + " VARCHAR(255) NOT NULL AFTER " + col.NAME + ";");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.PASSWORD)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName
|
||||||
|
+ " ADD COLUMN " + col.PASSWORD + " VARCHAR(255) CHARACTER SET ascii COLLATE ascii_bin NOT NULL;");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!col.SALT.isEmpty() && isColumnMissing(md, col.SALT)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.SALT + " VARCHAR(255);");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.IP)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName
|
||||||
|
+ " ADD COLUMN " + col.IP + " VARCHAR(40) CHARACTER SET ascii COLLATE ascii_bin NOT NULL;");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.LAST_LOGIN)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName
|
||||||
|
+ " ADD COLUMN " + col.LAST_LOGIN + " BIGINT NOT NULL DEFAULT 0;");
|
||||||
|
} else {
|
||||||
|
migrateLastLoginColumn(con, md);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.LASTLOC_X)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.LASTLOC_X + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LAST_LOGIN + " , ADD "
|
||||||
|
+ col.LASTLOC_Y + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LASTLOC_X + " , ADD "
|
||||||
|
+ col.LASTLOC_Z + " DOUBLE NOT NULL DEFAULT '0.0' AFTER " + col.LASTLOC_Y);
|
||||||
|
} else {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " MODIFY "
|
||||||
|
+ col.LASTLOC_X + " DOUBLE NOT NULL DEFAULT '0.0', MODIFY "
|
||||||
|
+ col.LASTLOC_Y + " DOUBLE NOT NULL DEFAULT '0.0', MODIFY "
|
||||||
|
+ col.LASTLOC_Z + " DOUBLE NOT NULL DEFAULT '0.0';");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.LASTLOC_WORLD)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.LASTLOC_WORLD + " VARCHAR(255) NOT NULL DEFAULT 'world' AFTER " + col.LASTLOC_Z);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.LASTLOC_YAW)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.LASTLOC_YAW + " FLOAT;");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.LASTLOC_PITCH)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.LASTLOC_PITCH + " FLOAT;");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.EMAIL)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.EMAIL + " VARCHAR(255) DEFAULT 'your@email.com' AFTER " + col.LASTLOC_WORLD);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isColumnMissing(md, col.IS_LOGGED)) {
|
||||||
|
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
|
||||||
|
+ col.IS_LOGGED + " SMALLINT NOT NULL DEFAULT '0' AFTER " + col.EMAIL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isColumnMissing(DatabaseMetaData metaData, String columnName) throws SQLException {
|
||||||
|
try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
|
||||||
|
return !rs.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAuthAvailable(String user) {
|
||||||
|
String sql = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, user.toLowerCase());
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
return rs.next();
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HashedPassword getPassword(String user) {
|
||||||
|
boolean useSalt = !col.SALT.isEmpty();
|
||||||
|
String sql = "SELECT " + col.PASSWORD
|
||||||
|
+ (useSalt ? ", " + col.SALT : "")
|
||||||
|
+ " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, user.toLowerCase());
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
if (rs.next()) {
|
||||||
|
return new HashedPassword(rs.getString(col.PASSWORD),
|
||||||
|
useSalt ? rs.getString(col.SALT) : null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PlayerAuth getAuth(String user) {
|
||||||
|
String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
PlayerAuth auth;
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, user.toLowerCase());
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
if (rs.next()) {
|
||||||
|
int id = rs.getInt(col.ID);
|
||||||
|
auth = buildAuthFromResultSet(rs);
|
||||||
|
sqlExtension.extendAuth(auth, id, con);
|
||||||
|
return auth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean saveAuth(PlayerAuth auth) {
|
||||||
|
try (Connection con = getConnection()) {
|
||||||
|
String sql;
|
||||||
|
|
||||||
|
boolean useSalt = !col.SALT.isEmpty() || !StringUtils.isEmpty(auth.getPassword().getSalt());
|
||||||
|
sql = "INSERT INTO " + tableName + "("
|
||||||
|
+ col.NAME + "," + col.PASSWORD + "," + col.IP + ","
|
||||||
|
+ col.LAST_LOGIN + "," + col.REAL_NAME + "," + col.EMAIL
|
||||||
|
+ (useSalt ? "," + col.SALT : "")
|
||||||
|
+ ") VALUES (?,?,?,?,?,?" + (useSalt ? ",?" : "") + ");";
|
||||||
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, auth.getNickname());
|
||||||
|
pst.setString(2, auth.getPassword().getHash());
|
||||||
|
pst.setString(3, auth.getIp());
|
||||||
|
pst.setLong(4, auth.getLastLogin());
|
||||||
|
pst.setString(5, auth.getRealName());
|
||||||
|
pst.setString(6, auth.getEmail());
|
||||||
|
if (useSalt) {
|
||||||
|
pst.setString(7, auth.getPassword().getSalt());
|
||||||
|
}
|
||||||
|
pst.executeUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!columnOthers.isEmpty()) {
|
||||||
|
for (String column : columnOthers) {
|
||||||
|
try (PreparedStatement pst = con.prepareStatement("UPDATE " + tableName + " SET " + column + "=? WHERE " + col.NAME + "=?;")) {
|
||||||
|
pst.setString(1, auth.getRealName());
|
||||||
|
pst.setString(2, auth.getNickname());
|
||||||
|
pst.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlExtension.saveAuth(auth, con);
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updatePassword(PlayerAuth auth) {
|
||||||
|
return updatePassword(auth.getNickname(), auth.getPassword());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updatePassword(String user, HashedPassword password) {
|
||||||
|
user = user.toLowerCase();
|
||||||
|
try (Connection con = getConnection()) {
|
||||||
|
boolean useSalt = !col.SALT.isEmpty();
|
||||||
|
if (useSalt) {
|
||||||
|
String sql = String.format("UPDATE %s SET %s = ?, %s = ? WHERE %s = ?;",
|
||||||
|
tableName, col.PASSWORD, col.SALT, col.NAME);
|
||||||
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, password.getHash());
|
||||||
|
pst.setString(2, password.getSalt());
|
||||||
|
pst.setString(3, user);
|
||||||
|
pst.executeUpdate();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
String sql = String.format("UPDATE %s SET %s = ? WHERE %s = ?;",
|
||||||
|
tableName, col.PASSWORD, col.NAME);
|
||||||
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, password.getHash());
|
||||||
|
pst.setString(2, user);
|
||||||
|
pst.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sqlExtension.changePassword(user, password, con);
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateSession(PlayerAuth auth) {
|
||||||
|
String sql = "UPDATE " + tableName + " SET "
|
||||||
|
+ col.IP + "=?, " + col.LAST_LOGIN + "=?, " + col.REAL_NAME + "=? WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, auth.getIp());
|
||||||
|
pst.setLong(2, auth.getLastLogin());
|
||||||
|
pst.setString(3, auth.getRealName());
|
||||||
|
pst.setString(4, auth.getNickname());
|
||||||
|
pst.executeUpdate();
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<String> getRecordsToPurge(long until, boolean includeEntriesWithLastLoginZero) {
|
||||||
|
Set<String> list = new HashSet<>();
|
||||||
|
String select = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.LAST_LOGIN + " < ?";
|
||||||
|
if (!includeEntriesWithLastLoginZero) {
|
||||||
|
select += " AND " + col.LAST_LOGIN + " <> 0";
|
||||||
|
}
|
||||||
|
try (Connection con = getConnection();
|
||||||
|
PreparedStatement selectPst = con.prepareStatement(select)) {
|
||||||
|
selectPst.setLong(1, until);
|
||||||
|
try (ResultSet rs = selectPst.executeQuery()) {
|
||||||
|
while (rs.next()) {
|
||||||
|
list.add(rs.getString(col.NAME));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean removeAuth(String user) {
|
||||||
|
user = user.toLowerCase();
|
||||||
|
String sql = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
sqlExtension.removeAuth(user, con);
|
||||||
|
pst.setString(1, user.toLowerCase());
|
||||||
|
pst.executeUpdate();
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateQuitLoc(PlayerAuth auth) {
|
||||||
|
String sql = "UPDATE " + tableName
|
||||||
|
+ " SET " + col.LASTLOC_X + " =?, " + col.LASTLOC_Y + "=?, " + col.LASTLOC_Z + "=?, "
|
||||||
|
+ col.LASTLOC_WORLD + "=?, " + col.LASTLOC_YAW + "=?, " + col.LASTLOC_PITCH + "=?"
|
||||||
|
+ " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setDouble(1, auth.getQuitLocX());
|
||||||
|
pst.setDouble(2, auth.getQuitLocY());
|
||||||
|
pst.setDouble(3, auth.getQuitLocZ());
|
||||||
|
pst.setString(4, auth.getWorld());
|
||||||
|
pst.setFloat(5, auth.getYaw());
|
||||||
|
pst.setFloat(6, auth.getPitch());
|
||||||
|
pst.setString(7, auth.getNickname());
|
||||||
|
pst.executeUpdate();
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateEmail(PlayerAuth auth) {
|
||||||
|
String sql = "UPDATE " + tableName + " SET " + col.EMAIL + " =? WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, auth.getEmail());
|
||||||
|
pst.setString(2, auth.getNickname());
|
||||||
|
pst.executeUpdate();
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void closeConnection() {
|
||||||
|
if (ds != null && !ds.isClosed()) {
|
||||||
|
ds.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getAllAuthsByIp(String ip) {
|
||||||
|
List<String> result = new ArrayList<>();
|
||||||
|
String sql = "SELECT " + col.NAME + " FROM " + tableName + " WHERE " + col.IP + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, ip);
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
while (rs.next()) {
|
||||||
|
result.add(rs.getString(col.NAME));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int countAuthsByEmail(String email) {
|
||||||
|
String sql = "SELECT COUNT(1) FROM " + tableName + " WHERE UPPER(" + col.EMAIL + ") = UPPER(?)";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, email);
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
if (rs.next()) {
|
||||||
|
return rs.getInt(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void purgeRecords(Collection<String> toPurge) {
|
||||||
|
String sql = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
for (String name : toPurge) {
|
||||||
|
pst.setString(1, name.toLowerCase());
|
||||||
|
pst.executeUpdate();
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public abstract DataSourceType getType();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isLogged(String user) {
|
||||||
|
String sql = "SELECT " + col.IS_LOGGED + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, user);
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
return rs.next() && (rs.getInt(col.IS_LOGGED) == 1);
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setLogged(String user) {
|
||||||
|
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setInt(1, 1);
|
||||||
|
pst.setString(2, user.toLowerCase());
|
||||||
|
pst.executeUpdate();
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setUnlogged(String user) {
|
||||||
|
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setInt(1, 0);
|
||||||
|
pst.setString(2, user.toLowerCase());
|
||||||
|
pst.executeUpdate();
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void purgeLogged() {
|
||||||
|
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE " + col.IS_LOGGED + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setInt(1, 0);
|
||||||
|
pst.setInt(2, 1);
|
||||||
|
pst.executeUpdate();
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAccountsRegistered() {
|
||||||
|
int result = 0;
|
||||||
|
String sql = "SELECT COUNT(*) FROM " + tableName;
|
||||||
|
try (Connection con = getConnection();
|
||||||
|
Statement st = con.createStatement();
|
||||||
|
ResultSet rs = st.executeQuery(sql)) {
|
||||||
|
if (rs.next()) {
|
||||||
|
result = rs.getInt(1);
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateRealName(String user, String realName) {
|
||||||
|
String sql = "UPDATE " + tableName + " SET " + col.REAL_NAME + "=? WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, realName);
|
||||||
|
pst.setString(2, user);
|
||||||
|
pst.executeUpdate();
|
||||||
|
return true;
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DataSourceResult<String> getEmail(String user) {
|
||||||
|
String sql = "SELECT " + col.EMAIL + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
|
try (Connection con = getConnection(); PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.setString(1, user);
|
||||||
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
|
if (rs.next()) {
|
||||||
|
return DataSourceResult.of(rs.getString(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return DataSourceResult.unknownPlayer();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<PlayerAuth> getAllAuths() {
|
||||||
|
List<PlayerAuth> auths = new ArrayList<>();
|
||||||
|
try (Connection con = getConnection(); Statement st = con.createStatement()) {
|
||||||
|
try (ResultSet rs = st.executeQuery("SELECT * FROM " + tableName)) {
|
||||||
|
while (rs.next()) {
|
||||||
|
PlayerAuth auth = buildAuthFromResultSet(rs);
|
||||||
|
sqlExtension.extendAuth(auth, rs.getInt(col.ID), con);
|
||||||
|
auths.add(auth);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return auths;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getLoggedPlayersWithEmptyMail() {
|
||||||
|
List<String> players = new ArrayList<>();
|
||||||
|
String sql = "SELECT " + col.REAL_NAME + " FROM " + tableName + " WHERE " + col.IS_LOGGED + " = 1"
|
||||||
|
+ " AND (" + col.EMAIL + " = 'your@email.com' OR " + col.EMAIL + " IS NULL);";
|
||||||
|
try (Connection con = getConnection();
|
||||||
|
Statement st = con.createStatement();
|
||||||
|
ResultSet rs = st.executeQuery(sql)) {
|
||||||
|
while (rs.next()) {
|
||||||
|
players.add(rs.getString(1));
|
||||||
|
}
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
logSqlException(ex);
|
||||||
|
}
|
||||||
|
return players;
|
||||||
|
}
|
||||||
|
|
||||||
|
private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
|
||||||
|
String salt = col.SALT.isEmpty() ? null : row.getString(col.SALT);
|
||||||
|
int group = col.GROUP.isEmpty() ? -1 : row.getInt(col.GROUP);
|
||||||
|
return PlayerAuth.builder()
|
||||||
|
.name(row.getString(col.NAME))
|
||||||
|
.realName(row.getString(col.REAL_NAME))
|
||||||
|
.password(row.getString(col.PASSWORD), salt)
|
||||||
|
.lastLogin(row.getLong(col.LAST_LOGIN))
|
||||||
|
.ip(row.getString(col.IP))
|
||||||
|
.locWorld(row.getString(col.LASTLOC_WORLD))
|
||||||
|
.locX(row.getDouble(col.LASTLOC_X))
|
||||||
|
.locY(row.getDouble(col.LASTLOC_Y))
|
||||||
|
.locZ(row.getDouble(col.LASTLOC_Z))
|
||||||
|
.locYaw(row.getFloat(col.LASTLOC_YAW))
|
||||||
|
.locPitch(row.getFloat(col.LASTLOC_PITCH))
|
||||||
|
.email(row.getString(col.EMAIL))
|
||||||
|
.groupId(group)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the last login column has a type that needs to be migrated.
|
||||||
|
*
|
||||||
|
* @param con connection to the database
|
||||||
|
* @param metaData lastlogin column meta data
|
||||||
|
*
|
||||||
|
* @throws SQLException .
|
||||||
|
*/
|
||||||
|
private void migrateLastLoginColumn(Connection con, DatabaseMetaData metaData) throws SQLException {
|
||||||
|
final int columnType;
|
||||||
|
try (ResultSet rs = metaData.getColumns(null, null, tableName, col.LAST_LOGIN)) {
|
||||||
|
if (!rs.next()) {
|
||||||
|
ConsoleLogger.warning("Could not get LAST_LOGIN meta data. This should never happen!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
columnType = rs.getInt("DATA_TYPE");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (columnType == Types.TIMESTAMP) {
|
||||||
|
migrateLastLoginColumnFromTimestamp(con);
|
||||||
|
} else if (columnType == Types.INTEGER) {
|
||||||
|
migrateLastLoginColumnFromInt(con);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Performs conversion of lastlogin column from timestamp type to bigint.
|
||||||
|
*
|
||||||
|
* @param con connection to the database
|
||||||
|
*/
|
||||||
|
private void migrateLastLoginColumnFromTimestamp(Connection con) throws SQLException {
|
||||||
|
ConsoleLogger.info("Migrating lastlogin column from timestamp to bigint");
|
||||||
|
final String lastLoginOld = col.LAST_LOGIN + "_old";
|
||||||
|
|
||||||
|
// Rename lastlogin to lastlogin_old
|
||||||
|
String sql = String.format("ALTER TABLE %s CHANGE COLUMN %s %s BIGINT",
|
||||||
|
tableName, col.LAST_LOGIN, lastLoginOld);
|
||||||
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
|
pst.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create lastlogin column
|
||||||
|
sql = String.format("ALTER TABLE %s ADD COLUMN %s "
|
||||||
|
+ "BIGINT NOT NULL DEFAULT 0 AFTER %s",
|
||||||
|
tableName, col.LAST_LOGIN, col.IP);
|
||||||
|
con.prepareStatement(sql).execute();
|
||||||
|
|
||||||
|
// Set values of lastlogin based on lastlogin_old
|
||||||
|
sql = String.format("UPDATE %s SET %s = UNIX_TIMESTAMP(%s) * 1000",
|
||||||
|
tableName, col.LAST_LOGIN, lastLoginOld);
|
||||||
|
con.prepareStatement(sql).execute();
|
||||||
|
|
||||||
|
// Drop lastlogin_old
|
||||||
|
sql = String.format("ALTER TABLE %s DROP COLUMN %s",
|
||||||
|
tableName, lastLoginOld);
|
||||||
|
con.prepareStatement(sql).execute();
|
||||||
|
ConsoleLogger.info("Finished migration of lastlogin (timestamp to bigint)");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Performs conversion of lastlogin column from int to bigint.
|
||||||
|
*
|
||||||
|
* @param con connection to the database
|
||||||
|
*/
|
||||||
|
private void migrateLastLoginColumnFromInt(Connection con) throws SQLException {
|
||||||
|
// Change from int to bigint
|
||||||
|
ConsoleLogger.info("Migrating lastlogin column from int to bigint");
|
||||||
|
String sql = String.format("ALTER TABLE %s MODIFY %s BIGINT;", tableName, col.LAST_LOGIN);
|
||||||
|
con.prepareStatement(sql).execute();
|
||||||
|
|
||||||
|
// Migrate timestamps in seconds format to milliseconds format if they are plausible
|
||||||
|
int rangeStart = 1262304000; // timestamp for 2010-01-01
|
||||||
|
int rangeEnd = 1514678400; // timestamp for 2017-12-31
|
||||||
|
sql = String.format("UPDATE %s SET %s = %s * 1000 WHERE %s > %d AND %s < %d;",
|
||||||
|
tableName, col.LAST_LOGIN, col.LAST_LOGIN, col.LAST_LOGIN, rangeStart, col.LAST_LOGIN, rangeEnd);
|
||||||
|
int changedRows = con.prepareStatement(sql).executeUpdate();
|
||||||
|
|
||||||
|
ConsoleLogger.warning("You may have entries with invalid timestamps. Please check your data "
|
||||||
|
+ "before purging. " + changedRows + " rows were migrated from seconds to milliseconds.");
|
||||||
|
}
|
||||||
|
}
|
@ -3,7 +3,7 @@ package fr.xephi.authme.datasource.converter;
|
|||||||
import fr.xephi.authme.datasource.DataSource;
|
import fr.xephi.authme.datasource.DataSource;
|
||||||
import fr.xephi.authme.datasource.DataSourceType;
|
import fr.xephi.authme.datasource.DataSourceType;
|
||||||
import fr.xephi.authme.datasource.MySQL;
|
import fr.xephi.authme.datasource.MySQL;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
@ -15,10 +15,10 @@ import java.sql.SQLException;
|
|||||||
public class MySqlToSqlite extends AbstractDataSourceConverter<MySQL> {
|
public class MySqlToSqlite extends AbstractDataSourceConverter<MySQL> {
|
||||||
|
|
||||||
private final Settings settings;
|
private final Settings settings;
|
||||||
private final MySqlExtensionsFactory mySqlExtensionsFactory;
|
private final SqlExtensionsFactory mySqlExtensionsFactory;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
MySqlToSqlite(DataSource dataSource, Settings settings, MySqlExtensionsFactory mySqlExtensionsFactory) {
|
MySqlToSqlite(DataSource dataSource, Settings settings, SqlExtensionsFactory mySqlExtensionsFactory) {
|
||||||
super(dataSource, DataSourceType.SQLITE);
|
super(dataSource, DataSourceType.SQLITE);
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
this.mySqlExtensionsFactory = mySqlExtensionsFactory;
|
this.mySqlExtensionsFactory = mySqlExtensionsFactory;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
@ -12,7 +12,7 @@ import java.sql.SQLException;
|
|||||||
/**
|
/**
|
||||||
* Extension for IPB4.
|
* Extension for IPB4.
|
||||||
*/
|
*/
|
||||||
class Ipb4Extension extends MySqlExtension {
|
class Ipb4Extension extends SqlExtension {
|
||||||
|
|
||||||
private final String ipbPrefix;
|
private final String ipbPrefix;
|
||||||
private final int ipbGroup;
|
private final int ipbGroup;
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
@ -6,7 +6,7 @@ import fr.xephi.authme.settings.Settings;
|
|||||||
/**
|
/**
|
||||||
* Extension implementation that does not do anything.
|
* Extension implementation that does not do anything.
|
||||||
*/
|
*/
|
||||||
class NoOpExtension extends MySqlExtension {
|
class NoOpExtension extends SqlExtension {
|
||||||
|
|
||||||
NoOpExtension(Settings settings, Columns col) {
|
NoOpExtension(Settings settings, Columns col) {
|
||||||
super(settings, col);
|
super(settings, col);
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
@ -13,7 +13,7 @@ import java.util.OptionalInt;
|
|||||||
/**
|
/**
|
||||||
* Extensions for phpBB when MySQL is used as data source.
|
* Extensions for phpBB when MySQL is used as data source.
|
||||||
*/
|
*/
|
||||||
class PhpBbExtension extends MySqlExtension {
|
class PhpBbExtension extends SqlExtension {
|
||||||
|
|
||||||
private final String phpBbPrefix;
|
private final String phpBbPrefix;
|
||||||
private final int phpBbGroup;
|
private final int phpBbGroup;
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
@ -16,12 +16,12 @@ import java.util.OptionalInt;
|
|||||||
* Extension for the MySQL data source for forums. For certain password hashes (e.g. phpBB), we want
|
* Extension for the MySQL data source for forums. For certain password hashes (e.g. phpBB), we want
|
||||||
* to hook into the forum board and execute some actions specific to the forum software.
|
* to hook into the forum board and execute some actions specific to the forum software.
|
||||||
*/
|
*/
|
||||||
public abstract class MySqlExtension {
|
public abstract class SqlExtension {
|
||||||
|
|
||||||
protected final Columns col;
|
protected final Columns col;
|
||||||
protected final String tableName;
|
protected final String tableName;
|
||||||
|
|
||||||
MySqlExtension(Settings settings, Columns col) {
|
SqlExtension(Settings settings, Columns col) {
|
||||||
this.col = col;
|
this.col = col;
|
||||||
this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
|
this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.security.HashAlgorithm;
|
import fr.xephi.authme.security.HashAlgorithm;
|
||||||
@ -8,20 +8,20 @@ import fr.xephi.authme.settings.properties.SecuritySettings;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates the appropriate {@link MySqlExtension}, depending on the configured password hashing algorithm.
|
* Creates the appropriate {@link SqlExtension}, depending on the configured password hashing algorithm.
|
||||||
*/
|
*/
|
||||||
public class MySqlExtensionsFactory {
|
public class SqlExtensionsFactory {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private Settings settings;
|
private Settings settings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link MySqlExtension} object according to the configured hash algorithm.
|
* Creates a new {@link SqlExtension} object according to the configured hash algorithm.
|
||||||
*
|
*
|
||||||
* @param columnsConfig the columns configuration
|
* @param columnsConfig the columns configuration
|
||||||
* @return the extension the MySQL data source should use
|
* @return the extension the MySQL data source should use
|
||||||
*/
|
*/
|
||||||
public MySqlExtension buildExtension(Columns columnsConfig) {
|
public SqlExtension buildExtension(Columns columnsConfig) {
|
||||||
HashAlgorithm hash = settings.getProperty(SecuritySettings.PASSWORD_HASH);
|
HashAlgorithm hash = settings.getProperty(SecuritySettings.PASSWORD_HASH);
|
||||||
switch (hash) {
|
switch (hash) {
|
||||||
case IPB4:
|
case IPB4:
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
@ -13,7 +13,7 @@ import java.util.OptionalInt;
|
|||||||
/**
|
/**
|
||||||
* MySQL extensions for Wordpress.
|
* MySQL extensions for Wordpress.
|
||||||
*/
|
*/
|
||||||
class WordpressExtension extends MySqlExtension {
|
class WordpressExtension extends SqlExtension {
|
||||||
|
|
||||||
private final String wordpressPrefix;
|
private final String wordpressPrefix;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
@ -17,7 +17,7 @@ import java.util.OptionalInt;
|
|||||||
/**
|
/**
|
||||||
* Extension for XFBCRYPT.
|
* Extension for XFBCRYPT.
|
||||||
*/
|
*/
|
||||||
class XfBcryptExtension extends MySqlExtension {
|
class XfBcryptExtension extends SqlExtension {
|
||||||
|
|
||||||
private final String xfPrefix;
|
private final String xfPrefix;
|
||||||
private final int xfGroup;
|
private final int xfGroup;
|
@ -6,10 +6,11 @@ import fr.xephi.authme.datasource.CacheDataSource;
|
|||||||
import fr.xephi.authme.datasource.DataSource;
|
import fr.xephi.authme.datasource.DataSource;
|
||||||
import fr.xephi.authme.datasource.DataSourceType;
|
import fr.xephi.authme.datasource.DataSourceType;
|
||||||
import fr.xephi.authme.datasource.FlatFile;
|
import fr.xephi.authme.datasource.FlatFile;
|
||||||
|
import fr.xephi.authme.datasource.MsSQL;
|
||||||
import fr.xephi.authme.datasource.MySQL;
|
import fr.xephi.authme.datasource.MySQL;
|
||||||
import fr.xephi.authme.datasource.SQLite;
|
import fr.xephi.authme.datasource.SQLite;
|
||||||
import fr.xephi.authme.datasource.converter.ForceFlatToSqlite;
|
import fr.xephi.authme.datasource.converter.ForceFlatToSqlite;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
import fr.xephi.authme.service.BukkitService;
|
import fr.xephi.authme.service.BukkitService;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
||||||
@ -38,7 +39,7 @@ public class DataSourceProvider implements Provider<DataSource> {
|
|||||||
@Inject
|
@Inject
|
||||||
private PlayerCache playerCache;
|
private PlayerCache playerCache;
|
||||||
@Inject
|
@Inject
|
||||||
private MySqlExtensionsFactory mySqlExtensionsFactory;
|
private SqlExtensionsFactory mySqlExtensionsFactory;
|
||||||
|
|
||||||
DataSourceProvider() {
|
DataSourceProvider() {
|
||||||
}
|
}
|
||||||
@ -72,6 +73,9 @@ public class DataSourceProvider implements Provider<DataSource> {
|
|||||||
case MYSQL:
|
case MYSQL:
|
||||||
dataSource = new MySQL(settings, mySqlExtensionsFactory);
|
dataSource = new MySQL(settings, mySqlExtensionsFactory);
|
||||||
break;
|
break;
|
||||||
|
case MSSQL:
|
||||||
|
dataSource = new MsSQL(settings, mySqlExtensionsFactory);
|
||||||
|
break;
|
||||||
case SQLITE:
|
case SQLITE:
|
||||||
dataSource = new SQLite(settings);
|
dataSource = new SQLite(settings);
|
||||||
break;
|
break;
|
||||||
|
@ -90,6 +90,8 @@ public class BackupService {
|
|||||||
return performFileBackup("auths.db");
|
return performFileBackup("auths.db");
|
||||||
case MYSQL:
|
case MYSQL:
|
||||||
return performMySqlBackup();
|
return performMySqlBackup();
|
||||||
|
case MSSQL:
|
||||||
|
ConsoleLogger.warning("You have to do an SQL Server backup manually!");
|
||||||
case SQLITE:
|
case SQLITE:
|
||||||
String dbName = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
|
String dbName = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
|
||||||
return performFileBackup(dbName + ".db");
|
return performFileBackup(dbName + ".db");
|
||||||
|
@ -5,7 +5,8 @@ import com.google.common.collect.ImmutableList;
|
|||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
|
import fr.xephi.authme.datasource.SqlDataSource;
|
||||||
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtension;
|
||||||
import fr.xephi.authme.initialization.HasCleanup;
|
import fr.xephi.authme.initialization.HasCleanup;
|
||||||
import fr.xephi.authme.process.register.executors.RegistrationMethod;
|
import fr.xephi.authme.process.register.executors.RegistrationMethod;
|
||||||
import fr.xephi.authme.security.crypts.Whirlpool;
|
import fr.xephi.authme.security.crypts.Whirlpool;
|
||||||
@ -56,8 +57,9 @@ public class ClassesConsistencyTest {
|
|||||||
/** Classes excluded from the field visibility test. */
|
/** Classes excluded from the field visibility test. */
|
||||||
private static final Set<Class<?>> CLASSES_EXCLUDED_FROM_VISIBILITY_TEST = ImmutableSet.of(
|
private static final Set<Class<?>> CLASSES_EXCLUDED_FROM_VISIBILITY_TEST = ImmutableSet.of(
|
||||||
Whirlpool.class, // not our implementation, so we don't touch it
|
Whirlpool.class, // not our implementation, so we don't touch it
|
||||||
MySqlExtension.class, // has immutable protected fields used by all children
|
SqlExtension.class, // has immutable protected fields used by all children
|
||||||
Columns.class // uses non-static String constants, which is safe
|
Columns.class, // uses non-static String constants, which is safe
|
||||||
|
SqlDataSource.class // has protected fields used by all children
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -4,8 +4,8 @@ import ch.jalu.configme.properties.Property;
|
|||||||
import com.zaxxer.hikari.HikariConfig;
|
import com.zaxxer.hikari.HikariConfig;
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import fr.xephi.authme.TestHelper;
|
import fr.xephi.authme.TestHelper;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtension;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
@ -31,7 +31,7 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
|
|||||||
/** Mock of a settings instance. */
|
/** Mock of a settings instance. */
|
||||||
private static Settings settings;
|
private static Settings settings;
|
||||||
/** Mock of extensions factory. */
|
/** Mock of extensions factory. */
|
||||||
private static MySqlExtensionsFactory extensionsFactory;
|
private static SqlExtensionsFactory extensionsFactory;
|
||||||
/** SQL statement to execute before running a test. */
|
/** SQL statement to execute before running a test. */
|
||||||
private static String sqlInitialize;
|
private static String sqlInitialize;
|
||||||
/** Connection to the H2 test database. */
|
/** Connection to the H2 test database. */
|
||||||
@ -47,8 +47,8 @@ public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest {
|
|||||||
|
|
||||||
settings = mock(Settings.class);
|
settings = mock(Settings.class);
|
||||||
TestHelper.returnDefaultsForAllProperties(settings);
|
TestHelper.returnDefaultsForAllProperties(settings);
|
||||||
extensionsFactory = mock(MySqlExtensionsFactory.class);
|
extensionsFactory = mock(SqlExtensionsFactory.class);
|
||||||
when(extensionsFactory.buildExtension(any(Columns.class))).thenReturn(mock(MySqlExtension.class));
|
when(extensionsFactory.buildExtension(any(Columns.class))).thenReturn(mock(SqlExtension.class));
|
||||||
set(DatabaseSettings.MYSQL_DATABASE, "h2_test");
|
set(DatabaseSettings.MYSQL_DATABASE, "h2_test");
|
||||||
set(DatabaseSettings.MYSQL_TABLE, "authme");
|
set(DatabaseSettings.MYSQL_TABLE, "authme");
|
||||||
TestHelper.setRealLogger();
|
TestHelper.setRealLogger();
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
package fr.xephi.authme.datasource;
|
package fr.xephi.authme.datasource;
|
||||||
|
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtension;
|
||||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
|
import fr.xephi.authme.datasource.sqlextensions.SqlExtensionsFactory;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
@ -25,8 +25,8 @@ public class MySqlResourceClosingTest extends AbstractSqlDataSourceResourceClosi
|
|||||||
protected DataSource createDataSource(Settings settings, Connection connection) throws Exception {
|
protected DataSource createDataSource(Settings settings, Connection connection) throws Exception {
|
||||||
HikariDataSource hikariDataSource = mock(HikariDataSource.class);
|
HikariDataSource hikariDataSource = mock(HikariDataSource.class);
|
||||||
given(hikariDataSource.getConnection()).willReturn(connection);
|
given(hikariDataSource.getConnection()).willReturn(connection);
|
||||||
MySqlExtensionsFactory extensionsFactory = mock(MySqlExtensionsFactory.class);
|
SqlExtensionsFactory extensionsFactory = mock(SqlExtensionsFactory.class);
|
||||||
given(extensionsFactory.buildExtension(any(Columns.class))).willReturn(mock(MySqlExtension.class));
|
given(extensionsFactory.buildExtension(any(Columns.class))).willReturn(mock(SqlExtension.class));
|
||||||
return new MySQL(settings, hikariDataSource, extensionsFactory);
|
return new MySQL(settings, hikariDataSource, extensionsFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.TestHelper;
|
import fr.xephi.authme.TestHelper;
|
||||||
import fr.xephi.authme.datasource.AbstractResourceClosingTest;
|
import fr.xephi.authme.datasource.AbstractResourceClosingTest;
|
||||||
@ -16,14 +16,14 @@ import java.util.stream.Collectors;
|
|||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks that SQL resources are closed properly in {@link MySqlExtension} implementations.
|
* Checks that SQL resources are closed properly in {@link SqlExtension} implementations.
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractMySqlExtensionResourceClosingTest extends AbstractResourceClosingTest {
|
public abstract class AbstractSqlExtensionResourceClosingTest extends AbstractResourceClosingTest {
|
||||||
|
|
||||||
private static Settings settings;
|
private static Settings settings;
|
||||||
private static Columns columns;
|
private static Columns columns;
|
||||||
|
|
||||||
public AbstractMySqlExtensionResourceClosingTest(Method method, String name) {
|
public AbstractSqlExtensionResourceClosingTest(Method method, String name) {
|
||||||
super(method, name);
|
super(method, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,15 +35,15 @@ public abstract class AbstractMySqlExtensionResourceClosingTest extends Abstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MySqlExtension getObjectUnderTest() {
|
protected SqlExtension getObjectUnderTest() {
|
||||||
return createExtension(settings, columns);
|
return createExtension(settings, columns);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract MySqlExtension createExtension(Settings settings, Columns columns);
|
protected abstract SqlExtension createExtension(Settings settings, Columns columns);
|
||||||
|
|
||||||
@Parameterized.Parameters(name = "{1}")
|
@Parameterized.Parameters(name = "{1}")
|
||||||
public static List<Object[]> createParameters() {
|
public static List<Object[]> createParameters() {
|
||||||
return Arrays.stream(MySqlExtension.class.getDeclaredMethods())
|
return Arrays.stream(SqlExtension.class.getDeclaredMethods())
|
||||||
.filter(m -> Modifier.isPublic(m.getModifiers()))
|
.filter(m -> Modifier.isPublic(m.getModifiers()))
|
||||||
.map(m -> new Object[]{m, m.getName()})
|
.map(m -> new Object[]{m, m.getName()})
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
@ -8,14 +8,14 @@ import java.lang.reflect.Method;
|
|||||||
/**
|
/**
|
||||||
* Resource closing test for {@link Ipb4Extension}.
|
* Resource closing test for {@link Ipb4Extension}.
|
||||||
*/
|
*/
|
||||||
public class Ipb4ExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest {
|
public class Ipb4ExtensionResourceClosingTest extends AbstractSqlExtensionResourceClosingTest {
|
||||||
|
|
||||||
public Ipb4ExtensionResourceClosingTest(Method method, String name) {
|
public Ipb4ExtensionResourceClosingTest(Method method, String name) {
|
||||||
super(method, name);
|
super(method, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MySqlExtension createExtension(Settings settings, Columns columns) {
|
protected SqlExtension createExtension(Settings settings, Columns columns) {
|
||||||
return new Ipb4Extension(settings, columns);
|
return new Ipb4Extension(settings, columns);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.TestHelper;
|
import fr.xephi.authme.TestHelper;
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
import fr.xephi.authme.data.auth.PlayerAuth;
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
@ -8,14 +8,14 @@ import java.lang.reflect.Method;
|
|||||||
/**
|
/**
|
||||||
* Resource closing test for {@link PhpBbExtension}.
|
* Resource closing test for {@link PhpBbExtension}.
|
||||||
*/
|
*/
|
||||||
public class PhpBbExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest {
|
public class PhpBbExtensionResourceClosingTest extends AbstractSqlExtensionResourceClosingTest {
|
||||||
|
|
||||||
public PhpBbExtensionResourceClosingTest(Method method, String name) {
|
public PhpBbExtensionResourceClosingTest(Method method, String name) {
|
||||||
super(method, name);
|
super(method, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MySqlExtension createExtension(Settings settings, Columns columns) {
|
protected SqlExtension createExtension(Settings settings, Columns columns) {
|
||||||
return new PhpBbExtension(settings, columns);
|
return new PhpBbExtension(settings, columns);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
@ -8,14 +8,14 @@ import java.lang.reflect.Method;
|
|||||||
/**
|
/**
|
||||||
* Resource closing test for {@link WordpressExtension}.
|
* Resource closing test for {@link WordpressExtension}.
|
||||||
*/
|
*/
|
||||||
public class WordpressExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest {
|
public class WordpressExtensionResourceClosingTest extends AbstractSqlExtensionResourceClosingTest {
|
||||||
|
|
||||||
public WordpressExtensionResourceClosingTest(Method method, String name) {
|
public WordpressExtensionResourceClosingTest(Method method, String name) {
|
||||||
super(method, name);
|
super(method, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MySqlExtension createExtension(Settings settings, Columns columns) {
|
protected SqlExtension createExtension(Settings settings, Columns columns) {
|
||||||
return new WordpressExtension(settings, columns);
|
return new WordpressExtension(settings, columns);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package fr.xephi.authme.datasource.mysqlextensions;
|
package fr.xephi.authme.datasource.sqlextensions;
|
||||||
|
|
||||||
import fr.xephi.authme.datasource.Columns;
|
import fr.xephi.authme.datasource.Columns;
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
@ -8,14 +8,14 @@ import java.lang.reflect.Method;
|
|||||||
/**
|
/**
|
||||||
* Resource closing test for {@link XfBcryptExtension}.
|
* Resource closing test for {@link XfBcryptExtension}.
|
||||||
*/
|
*/
|
||||||
public class XfBcryptExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest {
|
public class XfBcryptExtensionResourceClosingTest extends AbstractSqlExtensionResourceClosingTest {
|
||||||
|
|
||||||
public XfBcryptExtensionResourceClosingTest(Method method, String name) {
|
public XfBcryptExtensionResourceClosingTest(Method method, String name) {
|
||||||
super(method, name);
|
super(method, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MySqlExtension createExtension(Settings settings, Columns columns) {
|
protected SqlExtension createExtension(Settings settings, Columns columns) {
|
||||||
return new XfBcryptExtension(settings, columns);
|
return new XfBcryptExtension(settings, columns);
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user