Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-20 05:52:30 +01:00
Code Issues Projects Releases Wiki Activity

Add email Whitelist (override Blacklist if no empty)

Browse Source
This commit is contained in:
Xephi 2014-08-13 12:48:50 +02:00
parent afc1ea9111
commit 55c7c4f9e1
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -49,6 +49,7 @@ public final class Settings extends YamlConfiguration {
public static List<String> welcomeMsg = null;
public static List<String> unsafePasswords;
public static List<String> emailBlacklist = null;
public static List<String> emailWhitelist = null;
public static Boolean isPermissionCheckEnabled, isRegistrationEnabled,
isForcedRegistrationEnabled, isTeleportToSpawnEnabled,
@ -378,6 +379,7 @@ public final class Settings extends YamlConfiguration {
applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect",
false);
emailBlacklist = configFile.getStringList("Email.emailBlacklisted");
emailWhitelist = configFile.getStringList("Email.emailWhitelisted");
// Load the welcome message
getWelcomeMessage(plugin);
@ -653,6 +655,7 @@ public final class Settings extends YamlConfiguration {
applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect",
false);
emailBlacklist = configFile.getStringList("Email.emailBlacklisted");
emailWhitelist = configFile.getStringList("Email.emailWhitelisted");
// Reload the welcome message
getWelcomeMessage(AuthMe.getInstance());
@ -789,8 +792,12 @@ public final class Settings extends YamlConfiguration {
set("Email.emailBlacklisted", new ArrayList<String>());
changes = true;
}
if (contains("Performances.useMultiThreading")) set(
"Performances.useMultiThreading", null);
if (contains("Performances.useMultiThreading"))
set("Performances.useMultiThreading", null);
if (!contains("Email.emailWhitelisted")) {
set("Email.emailWhitelisted", new ArrayList<String>());
changes = true;
}
if (changes) {
plugin.getLogger()
@ -1008,10 +1015,23 @@ public final class Settings extends YamlConfiguration {
if (!email.contains("@")) correct = false;
if (!email.equalsIgnoreCase("your@email.com")) correct = false;
String emailDomain = email.split("@")[1];
for (String domain : emailBlacklist) {
if (domain.equalsIgnoreCase(emailDomain)) {
correct = false;
break;
if (emailWhitelist != null && !emailWhitelist.isEmpty()) {
for (String domain : emailWhitelist) {
if (!domain.equalsIgnoreCase(emailDomain)) {
correct = false;
} else {
correct = true;
break;
}
}
return correct;
}
if (emailBlacklist != null && !emailBlacklist.isEmpty()) {
for (String domain : emailBlacklist) {
if (domain.equalsIgnoreCase(emailDomain)) {
correct = false;
break;
}
}
}
return correct;

4
src/main/resources/config.yml
View File

@ -359,9 +359,11 @@ Email:
recallPlayers: false
# Delay in minute for the recall scheduler
delayRecall: 5
# Blacklist these domain for emails
# Blacklist these domains for emails
emailBlacklisted:
- 10minutemail.com
# WhiteList only these domains for emails
emailWhitelisted: []
Hooks:
# Do we need to hook with multiverse for spawn checking?
multiverse: true