CustomItemsLib JL 1.1.0-JL.10 - Signed Token v2 Security and Anti-Replay

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>CustomItemsLib</artifactId>
 	<packaging>jar</packaging>
 	<!-- <version>1.0.9</version> -->
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0-JL.10</version>
 	<name>Rocologo's CustomItems Library</name>
 	<url>https://github.com/Rocologo/CustomItemsLib</url>
 	<description>CustomItemsLib is a library with code shared between MobHunting and BagOfGold. </description>
@@ -24,7 +24,7 @@
 
 	<properties>	
 			<!-- These 2 versions MUST ALWAYS be one lower than newest version to make the plugin compile -->
-			<bagofgold.version>4.5.6-SNAPSHOT</bagofgold.version>
+			<bagofgold.version>4.5.6-JL.2</bagofgold.version>
 			<mobhunting.version>8.5.5-SNAPSHOT</mobhunting.version>
 	</properties>
 

src/main/resources/plugin.yml

@@ -7,7 +7,7 @@ author: Rocologo
 depend: []
 loadbefore: [BagOfGold, MobHunting]
 softdepend: [Reserve, Vault, PerWorldInventory, Citizens, Essentials, ProtocolLib, PacketListenerApi, ItemFrameShops, Multiverse-Core, TitleManager, CMI, CMILib, BossBarAPI, BarAPI, ActionBar, TitleAPI, TitleManager, ActionBarAPI, ActionAnnouncer]
-api-version: 1.13
+api-version: 1.21
 
 commands:
   customitemslib:

src/one/lindegaard/CustomItemsLib/Core.java

@@ -32,7 +32,9 @@
 import one.lindegaard.CustomItemsLib.config.ConfigManager;
 import one.lindegaard.CustomItemsLib.messages.Messages;
 import one.lindegaard.CustomItemsLib.rewards.CoreRewardManager;
+import one.lindegaard.CustomItemsLib.rewards.RewardSecurity;
 import one.lindegaard.CustomItemsLib.rewards.RewardBlockManager;
+import one.lindegaard.CustomItemsLib.rewards.TokenSpendStore;
 import one.lindegaard.CustomItemsLib.storage.DataStoreException;
 import one.lindegaard.CustomItemsLib.storage.DataStoreManager;
 import one.lindegaard.CustomItemsLib.storage.IDataStore;
@@ -54,6 +56,8 @@ public class Core extends JavaPlugin {
 	private static DataStoreManager mDataStoreManager;
 	private static PlayerSettingsManager mPlayerSettingsManager;
 	private static CoreRewardManager mCoreRewardManager;
+	private static RewardSecurity mRewardSecurity;
+	private static TokenSpendStore mTokenSpendStore;
 	private static CompatibilityManager mCompatibilityManager;
 	private CommandDispatcher mCommandDispatcher;
 	private SpigetUpdater mSpigetUpdater;
@@ -117,6 +121,14 @@ public void onEnable() {
 		mMessages.setLanguage(mConfig.language + ".lang");
 		mMessages.debug("Loading config.yml file, version %s", config_version);
 
+		mRewardSecurity = new RewardSecurity(this);
+		try {
+			mRewardSecurity.initialize();
+		} catch (IOException ex) {
+			Bukkit.getConsoleSender().sendMessage(PREFIX_ERROR + "Could not initialize security.yml: " + ex.getMessage());
+			throw new RuntimeException("[CustomItemsLib] Could not initialize security.yml", ex);
+		}
+
 		List<String> itemtypes = Arrays.asList("SKULL", "ITEM", "KILLER", "KILLED", "GRINGOTTS_STYLE");
 		if (!itemtypes.contains(mConfig.rewardItemtype)) {
 			Bukkit.getConsoleSender().sendMessage(PREFIX + ChatColor.RED
@@ -153,6 +165,14 @@ public void onEnable() {
 			return;
 		}
 
+		mTokenSpendStore = new TokenSpendStore(this);
+		try {
+			mTokenSpendStore.initialize();
+		} catch (Exception ex) {
+			Bukkit.getConsoleSender().sendMessage(PREFIX_ERROR + "Could not initialize token spend store: " + ex.getMessage());
+			throw new RuntimeException("[CustomItemsLib] Could not initialize token spend store", ex);
+		}
+
 		mDataStoreManager = new DataStoreManager(plugin, mStore);
 		mPlayerSettingsManager = new PlayerSettingsManager(plugin);
 		mCoreRewardManager = new CoreRewardManager(plugin);
@@ -175,6 +195,7 @@ public void onEnable() {
 
 		// Hook into Vault or Reserve
 		mEconomyManager = new EconomyManager(this);
+		Bukkit.getPluginManager().registerEvents(new EconomyProviderListener(), this);
 		if (!mEconomyManager.isActive())
 			return;
 
@@ -238,6 +259,14 @@ public static CoreRewardManager getCoreRewardManager() {
 		return mCoreRewardManager;
 	}
 
+	public static RewardSecurity getRewardSecurity() {
+		return mRewardSecurity;
+	}
+
+	public static TokenSpendStore getTokenSpendStore() {
+		return mTokenSpendStore;
+	}
+
 	public SpigetUpdater getSpigetUpdater() {
 		return mSpigetUpdater;
 	}

src/one/lindegaard/CustomItemsLib/EconomyManager.java

@@ -1,6 +1,7 @@
 package one.lindegaard.CustomItemsLib;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -68,29 +69,53 @@ private void setVersion(String version) {
 		this.version = version;
 	}
 
+	private RegisteredServiceProvider<Economy> getPreferredVaultProvider() {
+		Collection<RegisteredServiceProvider<Economy>> providers = plugin.getServer().getServicesManager()
+				.getRegistrations(Economy.class);
+
+		RegisteredServiceProvider<Economy> bagOfGoldProvider = null;
+		for (RegisteredServiceProvider<Economy> provider : providers) {
+			if (provider == null || provider.getProvider() == null)
+				continue;
+			if ("BagOfGold".equalsIgnoreCase(provider.getProvider().getName())) {
+				if (bagOfGoldProvider == null
+						|| provider.getPriority().compareTo(bagOfGoldProvider.getPriority()) > 0)
+					bagOfGoldProvider = provider;
+			}
+		}
+
+		if (bagOfGoldProvider != null)
+			return bagOfGoldProvider;
+
+		return plugin.getServer().getServicesManager().getRegistration(Economy.class);
+	}
+
 	/**
 	 * Find and configure a suitable economy provider
 	 * 
 	 * @return true if successful.
 	 */
 	public Boolean setupEconomy() {
 		Plugin economyProvider = null;
+		EcoType previousType = Type;
+		String previousVersion = getVersion();
 
 		/*
 		 * Attempt to find Vault for Economy handling
 		 */
 		try {
-			RegisteredServiceProvider<Economy> vaultEcoProvider = plugin.getServer().getServicesManager()
-					.getRegistration(net.milkbowl.vault.economy.Economy.class);
+			RegisteredServiceProvider<Economy> vaultEcoProvider = getPreferredVaultProvider();
 			if (vaultEcoProvider != null) {
 				/*
 				 * Flag as using Vault hooks
 				 */
 				vaultEconomy = vaultEcoProvider.getProvider();
+				reserveEconomy = null;
 				setVersion(String.format("%s %s", vaultEcoProvider.getProvider().getName(), "via Vault"));
-				Bukkit.getConsoleSender().sendMessage(
-						Core.PREFIX + "CustomItemsLib is using " + getVersion() + " as Economy Provider");
 				Type = EcoType.VAULT;
+				if (previousType != Type || !previousVersion.equals(getVersion()))
+					Bukkit.getConsoleSender()
+							.sendMessage(Core.PREFIX + "CustomItemsLib is using " + getVersion() + " as Economy Provider");
 				return true;
 			}
 		} catch (NoClassDefFoundError ex) {
@@ -105,12 +130,18 @@ public Boolean setupEconomy() {
 			 * Flat as using Reserve Hooks.
 			 */
 			reserveEconomy = ((Reserve) economyProvider).economy();
+			vaultEconomy = null;
 			setVersion(String.format("%s %s", reserveEconomy.name(), "via Reserve"));
-			Bukkit.getConsoleSender()
-					.sendMessage(Core.PREFIX + "CustomItemsLib is using " + getVersion() + " as Economy Provider");
 			Type = EcoType.RESERVE;
+			if (previousType != Type || !previousVersion.equals(getVersion()))
+				Bukkit.getConsoleSender()
+						.sendMessage(Core.PREFIX + "CustomItemsLib is using " + getVersion() + " as Economy Provider");
 			return true;
 		}
+		vaultEconomy = null;
+		reserveEconomy = null;
+		setVersion("");
+		Type = EcoType.NONE;
 		return false;
 	}
 

src/one/lindegaard/CustomItemsLib/EconomyProviderListener.java

@@ -0,0 +1,25 @@
+package one.lindegaard.CustomItemsLib;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.event.server.ServerLoadEvent;
+
+public class EconomyProviderListener implements Listener {
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPluginEnable(PluginEnableEvent event) {
+		if (!"BagOfGold".equalsIgnoreCase(event.getPlugin().getName()))
+			return;
+
+		if (Core.getEconomyManager() != null)
+			Core.getEconomyManager().setupEconomy();
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onServerLoad(ServerLoadEvent event) {
+		if (Core.getEconomyManager() != null)
+			Core.getEconomyManager().setupEconomy();
+	}
+}