Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Escape groups keyword in SQL queries to (hopefully) fix compat with newer versions of MySQL (#1091)

Browse Source
This commit is contained in:
Luck 2018-07-11 13:09:20 -07:00
parent bf64f465a8
commit c16630c32b
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
8 changed files with 87 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java
View File

@ -86,6 +86,6 @@ public class SqlMessenger extends AbstractSqlMessenger {
@Override @Override
protected String getTableName() { protected String getTableName() {
return this.sqlDao.getPrefix().apply("{prefix}messages"); return this.sqlDao.getStatementProcessor().apply("{prefix}messages");
} }
} }

102
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java
View File

@ -109,10 +109,10 @@ public class SqlDao extends AbstractDao {
private static final String POSTGRESQL_GROUP_INSERT = "INSERT INTO {prefix}groups (name) VALUES(?) ON CONFLICT (name) DO NOTHING"; private static final String POSTGRESQL_GROUP_INSERT = "INSERT INTO {prefix}groups (name) VALUES(?) ON CONFLICT (name) DO NOTHING";
private static final String GROUP_DELETE = "DELETE FROM {prefix}groups WHERE name=?"; private static final String GROUP_DELETE = "DELETE FROM {prefix}groups WHERE name=?";
private static final String TRACK_INSERT = "INSERT INTO {prefix}tracks (name, groups) VALUES(?, ?)"; private static final String TRACK_INSERT = "INSERT INTO {prefix}tracks (name, 'groups') VALUES(?, ?)";
private static final String TRACK_SELECT = "SELECT groups FROM {prefix}tracks WHERE name=?"; private static final String TRACK_SELECT = "SELECT 'groups' FROM {prefix}tracks WHERE name=?";
private static final String TRACK_SELECT_ALL = "SELECT * FROM {prefix}tracks"; private static final String TRACK_SELECT_ALL = "SELECT * FROM {prefix}tracks";
private static final String TRACK_UPDATE = "UPDATE {prefix}tracks SET groups=? WHERE name=?"; private static final String TRACK_UPDATE = "UPDATE {prefix}tracks SET 'groups'=? WHERE name=?";
private static final String TRACK_DELETE = "DELETE FROM {prefix}tracks WHERE name=?"; private static final String TRACK_DELETE = "DELETE FROM {prefix}tracks WHERE name=?";
private static final String ACTION_INSERT = "INSERT INTO {prefix}actions(time, actor_uuid, actor_name, type, acted_uuid, acted_name, action) VALUES(?, ?, ?, ?, ?, ?, ?)"; private static final String ACTION_INSERT = "INSERT INTO {prefix}actions(time, actor_uuid, actor_name, type, acted_uuid, acted_name, action) VALUES(?, ?, ?, ?, ?, ?, ?)";
@ -120,12 +120,12 @@ public class SqlDao extends AbstractDao {
private final Gson gson; private final Gson gson;
private final AbstractConnectionFactory provider; private final AbstractConnectionFactory provider;
private final Function<String, String> prefix; private final Function<String, String> statementProcessor;
public SqlDao(LuckPermsPlugin plugin, AbstractConnectionFactory provider, String prefix) { public SqlDao(LuckPermsPlugin plugin, AbstractConnectionFactory provider, String tablePrefix) {
super(plugin, provider.getName()); super(plugin, provider.getName());
this.provider = provider; this.provider = provider;
this.prefix = s -> s.replace("{prefix}", prefix); this.statementProcessor = provider.getStatementProcessor().compose(s -> s.replace("{prefix}", tablePrefix));
this.gson = new Gson(); this.gson = new Gson();
} }
@ -137,8 +137,8 @@ public class SqlDao extends AbstractDao {
return this.provider; return this.provider;
} }
public Function<String, String> getPrefix() { public Function<String, String> getStatementProcessor() {
return this.prefix; return this.statementProcessor;
} }
private boolean tableExists(String table) throws SQLException { private boolean tableExists(String table) throws SQLException {
@ -159,7 +159,7 @@ public class SqlDao extends AbstractDao {
this.provider.init(); this.provider.init();
// Init tables // Init tables
if (!tableExists(this.prefix.apply("{prefix}user_permissions"))) { if (!tableExists(this.statementProcessor.apply("{prefix}user_permissions"))) {
String schemaFileName = "me/lucko/luckperms/schema/" + this.provider.getName().toLowerCase() + ".sql"; String schemaFileName = "me/lucko/luckperms/schema/" + this.provider.getName().toLowerCase() + ".sql";
try (InputStream is = this.plugin.getBootstrap().getResourceStream(schemaFileName)) { try (InputStream is = this.plugin.getBootstrap().getResourceStream(schemaFileName)) {
if (is == null) { if (is == null) {
@ -180,7 +180,7 @@ public class SqlDao extends AbstractDao {
if (line.endsWith(";")) { if (line.endsWith(";")) {
sb.deleteCharAt(sb.length() - 1); sb.deleteCharAt(sb.length() - 1);
String result = this.prefix.apply(sb.toString().trim()); String result = this.statementProcessor.apply(sb.toString().trim());
if (!result.isEmpty()) s.addBatch(result); if (!result.isEmpty()) s.addBatch(result);
// reset // reset
@ -199,8 +199,8 @@ public class SqlDao extends AbstractDao {
if (!(this.provider instanceof SQLiteConnectionFactory) && !(this.provider instanceof PostgreConnectionFactory)) { if (!(this.provider instanceof SQLiteConnectionFactory) && !(this.provider instanceof PostgreConnectionFactory)) {
try (Connection connection = this.provider.getConnection()) { try (Connection connection = this.provider.getConnection()) {
try (Statement s = connection.createStatement()) { try (Statement s = connection.createStatement()) {
s.execute(this.prefix.apply("ALTER TABLE {prefix}actions MODIFY COLUMN actor_name VARCHAR(100)")); s.execute(this.statementProcessor.apply("ALTER TABLE {prefix}actions MODIFY COLUMN actor_name VARCHAR(100)"));
s.execute(this.prefix.apply("ALTER TABLE {prefix}actions MODIFY COLUMN action VARCHAR(300)")); s.execute(this.statementProcessor.apply("ALTER TABLE {prefix}actions MODIFY COLUMN action VARCHAR(300)"));
} }
} }
} }
@ -226,7 +226,7 @@ public class SqlDao extends AbstractDao {
@Override @Override
public void logAction(LogEntry entry) throws SQLException { public void logAction(LogEntry entry) throws SQLException {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(ACTION_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(ACTION_INSERT))) {
ps.setLong(1, entry.getTimestamp()); ps.setLong(1, entry.getTimestamp());
ps.setString(2, entry.getActor().toString()); ps.setString(2, entry.getActor().toString());
ps.setString(3, entry.getActorName()); ps.setString(3, entry.getActorName());
@ -243,7 +243,7 @@ public class SqlDao extends AbstractDao {
public Log getLog() throws SQLException { public Log getLog() throws SQLException {
final Log.Builder log = Log.builder(); final Log.Builder log = Log.builder();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(ACTION_SELECT_ALL))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(ACTION_SELECT_ALL))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
final String actedUuid = rs.getString("acted_uuid"); final String actedUuid = rs.getString("acted_uuid");
@ -269,14 +269,14 @@ public class SqlDao extends AbstractDao {
public void applyBulkUpdate(BulkUpdate bulkUpdate) throws SQLException { public void applyBulkUpdate(BulkUpdate bulkUpdate) throws SQLException {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
if (bulkUpdate.getDataType().isIncludingUsers()) { if (bulkUpdate.getDataType().isIncludingUsers()) {
String table = this.prefix.apply("{prefix}user_permissions"); String table = this.statementProcessor.apply("{prefix}user_permissions");
try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) { try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) {
ps.execute(); ps.execute();
} }
} }
if (bulkUpdate.getDataType().isIncludingGroups()) { if (bulkUpdate.getDataType().isIncludingGroups()) {
String table = this.prefix.apply("{prefix}group_permissions"); String table = this.statementProcessor.apply("{prefix}group_permissions");
try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) { try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) {
ps.execute(); ps.execute();
} }
@ -295,7 +295,7 @@ public class SqlDao extends AbstractDao {
// Collect user permissions // Collect user permissions
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_SELECT))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -314,7 +314,7 @@ public class SqlDao extends AbstractDao {
// Collect user meta (username & primary group) // Collect user meta (username & primary group)
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_SELECT_BY_UUID))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -368,11 +368,11 @@ public class SqlDao extends AbstractDao {
// Empty data - just delete from the DB. // Empty data - just delete from the DB.
if (!this.plugin.getUserManager().shouldSave(user)) { if (!this.plugin.getUserManager().shouldSave(user)) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_DELETE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_DELETE))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
ps.execute(); ps.execute();
} }
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_UPDATE_PRIMARY_GROUP_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_UPDATE_PRIMARY_GROUP_BY_UUID))) {
ps.setString(1, NodeFactory.DEFAULT_GROUP_NAME); ps.setString(1, NodeFactory.DEFAULT_GROUP_NAME);
ps.setString(2, user.getUuid().toString()); ps.setString(2, user.getUuid().toString());
ps.execute(); ps.execute();
@ -384,7 +384,7 @@ public class SqlDao extends AbstractDao {
// Get a snapshot of current data. // Get a snapshot of current data.
Set<NodeDataContainer> remote = new HashSet<>(); Set<NodeDataContainer> remote = new HashSet<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_SELECT))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -410,7 +410,7 @@ public class SqlDao extends AbstractDao {
if (!toRemove.isEmpty()) { if (!toRemove.isEmpty()) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_DELETE_SPECIFIC))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_DELETE_SPECIFIC))) {
for (NodeDataContainer nd : toRemove) { for (NodeDataContainer nd : toRemove) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
ps.setString(2, nd.getPermission()); ps.setString(2, nd.getPermission());
@ -428,7 +428,7 @@ public class SqlDao extends AbstractDao {
if (!toAdd.isEmpty()) { if (!toAdd.isEmpty()) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_INSERT))) {
for (NodeDataContainer nd : toAdd) { for (NodeDataContainer nd : toAdd) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
ps.setString(2, nd.getPermission()); ps.setString(2, nd.getPermission());
@ -447,7 +447,7 @@ public class SqlDao extends AbstractDao {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
boolean hasPrimaryGroupSaved; boolean hasPrimaryGroupSaved;
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_SELECT_PRIMARY_GROUP_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_SELECT_PRIMARY_GROUP_BY_UUID))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
hasPrimaryGroupSaved = rs.next(); hasPrimaryGroupSaved = rs.next();
@ -456,14 +456,14 @@ public class SqlDao extends AbstractDao {
if (hasPrimaryGroupSaved) { if (hasPrimaryGroupSaved) {
// update // update
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_UPDATE_PRIMARY_GROUP_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_UPDATE_PRIMARY_GROUP_BY_UUID))) {
ps.setString(1, user.getPrimaryGroup().getStoredValue().orElse(NodeFactory.DEFAULT_GROUP_NAME)); ps.setString(1, user.getPrimaryGroup().getStoredValue().orElse(NodeFactory.DEFAULT_GROUP_NAME));
ps.setString(2, user.getUuid().toString()); ps.setString(2, user.getUuid().toString());
ps.execute(); ps.execute();
} }
} else { } else {
// insert // insert
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_INSERT))) {
ps.setString(1, user.getUuid().toString()); ps.setString(1, user.getUuid().toString());
ps.setString(2, user.getName().orElse("null")); ps.setString(2, user.getName().orElse("null"));
ps.setString(3, user.getPrimaryGroup().getStoredValue().orElse(NodeFactory.DEFAULT_GROUP_NAME)); ps.setString(3, user.getPrimaryGroup().getStoredValue().orElse(NodeFactory.DEFAULT_GROUP_NAME));
@ -481,7 +481,7 @@ public class SqlDao extends AbstractDao {
public Set<UUID> getUniqueUsers() throws SQLException { public Set<UUID> getUniqueUsers() throws SQLException {
Set<UUID> uuids = new HashSet<>(); Set<UUID> uuids = new HashSet<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_SELECT_DISTINCT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(USER_PERMISSIONS_SELECT_DISTINCT))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
String uuid = rs.getString("uuid"); String uuid = rs.getString("uuid");
@ -500,7 +500,7 @@ public class SqlDao extends AbstractDao {
List<HeldPermission<UUID>> held = new ArrayList<>(); List<HeldPermission<UUID>> held = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = builder.build(c, this.prefix)) { try (PreparedStatement ps = builder.build(c, this.statementProcessor)) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
UUID holder = UUID.fromString(rs.getString("uuid")); UUID holder = UUID.fromString(rs.getString("uuid"));
@ -539,7 +539,7 @@ public class SqlDao extends AbstractDao {
} }
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(query))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(query))) {
ps.setString(1, name); ps.setString(1, name);
ps.execute(); ps.execute();
} }
@ -553,7 +553,7 @@ public class SqlDao extends AbstractDao {
// Check the group actually exists // Check the group actually exists
List<String> groups = new ArrayList<>(); List<String> groups = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_SELECT_ALL))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_SELECT_ALL))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
groups.add(rs.getString("name").toLowerCase()); groups.add(rs.getString("name").toLowerCase());
@ -573,7 +573,7 @@ public class SqlDao extends AbstractDao {
List<NodeDataContainer> data = new ArrayList<>(); List<NodeDataContainer> data = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_SELECT))) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -607,7 +607,7 @@ public class SqlDao extends AbstractDao {
public void loadAllGroups() throws SQLException { public void loadAllGroups() throws SQLException {
List<String> groups = new ArrayList<>(); List<String> groups = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_SELECT_ALL))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_SELECT_ALL))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
groups.add(rs.getString("name").toLowerCase()); groups.add(rs.getString("name").toLowerCase());
@ -643,7 +643,7 @@ public class SqlDao extends AbstractDao {
// Empty data, just delete. // Empty data, just delete.
if (group.enduringData().immutable().isEmpty()) { if (group.enduringData().immutable().isEmpty()) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_DELETE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_DELETE))) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
ps.execute(); ps.execute();
} }
@ -654,7 +654,7 @@ public class SqlDao extends AbstractDao {
// Get a snapshot of current data // Get a snapshot of current data
Set<NodeDataContainer> remote = new HashSet<>(); Set<NodeDataContainer> remote = new HashSet<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_SELECT))) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -680,7 +680,7 @@ public class SqlDao extends AbstractDao {
if (!toRemove.isEmpty()) { if (!toRemove.isEmpty()) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_DELETE_SPECIFIC))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_DELETE_SPECIFIC))) {
for (NodeDataContainer nd : toRemove) { for (NodeDataContainer nd : toRemove) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
ps.setString(2, nd.getPermission()); ps.setString(2, nd.getPermission());
@ -698,7 +698,7 @@ public class SqlDao extends AbstractDao {
if (!toAdd.isEmpty()) { if (!toAdd.isEmpty()) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_INSERT))) {
for (NodeDataContainer nd : toAdd) { for (NodeDataContainer nd : toAdd) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
ps.setString(2, nd.getPermission()); ps.setString(2, nd.getPermission());
@ -723,12 +723,12 @@ public class SqlDao extends AbstractDao {
group.getIoLock().lock(); group.getIoLock().lock();
try { try {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_DELETE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_PERMISSIONS_DELETE))) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
ps.execute(); ps.execute();
} }
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_DELETE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(GROUP_DELETE))) {
ps.setString(1, group.getName()); ps.setString(1, group.getName());
ps.execute(); ps.execute();
} }
@ -747,7 +747,7 @@ public class SqlDao extends AbstractDao {
List<HeldPermission<String>> held = new ArrayList<>(); List<HeldPermission<String>> held = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = builder.build(c, this.prefix)) { try (PreparedStatement ps = builder.build(c, this.statementProcessor)) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
String holder = rs.getString("name"); String holder = rs.getString("name");
@ -775,7 +775,7 @@ public class SqlDao extends AbstractDao {
boolean exists = false; boolean exists = false;
String groups = null; String groups = null;
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_SELECT))) {
ps.setString(1, track.getName()); ps.setString(1, track.getName());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { if (rs.next()) {
@ -792,7 +792,7 @@ public class SqlDao extends AbstractDao {
} else { } else {
String json = this.gson.toJson(track.getGroups()); String json = this.gson.toJson(track.getGroups());
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_INSERT))) {
ps.setString(1, track.getName()); ps.setString(1, track.getName());
ps.setString(2, json); ps.setString(2, json);
ps.execute(); ps.execute();
@ -814,7 +814,7 @@ public class SqlDao extends AbstractDao {
try { try {
String groups; String groups;
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_SELECT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_SELECT))) {
ps.setString(1, name); ps.setString(1, name);
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { if (rs.next()) {
@ -845,7 +845,7 @@ public class SqlDao extends AbstractDao {
public void loadAllTracks() throws SQLException { public void loadAllTracks() throws SQLException {
List<String> tracks = new ArrayList<>(); List<String> tracks = new ArrayList<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_SELECT_ALL))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_SELECT_ALL))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
tracks.add(rs.getString("name").toLowerCase()); tracks.add(rs.getString("name").toLowerCase());
@ -880,7 +880,7 @@ public class SqlDao extends AbstractDao {
try { try {
String s = this.gson.toJson(track.getGroups()); String s = this.gson.toJson(track.getGroups());
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_UPDATE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_UPDATE))) {
ps.setString(1, s); ps.setString(1, s);
ps.setString(2, track.getName()); ps.setString(2, track.getName());
ps.execute(); ps.execute();
@ -896,7 +896,7 @@ public class SqlDao extends AbstractDao {
track.getIoLock().lock(); track.getIoLock().lock();
try { try {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(TRACK_DELETE))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(TRACK_DELETE))) {
ps.setString(1, track.getName()); ps.setString(1, track.getName());
ps.execute(); ps.execute();
} }
@ -919,13 +919,13 @@ public class SqlDao extends AbstractDao {
if (!username.equalsIgnoreCase(oldUsername)) { if (!username.equalsIgnoreCase(oldUsername)) {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
if (oldUsername != null) { if (oldUsername != null) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_UPDATE_USERNAME_FOR_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_UPDATE_USERNAME_FOR_UUID))) {
ps.setString(1, username); ps.setString(1, username);
ps.setString(2, uuid.toString()); ps.setString(2, uuid.toString());
ps.execute(); ps.execute();
} }
} else { } else {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_INSERT))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_INSERT))) {
ps.setString(1, uuid.toString()); ps.setString(1, uuid.toString());
ps.setString(2, username); ps.setString(2, username);
ps.setString(3, NodeFactory.DEFAULT_GROUP_NAME); ps.setString(3, NodeFactory.DEFAULT_GROUP_NAME);
@ -939,7 +939,7 @@ public class SqlDao extends AbstractDao {
Set<UUID> conflicting = new HashSet<>(); Set<UUID> conflicting = new HashSet<>();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_SELECT_ALL_UUIDS_BY_USERNAME))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_SELECT_ALL_UUIDS_BY_USERNAME))) {
ps.setString(1, username); ps.setString(1, username);
ps.setString(2, uuid.toString()); ps.setString(2, uuid.toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
@ -953,7 +953,7 @@ public class SqlDao extends AbstractDao {
if (!conflicting.isEmpty()) { if (!conflicting.isEmpty()) {
// remove the mappings for conflicting uuids // remove the mappings for conflicting uuids
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_DELETE_ALL_UUIDS_BY_USERNAME))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_DELETE_ALL_UUIDS_BY_USERNAME))) {
ps.setString(1, username); ps.setString(1, username);
ps.setString(2, uuid.toString()); ps.setString(2, uuid.toString());
ps.execute(); ps.execute();
@ -969,7 +969,7 @@ public class SqlDao extends AbstractDao {
public UUID getPlayerUuid(String username) throws SQLException { public UUID getPlayerUuid(String username) throws SQLException {
username = username.toLowerCase(); username = username.toLowerCase();
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_SELECT_UUID_BY_USERNAME))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_SELECT_UUID_BY_USERNAME))) {
ps.setString(1, username); ps.setString(1, username);
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { if (rs.next()) {
@ -984,7 +984,7 @@ public class SqlDao extends AbstractDao {
@Override @Override
public String getPlayerName(UUID uuid) throws SQLException { public String getPlayerName(UUID uuid) throws SQLException {
try (Connection c = this.provider.getConnection()) { try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(PLAYER_SELECT_USERNAME_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(this.statementProcessor.apply(PLAYER_SELECT_USERNAME_BY_UUID))) {
ps.setString(1, uuid.toString()); ps.setString(1, uuid.toString());
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { if (rs.next()) {

3
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/AbstractConnectionFactory.java
View File

@ -29,6 +29,7 @@ import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
public abstract class AbstractConnectionFactory { public abstract class AbstractConnectionFactory {
@ -50,6 +51,8 @@ public abstract class AbstractConnectionFactory {
return Collections.emptyMap(); return Collections.emptyMap();
} }
public abstract Function<String, String> getStatementProcessor();
public abstract Connection getConnection() throws SQLException; public abstract Connection getConnection() throws SQLException;
} }

6
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/file/H2ConnectionFactory.java
View File

@ -39,6 +39,7 @@ import java.sql.Driver;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Properties; import java.util.Properties;
import java.util.function.Function;
public class H2ConnectionFactory extends FlatfileConnectionFactory { public class H2ConnectionFactory extends FlatfileConnectionFactory {
@ -94,6 +95,11 @@ public class H2ConnectionFactory extends FlatfileConnectionFactory {
} }
} }
@Override
public Function<String, String> getStatementProcessor() {
return s -> s.replace("'", "");
}
@Override @Override
protected Path getWriteFile() { protected Path getWriteFile() {
// h2 appends this to the end of the database file // h2 appends this to the end of the database file

6
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/file/SQLiteConnectionFactory.java
View File

@ -38,6 +38,7 @@ import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Properties; import java.util.Properties;
import java.util.function.Function;
public class SQLiteConnectionFactory extends FlatfileConnectionFactory { public class SQLiteConnectionFactory extends FlatfileConnectionFactory {
@ -105,4 +106,9 @@ public class SQLiteConnectionFactory extends FlatfileConnectionFactory {
} }
} }
@Override
public Function<String, String> getStatementProcessor() {
return s -> s.replace("'", "");
}
} }

6
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/hikari/MariaDbConnectionFactory.java
View File

@ -31,6 +31,7 @@ import me.lucko.luckperms.common.storage.StorageCredentials;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class MariaDbConnectionFactory extends HikariConnectionFactory { public class MariaDbConnectionFactory extends HikariConnectionFactory {
@ -57,4 +58,9 @@ public class MariaDbConnectionFactory extends HikariConnectionFactory {
config.addDataSourceProperty("properties", propertiesString); config.addDataSourceProperty("properties", propertiesString);
} }
@Override
public Function<String, String> getStatementProcessor() {
return s -> s.replace("'", "`"); // use backticks for quotes
}
} }

7
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/hikari/MySqlConnectionFactory.java
View File

@ -29,6 +29,8 @@ import com.zaxxer.hikari.HikariConfig;
import me.lucko.luckperms.common.storage.StorageCredentials; import me.lucko.luckperms.common.storage.StorageCredentials;
import java.util.function.Function;
public class MySqlConnectionFactory extends HikariConnectionFactory { public class MySqlConnectionFactory extends HikariConnectionFactory {
public MySqlConnectionFactory(StorageCredentials configuration) { public MySqlConnectionFactory(StorageCredentials configuration) {
super("MySQL", configuration); super("MySQL", configuration);
@ -56,4 +58,9 @@ public class MySqlConnectionFactory extends HikariConnectionFactory {
super.appendProperties(config, credentials); super.appendProperties(config, credentials);
} }
@Override
public Function<String, String> getStatementProcessor() {
return s -> s.replace("'", "`"); // use backticks for quotes
}
} }

7
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/hikari/PostgreConnectionFactory.java
View File

@ -29,6 +29,8 @@ import com.zaxxer.hikari.HikariConfig;
import me.lucko.luckperms.common.storage.StorageCredentials; import me.lucko.luckperms.common.storage.StorageCredentials;
import java.util.function.Function;
public class PostgreConnectionFactory extends HikariConnectionFactory { public class PostgreConnectionFactory extends HikariConnectionFactory {
public PostgreConnectionFactory(StorageCredentials configuration) { public PostgreConnectionFactory(StorageCredentials configuration) {
super("PostgreSQL", configuration); super("PostgreSQL", configuration);
@ -52,4 +54,9 @@ public class PostgreConnectionFactory extends HikariConnectionFactory {
config.addDataSourceProperty("user", username); config.addDataSourceProperty("user", username);
config.addDataSourceProperty("password", password); config.addDataSourceProperty("password", password);
} }
@Override
public Function<String, String> getStatementProcessor() {
return s -> s.replace("'", "");
}
} }