Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-01-10 01:47:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix totp column size #2154

Browse Source
This commit is contained in:
Gabriele C 2020-07-16 00:18:51 +02:00
parent 790b959054
commit a1021f9dc3
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,10 @@ public class MySQL extends AbstractSqlDataSource {
if (isColumnMissing(md, col.TOTP_KEY)) { if (isColumnMissing(md, col.TOTP_KEY)) {
st.executeUpdate("ALTER TABLE " + tableName st.executeUpdate("ALTER TABLE " + tableName
+ " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(16);"); + " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} else if (isColumnSizeIncorrect(md, col.TOTP_KEY, 32)) {
st.executeUpdate("ALTER TABLE " + tableName
+ " ALTER COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} }
if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) { if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) {
@ -284,6 +287,16 @@ public class MySQL extends AbstractSqlDataSource {
} }
} }
private boolean isColumnSizeIncorrect(DatabaseMetaData metaData, String columnName, int size) throws SQLException {
try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
if (!rs.next()) {
throw new RuntimeException("Column " + columnName + " doesn't exist!");
}
int currentSize = rs.getInt("COLUMN_SIZE");
return size != currentSize;
}
}
@Override @Override
public PlayerAuth getAuth(String user) { public PlayerAuth getAuth(String user) {
String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;"; String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;";

15
src/main/java/fr/xephi/authme/datasource/PostgreSqlDataSource.java
View File

@ -242,7 +242,10 @@ public class PostgreSqlDataSource extends AbstractSqlDataSource {
if (isColumnMissing(md, col.TOTP_KEY)) { if (isColumnMissing(md, col.TOTP_KEY)) {
st.executeUpdate("ALTER TABLE " + tableName st.executeUpdate("ALTER TABLE " + tableName
+ " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(16);"); + " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} else if (isColumnSizeIncorrect(md, col.TOTP_KEY, 32)) {
st.executeUpdate("ALTER TABLE " + tableName
+ " ALTER COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} }
if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) { if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) {
@ -259,6 +262,16 @@ public class PostgreSqlDataSource extends AbstractSqlDataSource {
} }
} }
private boolean isColumnSizeIncorrect(DatabaseMetaData metaData, String columnName, int size) throws SQLException {
try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
if (!rs.next()) {
throw new RuntimeException("Column " + columnName + " doesn't exist!");
}
int currentSize = rs.getInt("COLUMN_SIZE");
return size != currentSize;
}
}
@Override @Override
public PlayerAuth getAuth(String user) { public PlayerAuth getAuth(String user) {
String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;"; String sql = "SELECT * FROM " + tableName + " WHERE " + col.NAME + "=?;";

15
src/main/java/fr/xephi/authme/datasource/SQLite.java
View File

@ -183,7 +183,10 @@ public class SQLite extends AbstractSqlDataSource {
if (isColumnMissing(md, col.TOTP_KEY)) { if (isColumnMissing(md, col.TOTP_KEY)) {
st.executeUpdate("ALTER TABLE " + tableName st.executeUpdate("ALTER TABLE " + tableName
+ " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(16);"); + " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} else if (isColumnSizeIncorrect(md, col.TOTP_KEY, 32)) {
st.executeUpdate("ALTER TABLE " + tableName
+ " ALTER COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
} }
if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) { if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) {
@ -214,6 +217,16 @@ public class SQLite extends AbstractSqlDataSource {
} }
} }
private boolean isColumnSizeIncorrect(DatabaseMetaData metaData, String columnName, int size) throws SQLException {
try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
if (!rs.next()) {
throw new RuntimeException("Column " + columnName + " doesn't exist!");
}
int currentSize = rs.getInt("COLUMN_SIZE");
return size != currentSize;
}
}
@Override @Override
public void reload() { public void reload() {
close(con); close(con);