Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-23 18:55:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branches '642-kick-on-fast-commands' and 'master' of https://github.com/AuthMe/AuthMeReloaded into 642-kick-on-fast-commands

Browse Source
This commit is contained in:
HexelDev 2018-03-15 19:47:11 +01:00
commit d2fbf12c3c
75 changed files with 537 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
README.md
View File

@ -1,53 +1,16 @@
<p align="center"><img src="http://i63.tinypic.com/rtp06o.png"></p>
<p align="center"><strong>The most used authentication plugin for the Spigot and derivates!</strong></p>
<hr>
# AuthMeReloaded
**"The best authentication plugin for the Bukkit modding API!"**
<img src="http://i63.tinypic.com/rtp06o.png" alt="AuthMeLogo" style="width: 250px;"/>
##### Links and Contacts:
| Type | Badges |
|-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **General:** | ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=code) ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=files) |
| **Code quality:** | [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded) [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master) |
| **Jenkins CI:** | [![Jenkins Status](https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=ci.codemc.org)](https://ci.codemc.org/) [![Build Status](https://ci.codemc.org/buildStatus/icon?job=AuthMe/AuthMeReloaded)](https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded) ![Build Tests](https://img.shields.io/jenkins/t/https/ci.codemc.org/job/AuthMe/job/AuthMeReloaded.svg) |
| **Other CIs:** | [![CircleCI](https://circleci.com/gh/AuthMe/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe/AuthMeReloaded) |
| **Dependencies:** | [![Dependency Status](https://gemnasium.com/badges/github.com/AuthMe/AuthMeReloaded.svg)](https://gemnasium.com/github.com/AuthMe/AuthMeReloaded) |
- Support:
- [GitHub issue tracker](https://github.com/AuthMe/AuthMeReloaded/issues)
- [BukkitDev page](https://dev.bukkit.org/projects/authme-reloaded)
- [Spigot page](https://www.spigotmc.org/resources/authmereloaded.6269/)
- [Discord](https://discord.gg/Vn9eCyE)
- CI Services:
- [Official Jenkins](http://ci.xephi.fr/job/AuthMeReloaded) (**DEVELOPMENT BUILDS**)
- CircleCI: [![CircleCI](https://circleci.com/gh/AuthMe/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe/AuthMeReloaded)
- Project status:
- Test coverage: [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master)
- Code climate: [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded)
- Development resources:
- <a href="http://ci.xephi.fr/job/AuthMeReloaded/javadoc/">JavaDocs</a>
- <a href="http://ci.xephi.fr/plugin/repository/everything/">Maven Repository</a>
- Statistics:
- bStats: [AuthMe on bstats.org](https://bstats.org/plugin/bukkit/AuthMe)
<hr>
##### Compiling requirements:
>- JDK 1.8
>- Maven
>- Git/Github (Optional)
##### How to compile the project:
>- Clone the project with Git/Github
>- Execute command "mvn clean package"
##### Running requirements:
>- Java 1.8
>- TacoSpigot, PaperSpigot or Spigot (1.7.10, 1.8.X, 1.9.X, 1.10.X, 1.11.X, 1.12.X)<br>
(In case you use Thermos, Cauldron or similar, you have to update the SpecialSource library to support Java 8 plugins.
HowTo: https://github.com/games647/FastLogin/issues/111#issuecomment-272331347)
>- ProtocolLib (optional, required by some features)
<hr>
### Plugin Description:
##### "The best authentication plugin for the Bukkit/Spigot API!"
## Description
Prevent username stealing on your server!<br>
Use it to secure your Offline mode server or to increase your Online mode server's protection!
@ -116,15 +79,51 @@ You can also create your own translation file and, if you want, you can share it
- [How to convert from Rakamak](https://dev.bukkit.org/projects/authme-reloaded/pages/how-to-import-database-from-rakamak)
- Convert between database types (e.g. SQLite to MySQL): /authme converter
<hr>
##### Sponsor
## Links and Contacts
- **Support:**
- [GitHub issue tracker](https://github.com/AuthMe/AuthMeReloaded/issues)
- [BukkitDev page](https://dev.bukkit.org/projects/authme-reloaded)
- [Spigot page](https://www.spigotmc.org/resources/authmereloaded.6269/)
- [Discord](https://discord.gg/Vn9eCyE)
- **Dev resources:**
- <a href="https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded/javadoc/">JavaDocs</a>
- <a href="http://repo.codemc.org/repository/maven-public/">Maven Repository</a>
- **Statistics:**
![Graph](https://bstats.org/signatures/bukkit/AuthMe.svg)
## Requirements
##### Compiling requirements:
>- JDK 1.8
>- Maven
>- Git/Github (Optional)
##### How to compile the project:
>- Clone the project with Git/Github
>- Execute command "mvn clean package"
##### Running requirements:
>- Java 1.8
>- TacoSpigot, PaperSpigot or Spigot (1.7.10, 1.8.X, 1.9.X, 1.10.X, 1.11.X, 1.12.X)<br>
(In case you use Thermos, Cauldron or similar, you have to update the SpecialSource library to support Java 8 plugins.
HowTo: https://github.com/games647/FastLogin/issues/111#issuecomment-272331347)
>- ProtocolLib (optional, required by some features)
## Credits
##### Sponsor:
[GameHosting.it](http://www.gamehosting.it) is leader in Italy as Game Server Provider. With its own DataCenter offers Anti-DDoS solutions at affordable prices. Game Server of Minecraft based on Multicraft are equipped with the latest technology in hardware.
##### Credits
<p>Contributors: <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Development-team">developers</a>, <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Translators">translators</a>
<p>Credit for old version of the plugin to: d4rkwarriors, fabe1337, Whoami2 and pomo4ka</p>
<p>Thanks also to: AS1LV3RN1NJA, Hoeze and eprimex</p>
##### Contributors:
Team members: <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Development-team">developers</a>, <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Translators">translators</a>
##### GeoIP License
Credits for the old version of the plugin: d4rkwarriors, fabe1337, Whoami2 and pomo4ka
Thanks also to: AS1LV3RN1NJA, Hoeze and eprimex
##### GeoIP License:
This product uses data from the GeoLite API created by MaxMind, available at http://www.maxmind.com

13
pom.xml
View File

@ -189,10 +189,15 @@
<version>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>aggregate-javadoc</id>
<goals>
<goal>aggregate</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>
@ -456,7 +461,7 @@
<dependency>
<groupId>de.mkammerer</groupId>
<artifactId>argon2-jvm-nolibs</artifactId>
<version>2.3</version>
<version>2.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -539,7 +544,7 @@
<dependency>
<groupId>me.lucko.luckperms</groupId>
<artifactId>luckperms-api</artifactId>
<version>4.0</version>
<version>4.1</version>
<scope>provided</scope>
</dependency>

2
src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
View File

@ -74,7 +74,7 @@ public class RegisterAdminCommand implements ExecutableCommand {
final Player player = bukkitService.getPlayerExact(playerName);
if (player != null) {
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
player.kickPlayer(commonService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER)));
player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER)));
}
});
}

5
src/main/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChanger.java
View File

@ -172,6 +172,11 @@ class MySqlDefaultChanger implements DebugSection {
+ sender.getName() + "'");
}
/**
* Outputs the current definitions of all {@link Columns} which can be migrated.
*
* @param sender command sender to output the data to
*/
private void showColumnDetails(CommandSender sender) {
sender.sendMessage(ChatColor.BLUE + "MySQL column details");
final String tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);

2
src/main/java/fr/xephi/authme/data/TempbanManager.java
View File

@ -97,7 +97,7 @@ public class TempbanManager implements SettingsDependent, HasCleanup {
if (isEnabled) {
final String name = player.getName();
final String ip = PlayerUtils.getPlayerIp(player);
final String reason = messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS);
final String reason = messages.retrieveSingle(player, MessageKey.TEMPBAN_MAX_LOGINS);
final Date expires = new Date();
long newTime = expires.getTime() + (length * MILLIS_PER_MINUTE);

6
src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java
View File

@ -49,9 +49,9 @@ class LimboPlayerTaskManager {
*/
void registerMessageTask(Player player, LimboPlayer limbo, boolean isRegistered) {
int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
MessageResult messageResult = getMessageKey(player.getName(), isRegistered);
MessageResult result = getMessageKey(player.getName(), isRegistered);
if (interval > 0) {
String[] joinMessage = messages.retrieveSingle(messageResult.messageKey, messageResult.args).split("\n");
String[] joinMessage = messages.retrieveSingle(player, result.messageKey, result.args).split("\n");
MessageTask messageTask = new MessageTask(player, joinMessage);
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
limbo.setMessageTask(messageTask);
@ -67,7 +67,7 @@ class LimboPlayerTaskManager {
void registerTimeoutTask(Player player, LimboPlayer limbo) {
final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
if (timeout > 0) {
String message = messages.retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
String message = messages.retrieveSingle(player, MessageKey.LOGIN_TIMEOUT_ERROR);
BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
limbo.setTimeoutTask(task);
}

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

@ -28,6 +28,10 @@ import java.util.Set;
import static fr.xephi.authme.datasource.SqlDataSourceUtils.getNullableLong;
import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
/**
* MySQL data source.
*/
@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
public class MySQL implements DataSource {
private boolean useSsl;
@ -728,6 +732,13 @@ public class MySQL implements DataSource {
return players;
}
/**
* Creates a {@link PlayerAuth} object with the data from the provided result set.
*
* @param row the result set to read from
* @return generated player auth object with the data from the result set
* @throws SQLException .
*/
private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
String salt = col.SALT.isEmpty() ? null : row.getString(col.SALT);
int group = col.GROUP.isEmpty() ? -1 : row.getInt(col.GROUP);

1
src/main/java/fr/xephi/authme/datasource/SQLite.java
View File

@ -28,6 +28,7 @@ import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
/**
* SQLite data source.
*/
@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
public class SQLite implements DataSource {
private final Settings settings;

6
src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java
View File

@ -123,7 +123,7 @@ public class OnJoinVerifier implements Reloadable {
return false;
} else if (!permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)) {
// Server is full and player is NOT VIP; set kick message and proceed with kick
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER));
event.setKickMessage(messages.retrieveSingle(player, MessageKey.KICK_FULL_SERVER));
return true;
}
@ -135,12 +135,12 @@ public class OnJoinVerifier implements Reloadable {
}
Player nonVipPlayer = generateKickPlayer(onlinePlayers);
if (nonVipPlayer != null) {
nonVipPlayer.kickPlayer(messages.retrieveSingle(MessageKey.KICK_FOR_VIP));
nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP));
event.allow();
return false;
} else {
ConsoleLogger.info("VIP player " + player.getName() + " tried to join, but the server was full");
event.setKickMessage(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER));
event.setKickMessage(messages.retrieveSingle(player, MessageKey.KICK_FULL_SERVER));
return true;
}
}

4
src/main/java/fr/xephi/authme/listener/PlayerListener.java
View File

@ -270,7 +270,7 @@ public class PlayerListener implements Listener {
try {
runOnJoinChecks(JoiningPlayer.fromName(name), event.getAddress().getHostAddress());
} catch (FailedVerificationException e) {
event.setKickMessage(m.retrieveSingle(e.getReason(), e.getArgs()));
event.setKickMessage(m.retrieveSingle(name, e.getReason(), e.getArgs()));
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
}
}
@ -298,7 +298,7 @@ public class PlayerListener implements Listener {
try {
runOnJoinChecks(JoiningPlayer.fromPlayerObject(player), event.getAddress().getHostAddress());
} catch (FailedVerificationException e) {
event.setKickMessage(m.retrieveSingle(e.getReason(), e.getArgs()));
event.setKickMessage(m.retrieveSingle(player, e.getReason(), e.getArgs()));
event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
}
}

3
src/main/java/fr/xephi/authme/listener/PlayerListener19Spigot.java
View File

@ -12,10 +12,11 @@ import javax.inject.Inject;
public class PlayerListener19Spigot implements Listener {
private static boolean isPlayerSpawnLocationEventCalled = false;
@Inject
private TeleportationService teleportationService;
private static boolean isPlayerSpawnLocationEventCalled = false;
public static boolean isPlayerSpawnLocationEventCalled() {
return isPlayerSpawnLocationEventCalled;

79
src/main/java/fr/xephi/authme/message/Messages.java
View File

@ -5,6 +5,7 @@ import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.expiring.Duration;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import javax.inject.Inject;
import java.util.Map;
@ -18,7 +19,9 @@ public class Messages {
// Custom Authme tag replaced to new line
private static final String NEWLINE_TAG = "%nl%";
private static final String PLAYER_TAG = "%username%";
// Global tag replacements
private static final String USERNAME_TAG = "%username%";
private static final String DISPLAYNAME_TAG = "%displayname%";
/** Contains the keys of the singular messages for time units. */
private static final Map<TimeUnit, MessageKey> TIME_UNIT_SINGULARS = ImmutableMap.<TimeUnit, MessageKey>builder()
@ -51,9 +54,9 @@ public class Messages {
* @param key The key of the message to send
*/
public void send(CommandSender sender, MessageKey key) {
String[] lines = retrieve(key);
String[] lines = retrieve(key, sender);
for (String line : lines) {
sender.sendMessage(line.replaceAll(PLAYER_TAG, sender.getName()));
sender.sendMessage(line);
}
}
@ -67,7 +70,7 @@ public class Messages {
* @param replacements The replacements to apply for the tags
*/
public void send(CommandSender sender, MessageKey key, String... replacements) {
String message = retrieveSingle(key, replacements).replaceAll(PLAYER_TAG, sender.getName());
String message = retrieveSingle(sender, key, replacements);
for (String line : message.split("\n")) {
sender.sendMessage(line);
}
@ -77,10 +80,11 @@ public class Messages {
* Retrieve the message from the text file and return it split by new line as an array.
*
* @param key The message key to retrieve
* @param sender The entity to send the message to
* @return The message split by new lines
*/
public String[] retrieve(MessageKey key) {
String message = retrieveMessage(key);
public String[] retrieve(MessageKey key, CommandSender sender) {
String message = retrieveMessage(key, sender);
if (message.isEmpty()) {
// Return empty array instead of array with 1 empty string as entry
return new String[0];
@ -101,18 +105,43 @@ public class Messages {
? TIME_UNIT_SINGULARS.get(duration.getTimeUnit())
: TIME_UNIT_PLURALS.get(duration.getTimeUnit());
return value + " " + retrieveMessage(timeUnitKey);
return value + " " + retrieveMessage(timeUnitKey, "");
}
/**
* Retrieve the message from the text file.
*
* @param key The message key to retrieve
* @param sender The entity to send the message to
* @return The message from the file
*/
private String retrieveMessage(MessageKey key) {
return formatMessage(
messagesFileHandler.getMessage(key.getKey()));
private String retrieveMessage(MessageKey key, CommandSender sender) {
String message = messagesFileHandler.getMessage(key.getKey());
String displayName = sender.getName();
if (sender instanceof Player) {
displayName = ((Player) sender).getDisplayName();
}
return ChatColor.translateAlternateColorCodes('&', message)
.replace(NEWLINE_TAG, "\n")
.replace(USERNAME_TAG, sender.getName())
.replace(DISPLAYNAME_TAG, displayName);
}
/**
* Retrieve the message from the text file.
*
* @param key The message key to retrieve
* @param name The name of the entity to send the message to
* @return The message from the file
*/
private String retrieveMessage(MessageKey key, String name) {
String message = messagesFileHandler.getMessage(key.getKey());
return ChatColor.translateAlternateColorCodes('&', message)
.replace(NEWLINE_TAG, "\n")
.replace(USERNAME_TAG, name)
.replace(DISPLAYNAME_TAG, name);
}
/**
@ -120,12 +149,13 @@ public class Messages {
* logs an error if the number of supplied replacements doesn't correspond to the number of tags
* the message key contains.
*
* @param sender The entity to send the message to
* @param key The key of the message to send
* @param replacements The replacements to apply for the tags
* @return The message from the file with replacements
*/
public String retrieveSingle(MessageKey key, String... replacements) {
String message = retrieveMessage(key);
public String retrieveSingle(CommandSender sender, MessageKey key, String... replacements) {
String message = retrieveMessage(key, sender);
String[] tags = key.getTags();
if (replacements.length == tags.length) {
for (int i = 0; i < tags.length; ++i) {
@ -137,9 +167,26 @@ public class Messages {
return message;
}
private static String formatMessage(String message) {
return ChatColor.translateAlternateColorCodes('&', message)
.replace(NEWLINE_TAG, "\n");
/**
* Retrieve the given message code with the given tag replacements. Note that this method
* logs an error if the number of supplied replacements doesn't correspond to the number of tags
* the message key contains.
*
* @param name The name of the entity to send the message to
* @param key The key of the message to send
* @param replacements The replacements to apply for the tags
* @return The message from the file with replacements
*/
public String retrieveSingle(String name, MessageKey key, String... replacements) {
String message = retrieveMessage(key, name);
String[] tags = key.getTags();
if (replacements.length == tags.length) {
for (int i = 0; i < tags.length; ++i) {
message = message.replace(tags[i], replacements[i]);
}
} else {
ConsoleLogger.warning("Invalid number of replacements for message key '" + key + "'");
}
return message;
}
}

3
src/main/java/fr/xephi/authme/permission/handlers/LuckPermsHandler.java
View File

@ -62,7 +62,8 @@ public class LuckPermsHandler implements PermissionHandler {
return false;
}
DataMutateResult result = user.setPermissionUnchecked(luckPermsApi.getNodeFactory().makeGroupNode(newGroup).build());
DataMutateResult result = user.setPermissionUnchecked(
luckPermsApi.getNodeFactory().makeGroupNode(newGroup).build());
if (result == DataMutateResult.FAIL) {
return false;
}

4
src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
View File

@ -138,7 +138,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
private void handlePlayerWithUnmetNameRestriction(Player player, String ip) {
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
player.kickPlayer(service.retrieveSingleMessage(MessageKey.NOT_OWNER_ERROR));
player.kickPlayer(service.retrieveSingleMessage(player, MessageKey.NOT_OWNER_ERROR));
if (service.getProperty(RestrictionSettings.BAN_UNKNOWN_IP)) {
server.banIP(ip);
}
@ -188,7 +188,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
&& countOnlinePlayersByIp(ip) > service.getProperty(RestrictionSettings.MAX_JOIN_PER_IP)) {
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.SAME_IP_ONLINE)));
() -> player.kickPlayer(service.retrieveSingleMessage(player, MessageKey.SAME_IP_ONLINE)));
return false;
}
return true;

2
src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
View File

@ -197,7 +197,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
tempbanManager.tempbanPlayer(player);
} else if (service.getProperty(RestrictionSettings.KICK_ON_WRONG_PASSWORD)) {
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
() -> player.kickPlayer(service.retrieveSingleMessage(MessageKey.WRONG_PASSWORD)));
() -> player.kickPlayer(service.retrieveSingleMessage(player, MessageKey.WRONG_PASSWORD)));
} else {
service.send(player, MessageKey.WRONG_PASSWORD);

9
src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java
View File

@ -10,7 +10,9 @@ import org.bukkit.entity.Player;
import javax.inject.Inject;
/**
* Performs synchronous tasks after a successful {@link RegistrationType#EMAIL email registration}.
*/
public class ProcessSyncEmailRegister implements SynchronousProcess {
@Inject
@ -22,6 +24,11 @@ public class ProcessSyncEmailRegister implements SynchronousProcess {
ProcessSyncEmailRegister() {
}
/**
* Performs sync tasks for a player which has just registered by email.
*
* @param player the recently registered player
*/
public void processEmailRegister(Player player) {
service.send(player, MessageKey.ACCOUNT_NOT_ACTIVATED);
limboService.replaceTasksAfterRegistration(player);

8
src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
View File

@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
import javax.inject.Inject;
/**
* Performs synchronous tasks after a successful {@link RegistrationType#PASSWORD password registration}.
*/
public class ProcessSyncPasswordRegister implements SynchronousProcess {
@ -46,6 +47,11 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
}
}
/**
* Processes a player having registered with a password.
*
* @param player the newly registered player
*/
public void processPasswordRegister(Player player) {
service.send(player, MessageKey.REGISTER_SUCCESS);
@ -58,7 +64,7 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
// Kick Player after Registration is enabled, kick the player
if (service.getProperty(RegistrationSettings.FORCE_KICK_AFTER_REGISTER)) {
player.kickPlayer(service.retrieveSingleMessage(MessageKey.REGISTER_SUCCESS));
player.kickPlayer(service.retrieveSingleMessage(player, MessageKey.REGISTER_SUCCESS));
return;
}

5
src/main/java/fr/xephi/authme/service/CommonService.java
View File

@ -63,11 +63,12 @@ public class CommonService {
/**
* Retrieves a message in one piece.
*
* @param sender The entity to send the message to
* @param key the key of the message
* @return the message
*/
public String retrieveSingleMessage(MessageKey key) {
return messages.retrieveSingle(key);
public String retrieveSingleMessage(CommandSender sender, MessageKey key) {
return messages.retrieveSingle(sender, key);
}
/**

27
src/main/java/fr/xephi/authme/service/SessionService.java
View File

@ -45,11 +45,13 @@ public class SessionService implements Reloadable {
database.setUnlogged(name);
database.revokeSession(name);
PlayerAuth auth = database.getAuth(name);
if (hasValidSessionData(auth, player)) {
SessionState state = fetchSessionStatus(auth, player);
if (state.equals(SessionState.VALID)) {
RestoreSessionEvent event = bukkitService.createAndCallEvent(
isAsync -> new RestoreSessionEvent(player, isAsync));
return !event.isCancelled();
} else {
} else if (state.equals(SessionState.IP_CHANGED)) {
service.send(player, MessageKey.SESSION_EXPIRED);
}
}
@ -62,19 +64,26 @@ public class SessionService implements Reloadable {
*
* @param auth the player auth
* @param player the associated player
* @return true if the player may resume his login session, false otherwise
* @return SessionState based on the state of the session (VALID, NOT_VALID, OUTDATED, IP_CHANGED)
*/
private boolean hasValidSessionData(PlayerAuth auth, Player player) {
private SessionState fetchSessionStatus(PlayerAuth auth, Player player) {
if (auth == null) {
ConsoleLogger.warning("No PlayerAuth in database for '" + player.getName() + "' during session check");
return false;
return SessionState.NOT_VALID;
} else if (auth.getLastLogin() == null) {
return false;
return SessionState.NOT_VALID;
}
long timeSinceLastLogin = System.currentTimeMillis() - auth.getLastLogin();
return PlayerUtils.getPlayerIp(player).equals(auth.getLastIp())
&& timeSinceLastLogin > 0
&& timeSinceLastLogin < service.getProperty(PluginSettings.SESSIONS_TIMEOUT) * MILLIS_PER_MINUTE;
if (timeSinceLastLogin > 0
&& timeSinceLastLogin < service.getProperty(PluginSettings.SESSIONS_TIMEOUT) * MILLIS_PER_MINUTE) {
if (PlayerUtils.getPlayerIp(player).equals(auth.getLastIp())) {
return SessionState.VALID;
} else {
return SessionState.IP_CHANGED;
}
}
return SessionState.OUTDATED;
}
public void grantSession(String name) {

13
src/main/java/fr/xephi/authme/service/SessionState.java Normal file
View File

@ -0,0 +1,13 @@
package fr.xephi.authme.service;
public enum SessionState {
VALID,
NOT_VALID,
OUTDATED,
IP_CHANGED
}

6
src/main/java/fr/xephi/authme/settings/SettingsWarner.java
View File

@ -56,9 +56,9 @@ public class SettingsWarner {
// Warn if spigot.yml has settings.bungeecord set to true but config.yml has Hooks.bungeecord set to false
if (Utils.isSpigot() && Bukkit.spigot().getConfig().getBoolean("settings.bungeecord")
&& !settings.getProperty(HooksSettings.BUNGEECORD)) {
ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in" +
" bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the AuthMeBungee" +
" add-on to work properly you have to enable this option!");
ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in"
+ " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the"
+ " AuthMeBungee add-on to work properly you have to enable this option!");
}
// Check if argon2 library is present and can be loaded

15
src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java
View File

@ -61,6 +61,11 @@ public class PurgeExecutor {
purgePermissions(players);
}
/**
* Purges data from the AntiXray plugin.
*
* @param cleared the players whose data should be cleared
*/
synchronized void purgeAntiXray(Collection<String> cleared) {
if (!settings.getProperty(PurgeSettings.REMOVE_ANTI_XRAY_FILE)) {
return;
@ -95,6 +100,11 @@ public class PurgeExecutor {
ConsoleLogger.info(ChatColor.GOLD + "Deleted " + names.size() + " user accounts");
}
/**
* Purges data from the LimitedCreative plugin.
*
* @param cleared the players whose data should be cleared
*/
synchronized void purgeLimitedCreative(Collection<String> cleared) {
if (!settings.getProperty(PurgeSettings.REMOVE_LIMITED_CREATIVE_INVENTORIES)) {
return;
@ -191,6 +201,11 @@ public class PurgeExecutor {
ConsoleLogger.info("AutoPurge: Removed " + deletedFiles + " EssentialsFiles");
}
/**
* Removes permission data (groups a user belongs to) for the given players.
*
* @param cleared the players to remove data for
*/
synchronized void purgePermissions(Collection<OfflinePlayer> cleared) {
if (!settings.getProperty(PurgeSettings.REMOVE_PERMISSIONS)) {
return;

5
src/main/resources/messages/messages_bg.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cРегистрациите са изключени!'

4
src/main/resources/messages/messages_br.yml
View File

@ -1,6 +1,10 @@
#Tradução pt/br Authme Reloaded
#Feito por GabrielDev(DeathRush) e Frani (PotterCraft_)
# http://gamersboard.com.br/ | www.magitechserver.com
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_cz.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRegistrace je zakázána!'

5
src/main/resources/messages/messages_de.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRegistrierungen sind deaktiviert'

5
src/main/resources/messages/messages_en.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
register_request: '&3Please, register to the server with the command: /register <password> <ConfirmPassword>'

5
src/main/resources/messages/messages_eo.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cEn-ludo registriĝo estas malebligita!'

4
src/main/resources/messages/messages_es.yml
View File

@ -1,4 +1,8 @@
# This file must be in ANSI if win, or UTF-8 if linux.
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_et.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cMängusisene registreerimine välja lülitatud!'

5
src/main/resources/messages/messages_eu.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cErregistroa desgaitua'

5
src/main/resources/messages/messages_fi.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRekisteröinti on suljettu!'

5
src/main/resources/messages/messages_fr.yml
View File

@ -1,7 +1,10 @@
# Traduction par: André & Twonox
# Pour afficher une apostrophe, vous devez en mettre deux consécutivement (ex: «J''ai» au lieu de «J'ai»)
# Pour passer à la ligne, utilisez: %nl%
# List of global tags:
# %nl% - Pour passer à la ligne.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_gl.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cO rexistro está deshabilitado'

5
src/main/resources/messages/messages_hu.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cA regisztráció letiltva!'

5
src/main/resources/messages/messages_id.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRegister dalam game tidak diaktifkan!'

28
src/main/resources/messages/messages_it.yml
View File

@ -1,6 +1,10 @@
# Lingua Italiana creata da Maxetto e sgdc3.
# Lingua Italiana creata da Maxetto.
# Tag globali disponibili:
# %nl% - Vai a capo.
# %username% - Sostituisce il nome dell'utente che riceve il messaggio.
# %displayname% - Sostituisce il nickname (e i colori) dell'utente che riceve il messaggio.
# Registration
# Registrazione
registration:
disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.'
name_taken: '&cHai già eseguito la registrazione, non puoi eseguirla nuovamente.'
@ -10,7 +14,7 @@ registration:
success: '&2Registrato correttamente!'
kicked_admin_registered: 'Un amministratore ti ha appena registrato, per favore rientra nel server'
# Password errors on registration
# Errori della password durante la registrazione
password:
match_error: '&cLe password non corrispondono!'
name_in_password: '&cNon puoi usare il tuo nome utente come password, per favore scegline un''altra...'
@ -18,7 +22,7 @@ password:
forbidden_characters: '&4La tua password contiene caratteri non consentiti. I caratteri consentiti sono: %valid_chars'
wrong_length: '&cLa password che hai inserito è troppo corta o troppo lunga, per favore scegline un''altra...'
# Login
# Autenticazione
login:
command_usage: '&cUtilizzo: /login <password>'
wrong_password: '&cPassword non corretta!'
@ -26,7 +30,7 @@ login:
login_request: '&cPer favore, esegui l''autenticazione con il comando: /login <password>'
timeout_error: '&4Tempo scaduto per eseguire l''autenticazione, sei stato espulso dal server, per favore riprova!'
# Errors
# Errori
error:
denied_command: '&cPer poter usare questo comando devi essere autenticato!'
denied_chat: '&cPer poter scrivere messaggi in chat devi essere autenticato!'
@ -45,12 +49,12 @@ antibot:
auto_enabled: '&4Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!'
auto_disabled: '&2Il servizio di AntiBot è stato automaticamente disabilitato dopo %m minuti!'
# Unregister
# Rimozione dal Database
unregister:
success: '&2Sei stato correttamente rimosso dal database!'
command_usage: '&cUtilizzo: /unregister <password>'
# Other messages
# Altri messaggi
misc:
account_not_activated: '&cIl tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!'
password_changed: '&2Password cambiata correttamente!'
@ -61,12 +65,12 @@ misc:
accounts_owned_self: 'Possiedi %count account:'
accounts_owned_other: 'Il giocatore %name possiede %count account:'
# Session messages
# Messaggi della sessione
session:
valid_session: '&2Autenticato automaticamente attraverso la precedente sessione!'
invalid_session: '&cIl tuo indirizzo IP è cambiato e la tua sessione è stata terminata!'
# Error messages when joining
# Messaggi di errore durante l'accesso
on_join_validation:
same_ip_online: 'Un giocatore con il tuo stesso IP è già connesso sul server!'
same_nick_online: '&4Un giocatore con il tuo stesso nome utente è già connesso sul server!'
@ -96,7 +100,7 @@ email:
change_password_expired: 'Non puoi più cambiare la tua password con questo comando.'
email_cooldown_error: '&cUna email di recupero ti è già stata inviata recentemente. Devi attendere %time prima di poterne richiedere una nuova.'
# Password recovery by email
# Recupero password via Email
recovery:
forgot_password_hint: '&3Hai dimenticato la tua password? Puoi recuperarla eseguendo il comando: /email recovery <email>'
command_usage: '&cUtilizzo: /email recovery <email>'
@ -116,7 +120,7 @@ captcha:
captcha_for_registration: 'Per poterti registrare devi prima risolvere un captcha, per favore scrivi: /captcha %captcha_code'
register_captcha_valid: '&2Il captcha inserito è valido! Ora puoi eseguire la registrazione con: /register <password> <confermaPassword>'
# Verification code
# Codice di verifica
verification:
code_required: '&3Questo comando va a modificare dati sensibili e richiede una verifica tramite email! Controlla la tua posta in arrivo e segui le istruzioni nell''email.'
command_usage: '&cUtilizzo: /verification <codice>'
@ -126,7 +130,7 @@ verification:
code_expired: '&3Il tuo codice è scaduto! Esegui nuovamente un comando che modifica dati sensibili per ricevere uno nuovo codice!'
email_needed: '&3Per verificare la tua identità devi collegare un indirizzo email al tuo account!'
# Time units
# Unità di tempo
time:
second: 'secondo'
seconds: 'secondi'

4
src/main/resources/messages/messages_ko.yml
View File

@ -1,5 +1,9 @@
#Translated by Kirito (kds123321@naver.com), System32(me@syst32.com), Adeuran(adeuran@tistory.com)
#14.05.2017 Thanks for use
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_lt.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&6Registracija yra isjungta'

5
src/main/resources/messages/messages_nl.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRegistratie is uitgeschakeld!'

5
src/main/resources/messages/messages_pl.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&4Rejestracja jest wyłączona.'

5
src/main/resources/messages/messages_pt.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cRegisto de novos utilizadores desactivado'

5
src/main/resources/messages/messages_ro.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cInregistrarea in joc nu este activata!'

5
src/main/resources/messages/messages_ru.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cРегистрация отключена.'

4
src/main/resources/messages/messages_sk.yml
View File

@ -4,6 +4,10 @@
# in future there can be more translators #
# if they are not listed here #
# check Translators on GitHub Wiki. #
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_tr.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cOyun icin kayit olma kapatildi!'

5
src/main/resources/messages/messages_uk.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cВнутрішньоігрову реєстрацію зараз вимкнено.'

5
src/main/resources/messages/messages_vn.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&cKhông cho phép đăng ký tài khoản trong máy chủ!'

5
src/main/resources/messages/messages_zhcn.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&8[&6玩家系统&8] &c目前服务器暂时禁止注册，请到服务器论坛以得到更多资讯'

4
src/main/resources/messages/messages_zhhk.yml
View File

@ -1,6 +1,10 @@
# Translator: lifehome<m@lifeho.me> #
# Last modif: 1508689979 UTC #
# -------------------------------------------- #
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

5
src/main/resources/messages/messages_zhmc.yml
View File

@ -1,3 +1,8 @@
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:
disabled: '&c遊戲內註冊已停用!'

4
src/main/resources/messages/messages_zhtw.yml
View File

@ -1,5 +1,9 @@
# Translators: MineWolf50, lifehome, haer0248 #
# -------------------------------------------- #
# List of global tags:
# %nl% - Goes to new line.
# %username% - Replaces the username of the player receiving the message.
# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
# Registration
registration:

1
src/test/java/fr/xephi/authme/AuthMeMatchers.java
View File

@ -11,6 +11,7 @@ import java.util.Objects;
/**
* Custom matchers for AuthMe entities.
*/
@SuppressWarnings("checkstyle:JavadocMethod") // Justification: Javadoc would be huge because of the many parameters
public final class AuthMeMatchers {
private AuthMeMatchers() {

6
src/test/java/fr/xephi/authme/ClassCollector.java
View File

@ -67,7 +67,7 @@ public class ClassCollector {
public List<Class<?>> collectClasses(Predicate<Class<?>> filter) {
File rootFolder = new File(root);
List<Class<?>> collection = new ArrayList<>();
collectClasses(rootFolder, filter, collection);
gatherClassesFromFile(rootFolder, filter, collection);
return collection;
}
@ -124,14 +124,14 @@ public class ClassCollector {
* @param filter the class predicate
* @param collection collection to add classes to
*/
private void collectClasses(File folder, Predicate<Class<?>> filter, List<Class<?>> collection) {
private void gatherClassesFromFile(File folder, Predicate<Class<?>> filter, List<Class<?>> collection) {
File[] files = folder.listFiles();
if (files == null) {
throw new IllegalStateException("Could not read files from '" + folder + "'");
}
for (File file : files) {
if (file.isDirectory()) {
collectClasses(file, filter, collection);
gatherClassesFromFile(file, filter, collection);
} else if (file.isFile()) {
Class<?> clazz = loadTaskClassFromFile(file);
if (clazz != null && filter.test(clazz)) {

10
src/test/java/fr/xephi/authme/ReflectionTestUtils.java
View File

@ -82,7 +82,6 @@ public final class ReflectionTestUtils {
* @param clazz the class to retrieve a method from
* @param methodName the name of the method
* @param parameterTypes the parameter types the method to retrieve has
*
* @return the method of the class, set to be accessible
*/
public static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
@ -96,6 +95,15 @@ public final class ReflectionTestUtils {
}
}
/**
* Invokes the given method on the provided instance with the given parameters.
*
* @param method the method to invoke
* @param instance the instance to invoke the method on (null for static methods)
* @param parameters the parameters to pass to the method
* @param <V> return value of the method
* @return method return value
*/
@SuppressWarnings("unchecked")
public static <V> V invokeMethod(Method method, Object instance, Object... parameters) {
method.setAccessible(true);

2
src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java
View File

@ -160,7 +160,7 @@ public class RegisterAdminCommandTest {
Player player = mock(Player.class);
given(bukkitService.getPlayerExact(user)).willReturn(player);
String kickForAdminRegister = "Admin registered you -- log in again";
given(commandService.retrieveSingleMessage(MessageKey.KICK_FOR_ADMIN_REGISTER)).willReturn(kickForAdminRegister);
given(commandService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER)).willReturn(kickForAdminRegister);
CommandSender sender = mock(CommandSender.class);
setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask(bukkitService);
setBukkitServiceToRunTaskOptionallyAsync(bukkitService);

4
src/test/java/fr/xephi/authme/data/TempbanManagerTest.java
View File

@ -149,7 +149,7 @@ public class TempbanManagerTest {
String ip = "123.45.67.89";
TestHelper.mockPlayerIp(player, ip);
String banReason = "IP ban too many logins";
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
given(messages.retrieveSingle(player, MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
Settings settings = mockSettings(2, 100, "");
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
setBukkitServiceToScheduleSyncDelayedTask(bukkitService);
@ -195,7 +195,7 @@ public class TempbanManagerTest {
String ip = "22.44.66.88";
TestHelper.mockPlayerIp(player, ip);
String banReason = "kick msg";
given(messages.retrieveSingle(MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
given(messages.retrieveSingle(player, MessageKey.TEMPBAN_MAX_LOGINS)).willReturn(banReason);
Settings settings = mockSettings(10, 60, "");
TempbanManager manager = new TempbanManager(bukkitService, messages, settings);
manager.increaseCount(ip, "user");

4
src/test/java/fr/xephi/authme/data/limbo/LimboPlayerMatchers.java
View File

@ -14,6 +14,7 @@ import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
/**
* Contains matchers for LimboPlayer.
*/
@SuppressWarnings("checkstyle:JavadocMethod") // Justification: Javadoc would be huge because of the many parameters
public final class LimboPlayerMatchers {
private LimboPlayerMatchers() {
@ -45,7 +46,8 @@ public final class LimboPlayerMatchers {
@Override
public void describeMismatchSafely(LimboPlayer item, Description description) {
description.appendText(format("Limbo with isOp=%s, groups={%s}, canFly=%s, walkSpeed=%f, flySpeed=%f",
item.isOperator(), String.join(" ,", item.getGroups()), item.isCanFly(), item.getWalkSpeed(), item.getFlySpeed()));
item.isOperator(), String.join(" ,", item.getGroups()), item.isCanFly(),
item.getWalkSpeed(), item.getFlySpeed()));
}
};
}

16
src/test/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManagerTest.java
View File

@ -71,7 +71,7 @@ public class LimboPlayerTaskManagerTest {
Player player = mock(Player.class);
LimboPlayer limboPlayer = mock(LimboPlayer.class);
MessageKey key = MessageKey.REGISTER_MESSAGE;
given(messages.retrieveSingle(key)).willReturn("Please register!");
given(messages.retrieveSingle(player, key)).willReturn("Please register!");
int interval = 12;
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(interval);
@ -80,7 +80,7 @@ public class LimboPlayerTaskManagerTest {
// then
verify(limboPlayer).setMessageTask(any(MessageTask.class));
verify(messages).retrieveSingle(key);
verify(messages).retrieveSingle(player, key);
verify(bukkitService).runTaskTimer(
any(MessageTask.class), eq(2L * TICKS_PER_SECOND), eq((long) interval * TICKS_PER_SECOND));
}
@ -110,7 +110,7 @@ public class LimboPlayerTaskManagerTest {
MessageTask existingMessageTask = mock(MessageTask.class);
limboPlayer.setMessageTask(existingMessageTask);
given(settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL)).willReturn(8);
given(messages.retrieveSingle(MessageKey.REGISTER_MESSAGE)).willReturn("Please register!");
given(messages.retrieveSingle(player, MessageKey.REGISTER_MESSAGE)).willReturn("Please register!");
// when
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
@ -119,7 +119,7 @@ public class LimboPlayerTaskManagerTest {
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
assertThat(limboPlayer.getMessageTask(), not(sameInstance(existingMessageTask)));
verify(registrationCaptchaManager).isCaptchaRequired(name);
verify(messages).retrieveSingle(MessageKey.REGISTER_MESSAGE);
verify(messages).retrieveSingle(player, MessageKey.REGISTER_MESSAGE);
verify(existingMessageTask).cancel();
}
@ -134,14 +134,14 @@ public class LimboPlayerTaskManagerTest {
given(registrationCaptchaManager.isCaptchaRequired(name)).willReturn(true);
String captcha = "M032";
given(registrationCaptchaManager.getCaptchaCodeOrGenerateNew(name)).willReturn(captcha);
given(messages.retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha)).willReturn("Need to use captcha");
given(messages.retrieveSingle(player, MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha)).willReturn("Need to use captcha");
// when
limboPlayerTaskManager.registerMessageTask(player, limboPlayer, false);
// then
assertThat(limboPlayer.getMessageTask(), not(nullValue()));
verify(messages).retrieveSingle(MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha);
verify(messages).retrieveSingle(player, MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, captcha);
}
@Test
@ -159,7 +159,7 @@ public class LimboPlayerTaskManagerTest {
// then
verify(limboPlayer).setTimeoutTask(bukkitTask);
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(600L)); // 30 * TICKS_PER_SECOND
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
verify(messages).retrieveSingle(player, MessageKey.LOGIN_TIMEOUT_ERROR);
}
@Test
@ -194,7 +194,7 @@ public class LimboPlayerTaskManagerTest {
verify(existingTask).cancel();
assertThat(limboPlayer.getTimeoutTask(), equalTo(bukkitTask));
verify(bukkitService).runTaskLater(any(TimeoutTask.class), eq(360L)); // 18 * TICKS_PER_SECOND
verify(messages).retrieveSingle(MessageKey.LOGIN_TIMEOUT_ERROR);
verify(messages).retrieveSingle(player, MessageKey.LOGIN_TIMEOUT_ERROR);
}
}

9
src/test/java/fr/xephi/authme/datasource/SqlDataSourceTestUtil.java
View File

@ -27,6 +27,15 @@ public final class SqlDataSourceTestUtil {
return new MySQL(settings, hikariDataSource, extensionsFactory);
}
/**
* Creates a SQLite implementation for testing purposes. Methods are overridden so the
* provided connection is never overridden.
*
* @param settings settings instance
* @param dataFolder data folder
* @param connection connection to use
* @return the created SQLite instance
*/
public static SQLite createSqlite(Settings settings, File dataFolder, Connection connection) {
return new SQLite(settings, dataFolder, connection) {
// Override reload() so it doesn't run SQLite#connect, since we're given a specific Connection to use

6
src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
View File

@ -101,7 +101,7 @@ public class OnJoinVerifierTest {
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
given(permissionsManager.hasPermission(player, PlayerStatePermission.IS_VIP)).willReturn(false);
String serverFullMessage = "server is full";
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn(serverFullMessage);
given(messages.retrieveSingle(player, MessageKey.KICK_FULL_SERVER)).willReturn(serverFullMessage);
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
@ -125,7 +125,7 @@ public class OnJoinVerifierTest {
given(permissionsManager.hasPermission(onlinePlayers.get(1), PlayerStatePermission.IS_VIP)).willReturn(false);
returnOnlineListFromBukkitServer(onlinePlayers);
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
given(messages.retrieveSingle(MessageKey.KICK_FOR_VIP)).willReturn("kick for vip");
given(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP)).willReturn("kick for vip");
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);
@ -149,7 +149,7 @@ public class OnJoinVerifierTest {
given(permissionsManager.hasPermission(onlinePlayers.get(0), PlayerStatePermission.IS_VIP)).willReturn(true);
returnOnlineListFromBukkitServer(onlinePlayers);
given(server.getMaxPlayers()).willReturn(onlinePlayers.size());
given(messages.retrieveSingle(MessageKey.KICK_FULL_SERVER)).willReturn("kick full server");
given(messages.retrieveSingle(player, MessageKey.KICK_FULL_SERVER)).willReturn("kick full server");
// when
boolean result = onJoinVerifier.refusePlayerForFullServer(event);

2
src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
View File

@ -596,7 +596,7 @@ public class PlayerListenerTest {
MessageKey.INVALID_NAME_CHARACTERS, "[a-z]");
doThrow(exception).when(onJoinVerifier).checkIsValidName(name);
String message = "Invalid characters!";
given(messages.retrieveSingle(exception.getReason(), exception.getArgs())).willReturn(message);
given(messages.retrieveSingle(player, exception.getReason(), exception.getArgs())).willReturn(message);
// when
listener.onPlayerLogin(event);

50
src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
View File

@ -81,9 +81,11 @@ public class MessagesIntegrationTest {
public void shouldLoadMessageAndSplitAtNewLines() {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String[] message = messages.retrieve(key);
String[] message = messages.retrieve(key, sender);
// then
String[] lines = new String[]{"We've got", "new lines", "and ' apostrophes"};
@ -94,9 +96,11 @@ public class MessagesIntegrationTest {
public void shouldLoadMessageAsStringWithNewLines() {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String message = messages.retrieveSingle(key);
String message = messages.retrieveSingle(sender, key);
// then
assertThat(message, equalTo("We've got\nnew lines\nand ' apostrophes"));
@ -106,9 +110,11 @@ public class MessagesIntegrationTest {
public void shouldFormatColorCodes() {
// given
MessageKey key = MessageKey.LOGIN_SUCCESS;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String[] message = messages.retrieve(key);
String[] message = messages.retrieve(key, sender);
// then
assertThat(message, arrayWithSize(1));
@ -120,6 +126,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.EMAIL_ALREADY_USED_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key);
@ -133,6 +140,8 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.LOGIN_SUCCESS;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
given(player.getDisplayName()).willReturn("§cTesty");
// when
messages.send(player, key);
@ -146,6 +155,8 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.UNKNOWN_USER;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
given(player.getDisplayName()).willReturn("§cTesty");
// when
messages.send(player, key);
@ -157,11 +168,27 @@ public class MessagesIntegrationTest {
assertThat(captor.getAllValues(), contains(lines));
}
@Test
public void shouldSendMessageToPlayerWithNameReplacement() {
// given
MessageKey key = MessageKey.REGISTER_MESSAGE;
Player player = Mockito.mock(Player.class);
given(player.getName()).willReturn("Tester");
given(player.getDisplayName()).willReturn("§cTesty");
// when
messages.send(player, key);
// then
verify(player).sendMessage("§3Please Tester, register to the §cTesty§3.");
}
@Test
public void shouldSendMessageToPlayerWithTagReplacement() {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = Mockito.mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key, "1234");
@ -175,6 +202,7 @@ public class MessagesIntegrationTest {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(sender, key);
@ -189,9 +217,11 @@ public class MessagesIntegrationTest {
Logger logger = mock(Logger.class);
ConsoleLogger.setLogger(logger);
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(mock(CommandSender.class), key, "rep", "rep2");
messages.send(sender, key, "rep", "rep2");
// then
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
@ -203,9 +233,11 @@ public class MessagesIntegrationTest {
Logger logger = mock(Logger.class);
ConsoleLogger.setLogger(logger);
MessageKey key = MessageKey.UNKNOWN_USER;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
messages.send(mock(CommandSender.class), key, "Replacement");
messages.send(sender, key, "Replacement");
// then
verify(logger).warning(argThat(containsString("Invalid number of replacements")));
@ -216,9 +248,11 @@ public class MessagesIntegrationTest {
// given
// Key is present in both files
MessageKey key = MessageKey.WRONG_PASSWORD;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String message = messages.retrieveSingle(key);
String message = messages.retrieveSingle(sender, key);
// then
assertThat(message, equalTo("§cWrong password!"));
@ -228,9 +262,11 @@ public class MessagesIntegrationTest {
public void shouldRetrieveMessageWithReplacements() {
// given
MessageKey key = MessageKey.CAPTCHA_WRONG_ERROR;
CommandSender sender = mock(CommandSender.class);
given(sender.getName()).willReturn("Tester");
// when
String result = messages.retrieveSingle(key, "24680");
String result = messages.retrieveSingle(sender.getName(), key, "24680");
// then
assertThat(result, equalTo("Use /captcha 24680 to solve the captcha"));

7
src/test/java/fr/xephi/authme/service/CommonServiceTest.java
View File

@ -83,15 +83,16 @@ public class CommonServiceTest {
public void shouldRetrieveSingleMessage() {
// given
MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
Player player = mock(Player.class);
String text = "Test text";
given(messages.retrieveSingle(key)).willReturn(text);
given(messages.retrieveSingle(player, key)).willReturn(text);
// when
String result = commonService.retrieveSingleMessage(key);
String result = commonService.retrieveSingleMessage(player, key);
// then
assertThat(result, equalTo(text));
verify(messages).retrieveSingle(key);
verify(messages).retrieveSingle(player, key);
}
@Test

6
src/test/java/fr/xephi/authme/service/SessionServiceTest.java
View File

@ -106,7 +106,6 @@ public class SessionServiceTest {
// then
assertThat(result, equalTo(false));
verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED);
verify(commonService).send(player, MessageKey.SESSION_EXPIRED);
verify(dataSource).hasSession(name);
verify(dataSource).setUnlogged(name);
verify(dataSource).revokeSession(name);
@ -132,7 +131,6 @@ public class SessionServiceTest {
// then
assertThat(result, equalTo(false));
verify(commonService).getProperty(PluginSettings.SESSIONS_ENABLED);
verify(commonService).send(player, MessageKey.SESSION_EXPIRED);
verify(dataSource).hasSession(name);
verify(dataSource).setUnlogged(name);
verify(dataSource).revokeSession(name);
@ -145,9 +143,10 @@ public class SessionServiceTest {
String ip = "127.3.12.15";
Player player = mockPlayerWithNameAndIp(name, ip);
given(dataSource.hasSession(name)).willReturn(true);
given(commonService.getProperty(PluginSettings.SESSIONS_TIMEOUT)).willReturn(8);
PlayerAuth auth = PlayerAuth.builder()
.name(name)
.lastLogin(System.currentTimeMillis())
.lastLogin(System.currentTimeMillis() - 7 * 60 * 1000)
.lastIp("8.8.8.8").build();
given(dataSource.getAuth(name)).willReturn(auth);
@ -219,6 +218,7 @@ public class SessionServiceTest {
String name = "Charles";
Player player = mockPlayerWithNameAndIp(name, "144.117.118.145");
given(dataSource.hasSession(name)).willReturn(true);
given(commonService.getProperty(PluginSettings.SESSIONS_TIMEOUT)).willReturn(8);
PlayerAuth auth = PlayerAuth.builder()
.name(name)
.lastIp(null)

3
src/test/java/tools/dependencygraph/DrawDependency.java
View File

@ -131,7 +131,8 @@ public class DrawDependency implements ToolTask {
private Class<?> unwrapGenericClass(Type genericType) {
if (genericType == Factory.class || genericType == SingletonStore.class) {
Class<?> parameterType = ReflectionUtils.getGenericType(genericType);
Objects.requireNonNull(parameterType, "Parameter type for '" + genericType + "' should be a concrete class");
Objects.requireNonNull(parameterType,
"Parameter type for '" + genericType + "' should be a concrete class");
return parameterType;
}
return InjectorUtils.convertToClass(genericType);

6
src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
View File

@ -56,6 +56,12 @@ public class EncryptionMethodInfoGatherer {
}
}
/**
* Creates a description of the given hash algorithm based on its annotations.
*
* @param algorithm the algorithm to describe
* @return description of the hash algorithm
*/
private static MethodDescription createDescription(HashAlgorithm algorithm) {
Class<? extends EncryptionMethod> clazz = algorithm.getClazz();
EncryptionMethod method = createEncryptionMethod(clazz);

1
src/test/java/tools/docs/permissions/PermissionNodesGatherer.java
View File

@ -37,6 +37,7 @@ public class PermissionNodesGatherer {
/**
* Return a sorted collection of all permission nodes, including its JavaDoc description.
*
* @param <T> permission node enum type
* @return Ordered map whose keys are the permission nodes and the values the associated JavaDoc
*/
@SuppressWarnings("unchecked")

8
src/test/java/tools/docs/permissions/PermissionsListWriter.java
View File

@ -4,18 +4,20 @@ import tools.utils.AutoToolTask;
import tools.utils.FileIoUtils;
import tools.utils.TagValue.NestedTagValue;
import tools.utils.TagValueHolder;
import tools.utils.ToolsConstants;
import java.util.Map;
import static tools.utils.ToolsConstants.DOCS_FOLDER;
import static tools.utils.ToolsConstants.TOOLS_SOURCE_ROOT;
/**
* Task responsible for formatting a permissions node list and
* for writing it to a file if desired.
*/
public class PermissionsListWriter implements AutoToolTask {
private static final String TEMPLATE_FILE = ToolsConstants.TOOLS_SOURCE_ROOT + "docs/permissions/permission_nodes.tpl.md";
private static final String PERMISSIONS_OUTPUT_FILE = ToolsConstants.DOCS_FOLDER + "permission_nodes.md";
private static final String TEMPLATE_FILE = TOOLS_SOURCE_ROOT + "docs/permissions/permission_nodes.tpl.md";
private static final String PERMISSIONS_OUTPUT_FILE = DOCS_FOLDER + "permission_nodes.md";
@Override
public String getTaskName() {

6
src/test/java/tools/docs/translations/TranslationPageGenerator.java
View File

@ -45,10 +45,10 @@ public class TranslationPageGenerator implements AutoToolTask {
NestedTagValue translationValuesHolder = new NestedTagValue();
for (TranslationInfo translation : gatherer.getTranslationInfo()) {
int percentage = (int) Math.round(translation.percentTranslated * 100);
String name = firstNonNull(LANGUAGE_NAMES.get(translation.code), "?");
int percentage = (int) Math.round(translation.getPercentTranslated() * 100);
String name = firstNonNull(LANGUAGE_NAMES.get(translation.getCode()), "?");
TagValueHolder valueHolder = TagValueHolder.create()
.put("code", translation.code)
.put("code", translation.getCode())
.put("name", name)
.put("percentage", Integer.toString(percentage))
.put("color", computeColor(percentage));

32
src/test/java/tools/docs/translations/TranslationsGatherer.java
View File

@ -25,7 +25,7 @@ public class TranslationsGatherer {
public TranslationsGatherer() {
gatherTranslations();
translationInfo.sort((e1, e2) -> getCode(e1).compareTo(getCode(e2)));
translationInfo.sort((e1, e2) -> getSortCode(e1).compareTo(getSortCode(e2)));
}
public List<TranslationInfo> getTranslationInfo() {
@ -61,16 +61,6 @@ public class TranslationsGatherer {
return null;
}
public static final class TranslationInfo {
public final String code;
public final double percentTranslated;
TranslationInfo(String code, double percentTranslated) {
this.code = code;
this.percentTranslated = percentTranslated;
}
}
/**
* Returns the language code from the translation info for sorting purposes.
* Returns "a" for "en" language code to sort English on top.
@ -78,8 +68,26 @@ public class TranslationsGatherer {
* @param info the translation info
* @return the language code for sorting
*/
private static String getCode(TranslationInfo info) {
private static String getSortCode(TranslationInfo info) {
return "en".equals(info.code) ? "a" : info.code;
}
public static final class TranslationInfo {
private final String code;
private final double percentTranslated;
TranslationInfo(String code, double percentTranslated) {
this.code = code;
this.percentTranslated = percentTranslated;
}
public String getCode() {
return code;
}
public double getPercentTranslated() {
return percentTranslated;
}
}
}

2
src/test/java/tools/filegeneration/GeneratePluginYml.java
View File

@ -67,7 +67,7 @@ public class GeneratePluginYml implements AutoToolTask {
List<String> pluginYmlLines = FileIoUtils.readLinesFromFile(Paths.get(PLUGIN_YML_FILE));
int lineNr = 0;
for (String line : pluginYmlLines) {
if (line.equals("commands:")) {
if ("commands:".equals(line)) {
break;
}
++lineNr;

19
src/test/java/tools/messages/CheckMessageKeyUsages.java
View File

@ -33,8 +33,8 @@ public class CheckMessageKeyUsages implements AutoToolTask {
if (unusedKeys.isEmpty()) {
System.out.println("No unused MessageKey entries found :)");
} else {
System.out.println("Did not find usages for keys:\n- " +
String.join("\n- ", Lists.transform(unusedKeys, MessageKey::name)));
System.out.println("Did not find usages for keys:\n- "
+ String.join("\n- ", Lists.transform(unusedKeys, MessageKey::name)));
}
}
@ -51,21 +51,6 @@ public class CheckMessageKeyUsages implements AutoToolTask {
return keys;
}
private List<File> findUsagesOfKey(MessageKey key) {
List<File> filesUsingKey = new ArrayList<>();
File sourceFolder = new File(ToolsConstants.MAIN_SOURCE_ROOT);
Consumer<File> usagesCollector = file -> {
String source = FileIoUtils.readFromFile(file.toPath());
if (source.contains(key.name())) {
filesUsingKey.add(file);
}
};
walkJavaFileTree(sourceFolder, usagesCollector);
return filesUsingKey;
}
private static void walkJavaFileTree(File folder, Consumer<File> javaFileConsumer) {
for (File file : FileIoUtils.listFilesOrThrow(folder)) {
if (file.isDirectory()) {

24
src/test/java/tools/utils/FileIoUtils.java
View File

@ -27,6 +27,12 @@ public final class FileIoUtils {
writeToFile(Paths.get(outputFile), contents);
}
/**
* Writes the given contents to the file, overriding any existing content.
*
* @param path the file to write to
* @param contents the contents to write
*/
public static void writeToFile(Path path, String contents) {
try {
Files.write(path, contents.getBytes());
@ -35,6 +41,12 @@ public final class FileIoUtils {
}
}
/**
* Adds the given contents to the file while keeping any existing content.
*
* @param outputFile the file to write to
* @param contents the contents to append
*/
public static void appendToFile(String outputFile, String contents) {
try {
Files.write(Paths.get(outputFile), contents.getBytes(), StandardOpenOption.APPEND);
@ -47,6 +59,12 @@ public final class FileIoUtils {
return readFromFile(Paths.get(file));
}
/**
* Returns the given file's contents as string.
*
* @param file the file to read
* @return the file's contents
*/
public static String readFromFile(Path file) {
try {
return new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
@ -55,6 +73,12 @@ public final class FileIoUtils {
}
}
/**
* Returns the lines of the given file.
*
* @param path the path of the file to read
* @return the lines of the file
*/
public static List<String> readLinesFromFile(Path path) {
try {
return Files.readAllLines(path, StandardCharsets.UTF_8);

2
src/test/resources/fr/xephi/authme/message/messages_test.yml
View File

@ -2,6 +2,8 @@
error:
unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
registration:
register_request: '&3Please %username%, register to the %displayname%&3.'
login:
success: '&cHere we have&bdefined some colors &dand some other &lthings'
wrong_password: '&cWrong password!'