Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1063 Add useSSL option

Browse Source
This commit is contained in:
Gabriele C 2017-01-14 22:14:09 +01:00
parent d761b0ee5c
commit 26194d676d
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/config.md
View File

@ -1,5 +1,5 @@
<!-- AUTO-GENERATED FILE! Do not edit this directly --> <!-- AUTO-GENERATED FILE! Do not edit this directly -->
<!-- File auto-generated on Sat Jan 07 11:33:48 CET 2017. See docs/config/config.tpl.md --> <!-- File auto-generated on Sat Jan 14 22:12:16 CET 2017. See docs/config/config.tpl.md -->
## AuthMe Configuration ## AuthMe Configuration
The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder, The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder,
@ -34,6 +34,8 @@ DataSource:
mySQLRealName: 'realname' mySQLRealName: 'realname'
# Column for storing players passwords # Column for storing players passwords
mySQLColumnPassword: 'password' mySQLColumnPassword: 'password'
# Request mysql over SSL
mySQLUseSSL: true
# Column for storing players emails # Column for storing players emails
mySQLColumnEmail: 'email' mySQLColumnEmail: 'email'
# Column for storing if a player is logged in or not # Column for storing if a player is logged in or not
@ -330,6 +332,8 @@ Email:
mailAccount: '' mailAccount: ''
# Email account password # Email account password
mailPassword: '' mailPassword: ''
# Email address, fill when mailAccount is not the email address of the account
mailAddress: ''
# Custom sender name, replacing the mailAccount name in the email # Custom sender name, replacing the mailAccount name in the email
mailSenderName: '' mailSenderName: ''
# Recovery password length # Recovery password length
@ -460,4 +464,4 @@ To change settings on a running server, save your changes to config.yml and use
--- ---
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Jan 07 11:33:48 CET 2017 This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Jan 14 22:12:16 CET 2017

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

@ -31,6 +31,7 @@ import java.util.Set;
public class MySQL implements DataSource { public class MySQL implements DataSource {
private boolean useSSL;
private String host; private String host;
private String port; private String port;
private String username; private String username;
@ -100,6 +101,7 @@ public class MySQL implements DataSource {
if (poolSize == -1) { if (poolSize == -1) {
poolSize = Utils.getCoreCount(); poolSize = Utils.getCoreCount();
} }
this.useSSL = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
} }
private void setConnectionArguments() { private void setConnectionArguments() {
@ -116,6 +118,9 @@ public class MySQL implements DataSource {
ds.setUsername(this.username); ds.setUsername(this.username);
ds.setPassword(this.password); ds.setPassword(this.password);
// Request mysql over SSL
ds.addDataSourceProperty("useSSL", useSSL);
// Encoding // Encoding
ds.addDataSourceProperty("characterEncoding", "utf8"); ds.addDataSourceProperty("characterEncoding", "utf8");
ds.addDataSourceProperty("encoding","UTF-8"); ds.addDataSourceProperty("encoding","UTF-8");

4
src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
View File

@ -58,6 +58,10 @@ public class DatabaseSettings implements SettingsHolder {
public static final Property<String> MYSQL_COL_PASSWORD = public static final Property<String> MYSQL_COL_PASSWORD =
newProperty("DataSource.mySQLColumnPassword", "password"); newProperty("DataSource.mySQLColumnPassword", "password");
@Comment("Request mysql over SSL")
public static final Property<Boolean> MYSQL_USE_SSL =
newProperty("DataSource.mySQLUseSSL", true);
@Comment("Column for storing players passwords salts") @Comment("Column for storing players passwords salts")
public static final Property<String> MYSQL_COL_SALT = public static final Property<String> MYSQL_COL_SALT =
newProperty("ExternalBoardOptions.mySQLColumnSalt", ""); newProperty("ExternalBoardOptions.mySQLColumnSalt", "");