mirror of
https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git
synced 2024-06-10 06:54:57 +00:00
aca3398d21
Version 5.0 This TotalFreedomMod release implements many changes. Most notably, the internals have been completely revamped. TotalFreedomMod now relies on the Aero library for core mechanics such as command handling and services. Another important change is the UUID system. In TotalFreedomMod Electrum, it has been completely removed. The core reason for this is that the system as a whole was very bugged. Additionally, it did not solve the primary reason for its conception: preserving player data when the player changes their username. This is because TotalFreedomMod servers usually run in offline-mode. This meaning that some of the players joining do not have a registerd Mojang UUID whatsoever. All in all, the UUID system was buggy, and it did not fix the reason it was implemented, so it has been completely removed. The admin list and the ban list now use usernames and IPs again. Lastly, many smaller changes have been implemented. Due to the amount of changes, they have not been named individualy. Please refer to the issues below for more details. Fixes #342 Fixes #350 Fixes #380 Fixes #684 Fixes #704 Fixes #716 Fixes #735 Fixes #745 Fixes #784 Fixes #765 Fixes #791 Fixes #805 Fixes #826 Fixes #883 Fixes #1524 Fixes #1534 Fixes #1536 Fixes #1538 Fixes #1545 Fixes #1546 Fixes #1568 Fixes #1627 Resolves #403 Resolves #435 Resolves #597 Resolves #603 Resolves #628 Resolves #690 Resolves #708 Resolves #747 Resolves #748 Resolves #749 Resolves #764 Resolves #767 Resolves #782 Resolves #809 Resolves #803 Resolves #811 Resolves #813 Resolves #830 Resolves #848 Resolves #856 Resolves #876 Resolves #908 Resolves #992 Resolves #1018 Resolves #1432 Resolves #1446 Resolves #1494 Resolves #1501 Resolves #1526 Resolves #1540 Resolves #1550 Resolves #1560 Resolves #1561 Resolves #1578 Resolves #1613
355 lines
8.7 KiB
Java
355 lines
8.7 KiB
Java
package me.totalfreedom.totalfreedommod.admin;
|
|
|
|
import com.google.common.base.Function;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Sets;
|
|
import java.util.Date;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.concurrent.TimeUnit;
|
|
import lombok.Getter;
|
|
import me.totalfreedom.totalfreedommod.FreedomService;
|
|
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
|
import me.totalfreedom.totalfreedommod.command.Command_logs;
|
|
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
|
import me.totalfreedom.totalfreedommod.rank.Rank;
|
|
import me.totalfreedom.totalfreedommod.util.FLog;
|
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
|
import net.pravian.aero.config.YamlConfig;
|
|
import net.pravian.aero.util.Ips;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.command.CommandSender;
|
|
import org.bukkit.configuration.ConfigurationSection;
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.plugin.ServicePriority;
|
|
|
|
public class AdminList extends FreedomService
|
|
{
|
|
|
|
public static final String CONFIG_FILENAME = "admins.yml";
|
|
|
|
@Getter
|
|
private final Map<String, Admin> allAdmins = Maps.newHashMap(); // Includes disabled admins
|
|
// Only active admins below
|
|
@Getter
|
|
private final Set<Admin> activeAdmins = Sets.newHashSet();
|
|
private final Map<String, Admin> nameTable = Maps.newHashMap();
|
|
private final Map<String, Admin> ipTable = Maps.newHashMap();
|
|
//
|
|
private final YamlConfig config;
|
|
|
|
public AdminList(TotalFreedomMod plugin)
|
|
{
|
|
super(plugin);
|
|
|
|
this.config = new YamlConfig(plugin, CONFIG_FILENAME, true);
|
|
}
|
|
|
|
@Override
|
|
protected void onStart()
|
|
{
|
|
load();
|
|
|
|
server.getServicesManager().register(Function.class, new Function<Player, Boolean>()
|
|
{
|
|
@Override
|
|
public Boolean apply(Player player)
|
|
{
|
|
return isAdmin(player);
|
|
}
|
|
}, plugin, ServicePriority.Normal);
|
|
|
|
deactivateOldEntries(false);
|
|
}
|
|
|
|
@Override
|
|
protected void onStop()
|
|
{
|
|
save();
|
|
}
|
|
|
|
public void load()
|
|
{
|
|
config.load();
|
|
|
|
allAdmins.clear();
|
|
for (String key : config.getKeys(false))
|
|
{
|
|
ConfigurationSection section = config.getConfigurationSection(key);
|
|
if (section == null)
|
|
{
|
|
logger.warning("Invalid admin list format: " + key);
|
|
continue;
|
|
}
|
|
|
|
Admin admin = new Admin(key);
|
|
admin.loadFrom(section);
|
|
|
|
if (!admin.isValid())
|
|
{
|
|
FLog.warning("Could not load admin: " + key + ". Missing details!");
|
|
continue;
|
|
}
|
|
|
|
allAdmins.put(key, admin);
|
|
}
|
|
|
|
updateTables();
|
|
FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active, " + ipTable.size() + " IPs)");
|
|
}
|
|
|
|
public void save()
|
|
{
|
|
// Clear the config
|
|
for (String key : config.getKeys(false))
|
|
{
|
|
config.set(key, null);
|
|
}
|
|
|
|
for (Admin admin : allAdmins.values())
|
|
{
|
|
admin.saveTo(config.createSection(admin.getConfigKey()));
|
|
}
|
|
|
|
config.save();
|
|
}
|
|
|
|
public synchronized boolean isAdminSync(CommandSender sender)
|
|
{
|
|
return isAdmin(sender);
|
|
}
|
|
|
|
public boolean isAdmin(CommandSender sender)
|
|
{
|
|
if (!(sender instanceof Player))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
Admin admin = getAdmin((Player) sender);
|
|
|
|
return admin != null && admin.isActive();
|
|
}
|
|
|
|
public boolean isSeniorAdmin(CommandSender sender)
|
|
{
|
|
Admin admin = getAdmin(sender);
|
|
if (admin == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
|
|
}
|
|
|
|
public Admin getAdmin(CommandSender sender)
|
|
{
|
|
if (sender instanceof Player)
|
|
{
|
|
return getAdmin((Player) sender);
|
|
}
|
|
|
|
return getEntryByName(sender.getName());
|
|
}
|
|
|
|
public Admin getAdmin(Player player)
|
|
{
|
|
// Find admin
|
|
String ip = Ips.getIp(player);
|
|
Admin admin = getEntryByName(player.getName());
|
|
|
|
// Admin by name
|
|
if (admin != null)
|
|
{
|
|
// Check if we're in online mode,
|
|
// Or the players IP is in the admin entry
|
|
if (Bukkit.getOnlineMode() || admin.getIps().contains(ip))
|
|
{
|
|
if (!admin.getIps().contains(ip))
|
|
{
|
|
// Add the new IP if we have to
|
|
admin.addIp(ip);
|
|
save();
|
|
updateTables();
|
|
}
|
|
return admin;
|
|
}
|
|
|
|
// Impostor
|
|
}
|
|
|
|
// Admin by ip
|
|
admin = getEntryByIp(ip);
|
|
if (admin != null)
|
|
{
|
|
// Set the new username
|
|
admin.setName(player.getName());
|
|
save();
|
|
updateTables();
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
public Admin getEntryByName(String name)
|
|
{
|
|
return nameTable.get(name.toLowerCase());
|
|
}
|
|
|
|
public Admin getEntryByIp(String ip)
|
|
{
|
|
return ipTable.get(ip);
|
|
}
|
|
|
|
public Admin getEntryByIpFuzzy(String needleIp)
|
|
{
|
|
final Admin directAdmin = getEntryByIp(needleIp);
|
|
if (directAdmin != null)
|
|
{
|
|
return directAdmin;
|
|
}
|
|
|
|
for (String ip : ipTable.keySet())
|
|
{
|
|
if (FUtil.fuzzyIpMatch(needleIp, ip, 3))
|
|
{
|
|
return ipTable.get(ip);
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
public void updateLastLogin(Player player)
|
|
{
|
|
final Admin admin = getAdmin(player);
|
|
if (admin == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
admin.setLastLogin(new Date());
|
|
admin.setName(player.getName());
|
|
save();
|
|
}
|
|
|
|
public boolean isAdminImpostor(Player player)
|
|
{
|
|
return getEntryByName(player.getName()) != null && !isAdmin(player);
|
|
}
|
|
|
|
public boolean isIdentityMatched(Player player)
|
|
{
|
|
if (Bukkit.getOnlineMode())
|
|
{
|
|
return true;
|
|
}
|
|
|
|
Admin admin = getAdmin(player);
|
|
return admin == null ? false : admin.getName().equalsIgnoreCase(player.getName());
|
|
}
|
|
|
|
public boolean addAdmin(Admin admin)
|
|
{
|
|
if (!admin.isValid())
|
|
{
|
|
logger.warning("Could not add admin: " + admin.getConfigKey() + " Admin is missing details!");
|
|
return false;
|
|
}
|
|
|
|
final String key = admin.getConfigKey();
|
|
|
|
// Store admin, update views
|
|
allAdmins.put(key, admin);
|
|
updateTables();
|
|
|
|
// Save admin
|
|
admin.saveTo(config.createSection(key));
|
|
config.save();
|
|
|
|
return true;
|
|
}
|
|
|
|
public boolean removeAdmin(Admin admin)
|
|
{
|
|
// Remove admin, update views
|
|
if (allAdmins.remove(admin.getConfigKey()) == null)
|
|
{
|
|
return false;
|
|
}
|
|
updateTables();
|
|
|
|
// 'Unsave' admin
|
|
config.set(admin.getConfigKey(), null);
|
|
config.save();
|
|
|
|
return true;
|
|
}
|
|
|
|
public void updateTables()
|
|
{
|
|
activeAdmins.clear();
|
|
nameTable.clear();
|
|
ipTable.clear();
|
|
|
|
for (Admin admin : allAdmins.values())
|
|
{
|
|
if (!admin.isActive())
|
|
{
|
|
continue;
|
|
}
|
|
|
|
activeAdmins.add(admin);
|
|
nameTable.put(admin.getName().toLowerCase(), admin);
|
|
|
|
for (String ip : admin.getIps())
|
|
{
|
|
ipTable.put(ip, admin);
|
|
}
|
|
|
|
}
|
|
|
|
plugin.wm.adminworld.wipeAccessCache();
|
|
}
|
|
|
|
public Set<String> getAdminNames()
|
|
{
|
|
return nameTable.keySet();
|
|
}
|
|
|
|
public Set<String> getAdminIps()
|
|
{
|
|
return ipTable.keySet();
|
|
}
|
|
|
|
public void deactivateOldEntries(boolean verbose)
|
|
{
|
|
for (Admin admin : allAdmins.values())
|
|
{
|
|
if (!admin.isActive() || admin.getRank().isAtLeast(Rank.SENIOR_ADMIN))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
final Date lastLogin = admin.getLastLogin();
|
|
final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
|
|
|
|
if (lastLoginHours < ConfigEntry.ADMINLIST_CLEAN_THESHOLD_HOURS.getInteger())
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (verbose)
|
|
{
|
|
FUtil.adminAction("TotalFreedomMod", "Deactivating superadmin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
|
|
}
|
|
|
|
admin.setActive(false);
|
|
plugin.lv.deactivateSuperadmin(admin);
|
|
}
|
|
|
|
save();
|
|
updateTables();
|
|
}
|
|
}
|