From 4cfb7a5f4b8847ff6b4a972065678f57cbcaecb9 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 12 Jan 2019 17:26:17 -0800
Subject: [PATCH] mcMMO now supports SSL and tries to use it by default for
 MySQL (turn this off in config.yml MySQL.Server.SSL) this fixes a lot of
 console spam from default mysql installs

---
 Changelog.txt                                              | 2 ++
 src/main/java/com/gmail/nossr50/config/Config.java         | 1 +
 .../com/gmail/nossr50/database/SQLDatabaseManager.java     | 7 +++++++
 src/main/resources/config.yml                              | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4d3a86b0d6..82df715308 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -15,9 +15,11 @@ Version 2.1.0
  + Added links to mcMMO related websites to various commands
  + Certain elements of mcMMO's UI have been restyled
  + Added the tagline "Overhaul Era" to various locations until 3.0.0 comes out
+ + (MySQL) Added support for SSL for MySQL/MariaDB (Off by default)
  + (Skills) Tool alerts now are sent to the Action Bar
  + (Skills) Super Ability activation alerts are now sent to the Action Bar
  + (Skills) Certain Skill messages are now sent to the Action Bar
+ + (Config) Added option to use SSL for MySQL in config.yml
  + (Config) Added option to disable the new URL links to config.yml
  + (Config) New config file added coreskills.yml
  + (Config) Added rank settings for the new Woodcutting skill
diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
index e1e297a7fc..f59d908701 100644
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -346,6 +346,7 @@ public MobHealthbarType getMobHealthbarDefault() {
     public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); }
     public int getMySQLMaxConnections(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()), 30); }
     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); }
 
     private String getStringIncludingInts(String key) {
         String str = config.getString(key);
diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
index 32747b80e5..ffb40425d2 100644
--- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
@@ -36,6 +36,13 @@ protected SQLDatabaseManager() {
         String connectionString = "jdbc:mysql://" + Config.getInstance().getMySQLServerName()
                 + ":" + Config.getInstance().getMySQLServerPort() + "/" + Config.getInstance().getMySQLDatabaseName();
 
+        if(Config.getInstance().getMySQLSSL())
+            connectionString = "jdbc:mysql://" + Config.getInstance().getMySQLServerName()
+                    + ":" + Config.getInstance().getMySQLServerPort() + "/" + Config.getInstance().getMySQLDatabaseName() +
+                    "?verifyServerCertificate=false"+
+                    "&useSSL=true"+
+                    "&requireSSL=true";
+
         try {
             // Force driver to load if not yet loaded
             Class.forName("com.mysql.jdbc.Driver");
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 1332de53e3..6440a8ab98 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -166,7 +166,7 @@ MySQL:
             Load: 20
             Save: 20
     Server:
-        SSL: false
+        SSL: true
         Port: 3306
         Address: localhost