Remove the IPManager

We don't need it anymore
2016-04-08 14:34:21 +02:00
parent 4ec98e5b3d
commit ee177e8a3a
17 changed files with 33 additions and 219 deletions
@@ -1,109 +0,0 @@
-package fr.xephi.authme.cache;
-
-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 fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.NewSetting;
-import fr.xephi.authme.settings.properties.HooksSettings;
-import fr.xephi.authme.util.StringUtils;
-import org.bukkit.entity.Player;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Stateful manager for looking up IP address appropriately, including caching.
- */
-public class IpAddressManager {
-    /**
-     * Whether or not to use the VeryGames API or BungeeCord for IP lookups.
-     */
-    private final boolean useVeryGamesIpCheck;
-    private final boolean useBungee;
-    /**
-     * Cache for lookups.
-     */
-    private final ConcurrentHashMap<String, String> ipCache;
-
-    /**
-     * Constructor.
-     *
-     * @param settings The settings instance
-     */
-    public IpAddressManager(NewSetting settings) {
-        this.useVeryGamesIpCheck = settings.getProperty(HooksSettings.ENABLE_VERYGAMES_IP_CHECK);
-        this.useBungee = settings.getProperty(HooksSettings.BUNGEECORD);
-        this.ipCache = new ConcurrentHashMap<>();
-    }
-
-    /**
-     * Return the player's IP address. If enabled in the settings, the IP address returned by the
-     * VeryGames API will be returned.
-     *
-     * @param player The player to look up
-     *
-     * @return The IP address of the player
-     */
-    public String getPlayerIp(Player player) {
-        final String playerName = player.getName().toLowerCase();
-        final String cachedValue = ipCache.get(playerName);
-        if (cachedValue != null) {
-            return cachedValue;
-        }
-
-        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());
-            if (veryGamesResult != null) {
-                ipCache.put(playerName, veryGamesResult);
-                return veryGamesResult;
-            }
-        }
-        return plainIp;
-    }
-
-    /**
-     * Add a player to the IP address cache.
-     *
-     * @param player The player to add or update the cache entry for
-     * @param ip     The IP address to add
-     */
-    public void addCache(String player, String ip) {
-        ipCache.put(player.toLowerCase(), ip);
-    }
-
-    /**
-     * Remove a player's cache entry.
-     *
-     * @param player The player to remove
-     */
-    public void removeCache(String player) {
-        ipCache.remove(player.toLowerCase());
-    }
-
-    // returns null if IP could not be looked up
-    private String getVeryGamesIp(final String plainIp, final int port) {
-        final String sUrl = String.format("http://monitor-1.verygames.net/api/?action=ipclean-real-ip"
-            + "&out=raw&ip=%s&port=%d", plainIp, port);
-
-        try {
-            String result = Resources.toString(new URL(sUrl), Charsets.UTF_8);
-            if (!StringUtils.isEmpty(result) && !result.contains("error")) {
-                return result;
-            }
-        } catch (IOException e) {
-            ConsoleLogger.logException("Could not fetch Very Games API with URL '" + sUrl + "':", e);
-        }
-        return null;
-    }
-
-}