Added support for allowPublicKeyRetrieval=true in the JDBC launch (#4635)

options for MySQL

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
This commit is contained in:
rosaage 2021-09-23 00:03:03 +02:00 committed by GitHub
parent 8e5251ba66
commit 280eb0ba51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions

View File

@ -251,6 +251,7 @@ public class GeneralConfig extends AutoUpdateConfigLoader {
public int getMySQLMaxPoolSize(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); } public int getMySQLMaxPoolSize(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); }
public boolean getMySQLSSL() { return config.getBoolean("MySQL.Server.SSL", true); } public boolean getMySQLSSL() { return config.getBoolean("MySQL.Server.SSL", true); }
public boolean getMySQLDebug() { return config.getBoolean("MySQL.Debug", false); } public boolean getMySQLDebug() { return config.getBoolean("MySQL.Debug", false); }
public boolean getMySQLPublicKeyRetrieval() { return config.getBoolean("MySQL.Server.allowPublicKeyRetrieval", true); }
private String getStringIncludingInts(String key) { private String getStringIncludingInts(String key) {
String str = config.getString(key); String str = config.getString(key);

View File

@ -61,6 +61,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
connectionString+= connectionString+=
"?useSSL=false"; "?useSSL=false";
if(mcMMO.p.getGeneralConfig().getMySQLPublicKeyRetrieval()) {
connectionString+=
"&allowPublicKeyRetrieval=true";
}
try { try {
// Force driver to load if not yet loaded // Force driver to load if not yet loaded
Class.forName(driverPath); Class.forName(driverPath);

View File

@ -202,6 +202,7 @@ MySQL:
SSL: true SSL: true
Port: 3306 Port: 3306
Address: localhost Address: localhost
allowPublicKeyRetrieval: true
# #
# Settings for Hardcore mode # Settings for Hardcore mode