git-mirrors/GeyserConnect
1
0
Fork 1
mirror of https://github.com/GeyserMC/GeyserConnect.git synced 2025-06-26 14:15:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sql fixes (#67)

Browse source 
* create abstract sql manager, log if sql fails

* use PreparedStatements
This commit is contained in:
creeper123123321 2022-07-14 08:31:27 -03:00 • committed by GitHub
parent d1f16f4568
commit 3964f401f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 108 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -230,3 +230,4 @@ nbdist/
/logs/ /logs/
/locales/ /locales/
/players/ /players/
players.db

98
src/main/java/org/geysermc/connect/storage/AbstractSQLStorageManager.java Normal file
View file

@ -0,0 +1,98 @@
/*
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @author GeyserMC
* @link https://github.com/GeyserMC/GeyserConnect
*/
package org.geysermc.connect.storage;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.geysermc.connect.MasterServer;
import org.geysermc.connect.utils.Player;
import org.geysermc.connect.utils.Server;
import java.io.IOException;
import java.sql.*;
import java.util.ArrayList;
import java.util.List;
public abstract class AbstractSQLStorageManager extends AbstractStorageManager {
private final ObjectMapper mapper = new ObjectMapper();
protected Connection connection;
@Override
public void setupStorage() {
try {
connectToDatabase();
try (Statement createPlayersTable = connection.createStatement()) {
createPlayersTable.executeUpdate("CREATE TABLE IF NOT EXISTS players (xuid VARCHAR(32), servers TEXT, PRIMARY KEY(xuid));");
}
} catch (ClassNotFoundException | SQLException e) {
MasterServer.getInstance().getLogger().severe("Unable to connect to MySQL database!", e);
}
}
protected abstract void connectToDatabase() throws ClassNotFoundException, SQLException;
@Override
public void closeStorage() {
try {
connection.close();
} catch (SQLException exception) {
MasterServer.getInstance().getLogger().error("Failed to close SQL connection", exception);
}
}
@Override
public void saveServers(Player player) {
try (PreparedStatement updatePlayersServers = connection.prepareStatement("INSERT OR REPLACE INTO players(xuid, servers) VALUES(?, ?)")) {
updatePlayersServers.setString(1, player.getAuthData().xuid());
updatePlayersServers.setString(2, mapper.writeValueAsString(player.getServers()));
updatePlayersServers.executeUpdate();
} catch (IOException | SQLException exception) {
MasterServer.getInstance().getLogger().error("Couldn't save servers for " + player.getAuthData().name(), exception);
}
}
@Override
public List<Server> loadServers(Player player) {
List<Server> servers = new ArrayList<>();
try (PreparedStatement getPlayersServers = connection.prepareStatement("SELECT servers FROM players WHERE xuid=?")) {
getPlayersServers.setString(1, player.getAuthData().xuid());
ResultSet rs = getPlayersServers.executeQuery();
while (rs.next()) {
List<Server> loadedServers = mapper.readValue(rs.getString("servers"), new TypeReference<>() {
});
servers.addAll(loadedServers);
}
} catch (IOException | SQLException exception) {
MasterServer.getInstance().getLogger().error("Couldn't load servers for " + player.getAuthData().name(), exception);
}
return servers;
}
}

60
src/main/java/org/geysermc/connect/storage/MySQLStorageManager.java
View file

@ -25,66 +25,16 @@
package org.geysermc.connect.storage; package org.geysermc.connect.storage;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.geysermc.connect.GeyserConnectConfig; import org.geysermc.connect.GeyserConnectConfig;
import org.geysermc.connect.MasterServer; import org.geysermc.connect.MasterServer;
import org.geysermc.connect.utils.Player;
import org.geysermc.connect.utils.Server;
import java.io.IOException;
import java.sql.*; import java.sql.*;
import java.util.ArrayList;
import java.util.List;
public class MySQLStorageManager extends AbstractStorageManager {
private final ObjectMapper mapper = new ObjectMapper();
private Connection connection;
public class MySQLStorageManager extends AbstractSQLStorageManager {
@Override @Override
public void setupStorage() { protected void connectToDatabase() throws ClassNotFoundException, SQLException {
try { Class.forName("com.mysql.cj.jdbc.Driver");
Class.forName("com.mysql.cj.jdbc.Driver"); GeyserConnectConfig.MySQLConnectionSection connectionInformation = MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().getMysql();
GeyserConnectConfig.MySQLConnectionSection connectionInformation = MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().getMysql(); connection = DriverManager.getConnection("jdbc:mysql://" + connectionInformation.getHost() + ":" + connectionInformation.getPort() + "/" + connectionInformation.getDatabase(), connectionInformation.getUser(), connectionInformation.getPass());
connection = DriverManager.getConnection("jdbc:mysql://" + connectionInformation.getHost() + ":" + connectionInformation.getPort() + "/" + connectionInformation.getDatabase(), connectionInformation.getUser(), connectionInformation.getPass());
try (Statement createPlayersTable = connection.createStatement()) {
createPlayersTable.executeUpdate("CREATE TABLE IF NOT EXISTS players (xuid VARCHAR(32), servers TEXT, PRIMARY KEY(xuid));");
}
} catch (ClassNotFoundException | SQLException e) {
MasterServer.getInstance().getLogger().severe("Unable to connect to MySQL database!", e);
}
}
@Override
public void closeStorage() {
try {
connection.close();
} catch (SQLException ignored) { }
}
@Override
public void saveServers(Player player) {
try (Statement updatePlayersServers = connection.createStatement()) {
updatePlayersServers.executeUpdate("REPLACE INTO players(xuid, servers) VALUES('" + player.getAuthData().xuid() + "', '" + mapper.writeValueAsString(player.getServers()) + "');");
} catch (IOException | SQLException ignored) { }
}
@Override
public List<Server> loadServers(Player player) {
List<Server> servers = new ArrayList<>();
try (Statement getPlayersServers = connection.createStatement()) {
ResultSet rs = getPlayersServers.executeQuery("SELECT servers FROM players WHERE xuid='" + player.getAuthData().xuid() + "';");
while (rs.next()) {
List<Server> loadedServers = mapper.readValue(rs.getString("servers"), new TypeReference<>(){});
servers.addAll(loadedServers);
}
} catch (IOException | SQLException ignored) { }
return servers;
} }
} }

60
src/main/java/org/geysermc/connect/storage/SQLiteStorageManager.java
View file

@ -25,64 +25,12 @@
package org.geysermc.connect.storage; package org.geysermc.connect.storage;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.geysermc.connect.MasterServer;
import org.geysermc.connect.utils.Player;
import org.geysermc.connect.utils.Server;
import java.io.IOException;
import java.sql.*; import java.sql.*;
import java.util.ArrayList;
import java.util.List;
public class SQLiteStorageManager extends AbstractStorageManager {
private final ObjectMapper mapper = new ObjectMapper();
private Connection connection;
public class SQLiteStorageManager extends AbstractSQLStorageManager {
@Override @Override
public void setupStorage() { protected void connectToDatabase() throws ClassNotFoundException, SQLException {
try { Class.forName("org.sqlite.JDBC");
Class.forName("org.sqlite.JDBC"); connection = DriverManager.getConnection("jdbc:sqlite:players.db");
connection = DriverManager.getConnection("jdbc:sqlite:players.db");
try (Statement createPlayersTable = connection.createStatement()) {
createPlayersTable.executeUpdate("CREATE TABLE IF NOT EXISTS players (xuid TEXT, servers TEXT, PRIMARY KEY(xuid));");
}
} catch (ClassNotFoundException | SQLException e) {
MasterServer.getInstance().getLogger().severe("Unable to load sqlite database!", e);
}
}
@Override
public void closeStorage() {
try {
connection.close();
} catch (SQLException ignored) { }
}
@Override
public void saveServers(Player player) {
try (Statement updatePlayersServers = connection.createStatement()) {
updatePlayersServers.executeUpdate("INSERT OR REPLACE INTO players(xuid, servers) VALUES('" + player.getAuthData().xuid() + "', '" + mapper.writeValueAsString(player.getServers()) + "');");
} catch (IOException | SQLException ignored) { }
}
@Override
public List<Server> loadServers(Player player) {
List<Server> servers = new ArrayList<>();
try (Statement getPlayersServers = connection.createStatement()) {
ResultSet rs = getPlayersServers.executeQuery("SELECT servers FROM players WHERE xuid='" + player.getAuthData().xuid() + "';");
while (rs.next()) {
List<Server> loadedServers = mapper.readValue(rs.getString("servers"), new TypeReference<>() {});
servers.addAll(loadedServers);
}
} catch (IOException | SQLException ignored) { }
return servers;
} }
} }