From 6a75184ad993de2e87e95523d77d69f072e6ee47 Mon Sep 17 00:00:00 2001 From: games647 Date: Sat, 6 Feb 2016 23:21:45 +0100 Subject: [PATCH] Add 2fa support --- .../executable/register/RegisterCommand.java | 12 ++ .../fr/xephi/authme/output/MessageKey.java | 3 +- .../process/register/AsyncRegister.java | 45 +++++-- .../xephi/authme/security/HashAlgorithm.java | 1 + .../authme/security/crypts/TwoFactor.java | 125 ++++++++++++++++++ .../settings/properties/SecuritySettings.java | 1 + src/main/resources/messages/messages_bg.yml | 1 + src/main/resources/messages/messages_br.yml | 1 + src/main/resources/messages/messages_cz.yml | 1 + src/main/resources/messages/messages_de.yml | 1 + src/main/resources/messages/messages_en.yml | 1 + src/main/resources/messages/messages_es.yml | 1 + src/main/resources/messages/messages_eu.yml | 1 + src/main/resources/messages/messages_fi.yml | 1 + src/main/resources/messages/messages_fr.yml | 1 + src/main/resources/messages/messages_gl.yml | 1 + src/main/resources/messages/messages_hu.yml | 1 + src/main/resources/messages/messages_id.yml | 1 + src/main/resources/messages/messages_it.yml | 1 + src/main/resources/messages/messages_ko.yml | 1 + src/main/resources/messages/messages_lt.yml | 1 + src/main/resources/messages/messages_nl.yml | 1 + src/main/resources/messages/messages_pl.yml | 1 + src/main/resources/messages/messages_pt.yml | 3 +- src/main/resources/messages/messages_ru.yml | 1 + src/main/resources/messages/messages_sk.yml | 1 + src/main/resources/messages/messages_tr.yml | 1 + src/main/resources/messages/messages_uk.yml | 1 + src/main/resources/messages/messages_vn.yml | 1 + src/main/resources/messages/messages_zhcn.yml | 1 + src/main/resources/messages/messages_zhhk.yml | 1 + src/main/resources/messages/messages_zhtw.yml | 3 +- 32 files changed, 201 insertions(+), 16 deletions(-) create mode 100644 src/main/java/fr/xephi/authme/security/crypts/TwoFactor.java diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java index 175d067c0..c7d8e8229 100644 --- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java @@ -4,9 +4,11 @@ import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.process.Management; +import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.RandomString; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.Utils; + import org.bukkit.entity.Player; import java.util.List; @@ -15,6 +17,12 @@ public class RegisterCommand extends PlayerCommand { @Override public void runCommand(Player player, List arguments, CommandService commandService) { + if (Settings.getPasswordHash == HashAlgorithm.TWO_FACTOR) { + //for two factor auth we don't need to check the usage + commandService.getManagement().performRegister(player, "", ""); + return; + } + if (arguments.isEmpty() || Settings.enablePasswordConfirmation && arguments.size() < 2) { commandService.send(player, MessageKey.USAGE_REGISTER); return; @@ -26,19 +34,23 @@ public class RegisterCommand extends PlayerCommand { commandService.send(player, MessageKey.USAGE_REGISTER); return; } + final String email = arguments.get(0); if (!Utils.isEmailCorrect(email, commandService.getSettings())) { commandService.send(player, MessageKey.INVALID_EMAIL); return; } + final String thePass = RandomString.generate(Settings.getRecoveryPassLength); management.performRegister(player, thePass, email); return; } + if (arguments.size() > 1 && Settings.enablePasswordConfirmation && !arguments.get(0).equals(arguments.get(1))) { commandService.send(player, MessageKey.PASSWORD_MATCH_ERROR); return; } + management.performRegister(player, arguments.get(0), ""); } diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/output/MessageKey.java index 0f33dc735..73fb08fc2 100644 --- a/src/main/java/fr/xephi/authme/output/MessageKey.java +++ b/src/main/java/fr/xephi/authme/output/MessageKey.java @@ -123,8 +123,9 @@ public enum MessageKey { ANTIBOT_AUTO_DISABLED_MESSAGE("antibot_auto_disabled", "%m"), - EMAIL_ALREADY_USED_ERROR("email_already_used"); + EMAIL_ALREADY_USED_ERROR("email_already_used"), + TWO_FACTOR_CREATE("two_factor_create", "%code", "%url"); private String key; private String[] tags; diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java index 16c469e5c..0f06e22e5 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -8,9 +8,12 @@ import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PlayerPermission; +import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.HashedPassword; +import fr.xephi.authme.security.crypts.TwoFactor; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.Settings; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; /** @@ -48,19 +51,27 @@ public class AsyncRegister { } else if (!Settings.isRegistrationEnabled) { m.send(player, MessageKey.REGISTRATION_DISABLED); return false; - } else if (!passLow.matches(Settings.getPassRegex)) { - m.send(player, MessageKey.PASSWORD_MATCH_ERROR); - return false; - } else if (passLow.equalsIgnoreCase(player.getName())) { - m.send(player, MessageKey.PASSWORD_IS_USERNAME_ERROR); - return false; - } else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) { - m.send(player, MessageKey.INVALID_PASSWORD_LENGTH); - return false; - } else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) { - m.send(player, MessageKey.PASSWORD_UNSAFE_ERROR); - return false; - } else if (database.isAuthAvailable(name)) { + } + + //check the password safety only if it's not a automatically generated password + if (Settings.getPasswordHash != HashAlgorithm.TWO_FACTOR) { + if (!passLow.matches(Settings.getPassRegex)) { + m.send(player, MessageKey.PASSWORD_MATCH_ERROR); + return false; + } else if (passLow.equalsIgnoreCase(player.getName())) { + m.send(player, MessageKey.PASSWORD_IS_USERNAME_ERROR); + return false; + } else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) { + m.send(player, MessageKey.INVALID_PASSWORD_LENGTH); + return false; + } else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) { + m.send(player, MessageKey.PASSWORD_UNSAFE_ERROR); + return false; + } + } + + //check this in both possiblities so don't use 'else if' + if (database.isAuthAvailable(name)) { m.send(player, MessageKey.NAME_ALREADY_REGISTERED); return false; } else if (Settings.getmaxRegPerIp > 0 @@ -133,14 +144,22 @@ public class AsyncRegister { m.send(player, MessageKey.ERROR); return; } + if (!Settings.forceRegLogin) { //PlayerCache.getInstance().addPlayer(auth); //database.setLogged(name); // TODO: check this... plugin.getManagement().performLogin(player, "dontneed", true); } + plugin.otherAccounts.addPlayer(player.getUniqueId()); ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin, settings); plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync); + + //give the user the secret code to setup their app code generation + if (Settings.getPasswordHash == HashAlgorithm.TWO_FACTOR) { + String qrCodeUrl = TwoFactor.getQRBarcodeURL(player.getName(), Bukkit.getIp(), hashedPassword.getHash()); + m.send(player, MessageKey.TWO_FACTOR_CREATE, hashedPassword.getHash(), qrCodeUrl); + } } } diff --git a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java index 389ad485f..f6f31830a 100644 --- a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java +++ b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java @@ -29,6 +29,7 @@ public enum HashAlgorithm { SHA1(fr.xephi.authme.security.crypts.SHA1.class), SHA256(fr.xephi.authme.security.crypts.SHA256.class), SHA512(fr.xephi.authme.security.crypts.SHA512.class), + TWO_FACTOR(fr.xephi.authme.security.crypts.TwoFactor.class), SMF(fr.xephi.authme.security.crypts.SMF.class), WBB3(fr.xephi.authme.security.crypts.WBB3.class), WBB4(fr.xephi.authme.security.crypts.WBB4.class), diff --git a/src/main/java/fr/xephi/authme/security/crypts/TwoFactor.java b/src/main/java/fr/xephi/authme/security/crypts/TwoFactor.java new file mode 100644 index 000000000..21a5f2fc1 --- /dev/null +++ b/src/main/java/fr/xephi/authme/security/crypts/TwoFactor.java @@ -0,0 +1,125 @@ +package fr.xephi.authme.security.crypts; + +import com.google.common.escape.Escaper; +import com.google.common.io.BaseEncoding; +import com.google.common.net.UrlEscapers; +import com.google.common.primitives.Ints; + +import fr.xephi.authme.security.crypts.description.HasSalt; +import fr.xephi.authme.security.crypts.description.Recommendation; +import fr.xephi.authme.security.crypts.description.SaltType; +import fr.xephi.authme.security.crypts.description.Usage; + +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.Calendar; +import java.util.concurrent.TimeUnit; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +@Recommendation(Usage.DOES_NOT_WORK) +@HasSalt(SaltType.NONE) +public class TwoFactor extends UnsaltedMethod { + + private static final int SCRET_BYTE = 10; + private static final int SCRATCH_CODES = 5; + private static final int BYTES_PER_SCRATCH_CODE = 4; + + private static final int TIME_PRECISION = 3; + private static final String CRYPTO_ALGO = "HmacSHA1"; + + public static String getQRBarcodeURL(String user, String host, String secret) { + String format = "https://www.google.com/chart?chs=130x130&chld=M%%7C0&cht=qr&chl=" + + "otpauth://totp/" + + "%s@%s%%3Fsecret%%3D%s"; + Escaper urlEscaper = UrlEscapers.urlFragmentEscaper(); + return String.format(format, urlEscaper.escape(user), urlEscaper.escape(host), secret); + } + + @Override + public String computeHash(String password) { + // Allocating the buffer + byte[] buffer = new byte[SCRET_BYTE + SCRATCH_CODES * BYTES_PER_SCRATCH_CODE]; + + // Filling the buffer with random numbers. + // Notice: you want to reuse the same random generator + // while generating larger random number sequences. + new SecureRandom().nextBytes(buffer); + + // Getting the key and converting it to Base32 + byte[] secretKey = Arrays.copyOf(buffer, SCRET_BYTE); + return BaseEncoding.base32().encode(secretKey); + } + + @Override + public boolean comparePassword(String password, HashedPassword hashedPassword, String name) { + try { + return checkPassword(hashedPassword.getHash(), password); + } catch (NoSuchAlgorithmException | InvalidKeyException encryptionException) { + throw new UnsupportedOperationException("Failed to compare passwords", encryptionException); + } + } + + public boolean checkPassword(String secretKey, String userInput) + throws NoSuchAlgorithmException, InvalidKeyException { + Integer code = Ints.tryParse(userInput); + if (code == null) { + //code is not an integer + return false; + } + + long currentTime = Calendar.getInstance().getTimeInMillis() / TimeUnit.SECONDS.toMillis(30); + return check_code(secretKey, code, currentTime); + } + + private boolean check_code(String secret, long code, long t) + throws NoSuchAlgorithmException, InvalidKeyException { + byte[] decodedKey = BaseEncoding.base32().decode(secret); + + // Window is used to check codes generated in the near past. + // You can use this value to tune how far you're willing to go. + int window = TIME_PRECISION; + for (int i = -window; i <= window; ++i) { + long hash = verify_code(decodedKey, t + i); + + if (hash == code) { + return true; + } + } + + // The validation code is invalid. + return false; + } + + private int verify_code(byte[] key, long t) throws NoSuchAlgorithmException, InvalidKeyException { + byte[] data = new byte[8]; + long value = t; + for (int i = 8; i-- > 0; value >>>= 8) { + data[i] = (byte) value; + } + + SecretKeySpec signKey = new SecretKeySpec(key, CRYPTO_ALGO); + Mac mac = Mac.getInstance(CRYPTO_ALGO); + mac.init(signKey); + byte[] hash = mac.doFinal(data); + + int offset = hash[20 - 1] & 0xF; + + // We're using a long because Java hasn't got unsigned int. + long truncatedHash = 0; + for (int i = 0; i < 4; ++i) { + truncatedHash <<= 8; + // We are dealing with signed bytes: + // we just keep the first byte. + truncatedHash |= (hash[offset + i] & 0xFF); + } + + truncatedHash &= 0x7FFF_FFFF; + truncatedHash %= 1_000_000; + + return (int) truncatedHash; + } +} diff --git a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java index 6a2ace715..0cd8a7342 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java @@ -9,6 +9,7 @@ import java.util.List; import static fr.xephi.authme.settings.domain.Property.newProperty; import static fr.xephi.authme.settings.domain.PropertyType.STRING_LIST; +import static fr.xephi.authme.settings.domain.Property.newProperty; public class SecuritySettings implements SettingsClass { diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index 921d616be..514f3fce0 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -58,3 +58,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 207de33dd..705007fe6 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -59,3 +59,4 @@ email_exists: '&cUm email de recuperação já foi enviado! Você pode reenviar country_banned: '&4Seu país foi banido do servidor! Your country is banned from this server!' antibot_auto_enabled: '&4[AntiBotService] AntiBot ativado devido ao grande número de conexões!' antibot_auto_disabled: '&2[AntiBotService] AntiBot desativado após %m minutos!' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml index f32d91201..7dbcff137 100644 --- a/src/main/resources/messages/messages_cz.yml +++ b/src/main/resources/messages/messages_cz.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spusten z duvodu masivnic antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukoncen po %m minutach, doufejme v konec invaze' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml index 51e950bdb..699e8cca9 100644 --- a/src/main/resources/messages/messages_de.yml +++ b/src/main/resources/messages/messages_de.yml @@ -57,3 +57,4 @@ country_banned: '&4Dein Land ist gesperrt' antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' kick_antibot: 'AntiBotMod ist aktiviert! Bitte warte einige Minuten, bevor du dich mit dem Server verbindest' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 308593861..a1cf19e1c 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -58,3 +58,4 @@ country_banned: '&4Your country is banned from this server!' antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' email_already_used: '&4The email address is already being used' +two_factor_create: '&2Your secret code is %code. You can scan it from here %url' diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml index d505761b0..7f0e82bdf 100644 --- a/src/main/resources/messages/messages_es.yml +++ b/src/main/resources/messages/messages_es.yml @@ -58,3 +58,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a co antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente luego de %m minutos. Esperamos que haya terminado' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml index 7edbfb3ef..30f462609 100644 --- a/src/main/resources/messages/messages_eu.yml +++ b/src/main/resources/messages/messages_eu.yml @@ -57,3 +57,4 @@ country_banned: '[AuthMe]Zure herrialdea blokeatuta dago zerbitzari honetan' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes,hope invasion stopped' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml index 5186049d1..318f3e391 100644 --- a/src/main/resources/messages/messages_fi.yml +++ b/src/main/resources/messages/messages_fi.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml index 20c40e60a..07b8ccb75 100644 --- a/src/main/resources/messages/messages_fr.yml +++ b/src/main/resources/messages/messages_fr.yml @@ -58,3 +58,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à ca antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index 807b41607..c2904cb37 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -59,3 +59,4 @@ antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despo esperemos que a invasión se detivera' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml index 099179f80..6c63f1c41 100644 --- a/src/main/resources/messages/messages_hu.yml +++ b/src/main/resources/messages/messages_hu.yml @@ -57,3 +57,4 @@ country_banned: '&4Az országod tiltólistán van ezen a szerveren!' antibot_auto_enabled: '&4[AntiBot] Az AntiBot védelem bekapcsolt a nagy számú hálózati kapcsolat miatt!' antibot_auto_disabled: '&2[AntiBot] Az AntiBot kikapcsol %m múlva!' kick_antibot: 'Az AntiBot védelem bekapcsolva! Kérünk várj pár másodpercet a csatlakozáshoz.' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml index e4b8279a9..facb25f77 100644 --- a/src/main/resources/messages/messages_id.yml +++ b/src/main/resources/messages/messages_id.yml @@ -57,3 +57,4 @@ country_banned: '&4Your country is banned from this server!' antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml index 91752f0be..f037f28ef 100644 --- a/src/main/resources/messages/messages_it.yml +++ b/src/main/resources/messages/messages_it.yml @@ -57,3 +57,4 @@ country_banned: 'Il tuo paese è bandito da questo server!' antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index f49b0d2b3..b90f7ce0f 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -61,3 +61,4 @@ country_banned: '당신의 국가는 이 서버에서 차단당했습니다' antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml index 3c2dc2769..f19b4b46f 100644 --- a/src/main/resources/messages/messages_lt.yml +++ b/src/main/resources/messages/messages_lt.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml index 9f3d8f1ac..9b87f81d3 100644 --- a/src/main/resources/messages/messages_nl.yml +++ b/src/main/resources/messages/messages_nl.yml @@ -57,3 +57,4 @@ antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' reg_email_msg: '&3Please, register to the server with the command "/register "' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml index eb3403f9f..b4184e7d9 100644 --- a/src/main/resources/messages/messages_pl.yml +++ b/src/main/resources/messages/messages_pl.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml index bdde99740..8d7938470 100644 --- a/src/main/resources/messages/messages_pt.yml +++ b/src/main/resources/messages/messages_pt.yml @@ -1,7 +1,7 @@ unknown_user: '&fUtilizador não existente na base de dados' unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' not_logged_in: '&cNão autenticado!' -reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' +reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' usage_log: '&cUse: /login password' wrong_pwd: '&cPassword errada!' unregistered: '&cRegisto eliminado com sucesso!' @@ -58,3 +58,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index c9de92f31..8ccfb2c28 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index d2a97bfdf..34096ed81 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -61,3 +61,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml index 4d8c6dbde..33e6fb8e2 100644 --- a/src/main/resources/messages/messages_tr.yml +++ b/src/main/resources/messages/messages_tr.yml @@ -57,3 +57,4 @@ country_banned: 'Ulken bu serverdan banlandi !' antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml index 455693635..8f5cd93ed 100644 --- a/src/main/resources/messages/messages_uk.yml +++ b/src/main/resources/messages/messages_uk.yml @@ -57,3 +57,4 @@ antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкне antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 18e86fe05..3181d536b 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -57,3 +57,4 @@ password_error_nick: '&cYou can''t use your name as password, please choose anot password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml index 897c052da..3c67b6fe9 100644 --- a/src/main/resources/messages/messages_zhcn.yml +++ b/src/main/resources/messages/messages_zhcn.yml @@ -59,3 +59,4 @@ email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常的連線而啟用。' antibot_auto_disabled: '&8[&6用戶系統&8] 防止機械人程序檢查到不正常連接數已減少，並於 %m 分鐘後停止運作。' +two_factor_create: '&2Your secret code is %code' \ No newline at end of file diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml index be7afd51b..ce512b3fc 100644 --- a/src/main/resources/messages/messages_zhhk.yml +++ b/src/main/resources/messages/messages_zhhk.yml @@ -60,3 +60,4 @@ antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時 antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +two_factor_create: '&2Your secret code is %code' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index d6ab4e688..39b5dafd1 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -1,4 +1,4 @@ -# Translator: MineWolf50 +# Translator: MineWolf50 # Last Time Edit : 2015 / 7 / 14 , A.M.10:14 # = = = = = = = = = = = = = = = = = = = = = = = # unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" @@ -60,3 +60,4 @@ country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +two_factor_create: '&2Your secret code is %code'