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

IpAddressManager should work with BungeeCord too.

Browse Source
This commit is contained in:
DNx5 2016-04-01 13:28:00 +07:00
parent ff17e4ca6b
commit c63b9786f8
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/fr/xephi/authme/cache/IpAddressManager.java vendored
View File

@ -1,7 +1,10 @@
package fr.xephi.authme.cache; package fr.xephi.authme.cache;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.NewSetting;
import fr.xephi.authme.settings.properties.HooksSettings; import fr.xephi.authme.settings.properties.HooksSettings;
@ -16,10 +19,14 @@ import java.util.concurrent.ConcurrentHashMap;
* Stateful manager for looking up IP address appropriately, including caching. * Stateful manager for looking up IP address appropriately, including caching.
*/ */
public class IpAddressManager { public class IpAddressManager {
/**
/** Whether or not to use the VeryGames API for IP lookups. */ * Whether or not to use the VeryGames API or BungeeCord for IP lookups.
*/
private final boolean useVeryGamesIpCheck; private final boolean useVeryGamesIpCheck;
/** Cache for lookups via the VeryGames API. */ private final boolean useBungee;
/**
* Cache for lookups.
*/
private final ConcurrentHashMap<String, String> ipCache; private final ConcurrentHashMap<String, String> ipCache;
/** /**
@ -29,6 +36,7 @@ public class IpAddressManager {
*/ */
public IpAddressManager(NewSetting settings) { public IpAddressManager(NewSetting settings) {
this.useVeryGamesIpCheck = settings.getProperty(HooksSettings.ENABLE_VERYGAMES_IP_CHECK); this.useVeryGamesIpCheck = settings.getProperty(HooksSettings.ENABLE_VERYGAMES_IP_CHECK);
this.useBungee = settings.getProperty(HooksSettings.BUNGEECORD);
this.ipCache = new ConcurrentHashMap<>(); this.ipCache = new ConcurrentHashMap<>();
} }
@ -37,36 +45,40 @@ public class IpAddressManager {
* VeryGames API will be returned. * VeryGames API will be returned.
* *
* @param player The player to look up * @param player The player to look up
*
* @return The IP address of the player * @return The IP address of the player
*/ */
public String getPlayerIp(Player player) { public String getPlayerIp(Player player) {
if (useVeryGamesIpCheck) { final String playerName = player.getName().toLowerCase();
final String playerName = player.getName().toLowerCase(); final String cachedValue = ipCache.get(playerName);
final String cachedValue = ipCache.get(playerName); if (cachedValue != null) {
if (cachedValue != null) { return cachedValue;
return cachedValue; }
}
final String plainIp = player.getAddress().getAddress().getHostAddress(); final String plainIp = player.getAddress().getAddress().getHostAddress();
if (useBungee) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("IP");
player.sendPluginMessage(AuthMe.getInstance(), "BungeeCord", out.toByteArray());
}
if (useVeryGamesIpCheck) {
String veryGamesResult = getVeryGamesIp(plainIp, player.getAddress().getPort()); String veryGamesResult = getVeryGamesIp(plainIp, player.getAddress().getPort());
if (veryGamesResult != null) { if (veryGamesResult != null) {
ipCache.put(playerName, veryGamesResult); ipCache.put(playerName, veryGamesResult);
return veryGamesResult; return veryGamesResult;
} }
} }
return player.getAddress().getAddress().getHostAddress(); return plainIp;
} }
/** /**
* Add a player to the IP address cache. * Add a player to the IP address cache.
* *
* @param player The player to add or update the cache entry for * @param player The player to add or update the cache entry for
* @param ip The IP address to add * @param ip The IP address to add
*/ */
public void addCache(String player, String ip) { public void addCache(String player, String ip) {
if (useVeryGamesIpCheck) { ipCache.put(player.toLowerCase(), ip);
ipCache.put(player.toLowerCase(), ip);
}
} }
/** /**
@ -75,9 +87,7 @@ public class IpAddressManager {
* @param player The player to remove * @param player The player to remove
*/ */
public void removeCache(String player) { public void removeCache(String player) {
if (useVeryGamesIpCheck) { ipCache.remove(player.toLowerCase());
ipCache.remove(player.toLowerCase());
}
} }
// returns null if IP could not be looked up // returns null if IP could not be looked up