Update nuvotifer to 2.3.3

.travis.yml

@@ -6,6 +6,6 @@ deploy:
   provider: releases
   api_key:
     secure: j8y4qeDOXAYjmf6WU6EbpUA6AKTz26yJ4zNb6oAuB4h9Y3PpBRjFjCIBL6jJQnMxZMLjdgk72/3uqS7+//jJ8/iiY/OJhO2L+2us8TJDcQhH5EI1USe/lcZKf60iJjmd9Q9pjh1eHNYhxr6kyNLnpa6fw5b/hIBT6CvNZAJV1qbhRpHwtzbgdlMFaHGnpX192vJNw7E3uuJuSwue5XNK2ybDp81oTrM0Q16JCq/UsQhGq4Ba3JffOhdBhpfg4EI2jJfe3vN8CFqojCYKNSp7eL6DPFPaV4x8Ly8cRIOZ5Zb60m5SyWAcagPKJuUq3ZOTHfeVTjkI9ymZMHe1pla2Mq6eitIBwZIGnonjyMxcTdkR9EJgq9jo+1PzdStR/NlGLakBiwPzk8Ov0DZ+iOwpYUkISUkMU0UgKWwoFoRu18CHtp+ALEsoYZhBQGlcShq+4EGv9VMNBYk9vN3KXNRMVGKqXd6O3T6shvSQgoUn/3mvksOTAuhS5J4U3woHecDrXwl/RfP2aqiHhX/S7p7yY4hVcHu8kiSYpNQMbay+rNd6HxFcRe/U9HOUt6kW8/yo1ROyCxs3ze+N6LtGDHspgzkFaay6I6wMHYNDnzzRP4MC3Zc73zxViXol6dGBk4Tawsm16VaI6b1uyWLBGKvuU23azkmMTHUmGFXl2/BTaYw=
-  file: universal/target/nuvotifier-universal-2.3.2.2.jar
+  file: universal/target/nuvotifier-universal-2.3.3.jar
   on:
     tags: true

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nuvotifier</artifactId>
         <groupId>com.vexsoftware</groupId>
-        <version>2.3.2.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungeecord/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nuvotifier</artifactId>
         <groupId>com.vexsoftware</groupId>
-        <version>2.3.2.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/AbstractPluginMessagingForwardingSource.java

@@ -0,0 +1,108 @@
+package com.vexsoftware.votifier.bungee.forwarding;
+
+import com.vexsoftware.votifier.bungee.NuVotifier;
+import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
+import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.model.Vote;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.event.EventHandler;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+public abstract class AbstractPluginMessagingForwardingSource implements ForwardingVoteSource {
+
+    public AbstractPluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
+        ProxyServer.getInstance().registerChannel(channel);
+        this.channel = channel;
+        this.nuVotifier = nuVotifier;
+        this.cache = cache;
+        this.ignoredServers = ignoredServers;
+    }
+
+    protected AbstractPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
+        this(channel, null, nuVotifier, voteCache);
+    }
+
+    protected final NuVotifier nuVotifier;
+    protected final String channel;
+    protected final VoteCache cache;
+    protected final List<String> ignoredServers;
+
+    @Override
+    public void forward(Vote v) {
+        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        for (ServerInfo s : ProxyServer.getInstance().getServers().values()) {
+            if (ignoredServers != null && ignoredServers.contains(s.getName())) continue;
+            if (!forwardSpecific(s, rawData)) attemptToAddToCache(v, s.getName());
+        }
+    }
+
+    protected boolean forwardSpecific(ServerInfo connection, Vote vote) {
+        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        return connection.sendData(channel, rawData, false);
+    }
+
+    private boolean forwardSpecific(ServerInfo connection, byte[] data) {
+        return connection.sendData(channel, data, false);
+    }
+
+    @Override
+    public void halt() {
+        ProxyServer.getInstance().unregisterChannel(channel);
+
+        if (cache != null && cache instanceof FileVoteCache) {
+            try {
+                ((FileVoteCache) cache).halt();
+            } catch (IOException e) {
+                nuVotifier.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost.", e);
+            }
+        }
+    }
+
+    protected void handleServerConnected(final ServerConnectedEvent e) {
+        if (cache == null) return;
+        final String serverName = e.getServer().getInfo().getName();
+        final Collection<Vote> cachedVotes = cache.evict(serverName);
+        if (!cachedVotes.isEmpty()) {
+            nuVotifier.getProxy().getScheduler().schedule(nuVotifier, new Runnable() {
+                @Override
+                public void run() {
+                    int evicted = 0;
+                    int unsuccessfulEvictions = 0;
+                    for (Vote v : cachedVotes) {
+                        if (forwardSpecific(e.getServer().getInfo(), v)) {
+                            evicted++;
+                        } else {
+                            // Re-add to cache to send later.
+                            cache.addToCache(v, serverName);
+                            unsuccessfulEvictions++;
+                        }
+                    }
+                    if (nuVotifier.isDebug()) {
+                        nuVotifier.getLogger().info("Successfully evicted " + evicted + " votes to server '" + serverName + "'.");
+                        if (unsuccessfulEvictions > 0) {
+                            nuVotifier.getLogger().info("Held " + unsuccessfulEvictions + " votes for server '" + serverName + "'.");
+                        }
+                    }
+                }
+            }, 1, TimeUnit.SECONDS);
+        }
+    }
+
+    protected void attemptToAddToCache(Vote v, String server) {
+        if (cache != null) {
+            cache.addToCache(v, server);
+            if (nuVotifier.isDebug())
+                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> " + server);
+        } else if (nuVotifier.isDebug())
+            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/OnlineForwardPluginMessagingForwardingSource.java

@@ -8,16 +8,18 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
 /**
  * @author Joseph Hirschfeld
  * @date 12/31/2015
  */
-public final class OnlineForwardPluginMessagingForwardingSource extends PluginMessagingForwardingSource {
+public final class OnlineForwardPluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
     public OnlineForwardPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache cache, String fallbackServer) {
         super(channel, nuVotifier, cache);
         this.fallbackServer = fallbackServer;
+        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
     private final String fallbackServer;
@@ -27,7 +29,7 @@ public final class OnlineForwardPluginMessagingForwardingSource extends PluginMe
         ProxiedPlayer p = ProxyServer.getInstance().getPlayer(v.getUsername());
         if (p == null || !forwardSpecific(p.getServer().getInfo(), v)) {
             ServerInfo serverInfo = ProxyServer.getInstance().getServers().get(fallbackServer);
-            if (serverInfo == null || !forwardSpecific(serverInfo, v)) {
+            if (serverInfo != null && !forwardSpecific(serverInfo, v)) {
                 attemptToAddToCache(v, fallbackServer);
             }
         }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/PluginMessagingForwardingSource.java

@@ -1,75 +1,25 @@
 package com.vexsoftware.votifier.bungee.forwarding;
 
 import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
 import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.model.Vote;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 
-/**
- * Created by Joe Hirschfeld on 10/20/2015.
- */
-public class PluginMessagingForwardingSource implements ForwardingVoteSource, Listener {
+public class PluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
 
     public PluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
-        ProxyServer.getInstance().registerChannel(channel);
+        super(channel, ignoredServers, nuVotifier, cache);
         ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
-        this.channel = channel;
-        this.nuVotifier = nuVotifier;
-        this.cache = cache;
-        this.ignoredServers = ignoredServers;
     }
 
     protected PluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
-        this(channel, null, nuVotifier, voteCache);
-    }
-
-    protected final NuVotifier nuVotifier;
-    protected final String channel;
-    protected final VoteCache cache;
-    protected final List<String> ignoredServers;
-
-    @Override
-    public void forward(Vote v) {
-        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        for (ServerInfo s : ProxyServer.getInstance().getServers().values()) {
-            if (ignoredServers != null && ignoredServers.contains(s.getName())) continue;
-            if (!forwardSpecific(s, rawData)) attemptToAddToCache(v, s.getName());
-        }
-    }
-
-    protected boolean forwardSpecific(ServerInfo connection, Vote vote) {
-        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        return connection.sendData(channel, rawData, false);
-    }
-
-    private boolean forwardSpecific(ServerInfo connection, byte[] data) {
-        return connection.sendData(channel, data, false);
-    }
-
-    @Override
-    public void halt() {
-        ProxyServer.getInstance().unregisterChannel(channel);
-
-        if (cache != null && cache instanceof FileVoteCache) {
-            try {
-                ((FileVoteCache) cache).halt();
-            } catch (IOException e) {
-                nuVotifier.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost.", e);
-            }
-        }
+        super(channel, nuVotifier, voteCache);
+        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
     @EventHandler
@@ -81,43 +31,4 @@ public class PluginMessagingForwardingSource implements ForwardingVoteSource, Li
     public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
         handleServerConnected(e);
     }
-
-    protected void handleServerConnected(final ServerConnectedEvent e) {
-        if (cache == null) return;
-        final String serverName = e.getServer().getInfo().getName();
-        final Collection<Vote> cachedVotes = cache.evict(serverName);
-        if (!cachedVotes.isEmpty()) {
-            nuVotifier.getProxy().getScheduler().schedule(nuVotifier, new Runnable() {
-                @Override
-                public void run() {
-                    int evicted = 0;
-                    int unsuccessfulEvictions = 0;
-                    for (Vote v : cachedVotes) {
-                        if (forwardSpecific(e.getServer().getInfo(), v)) {
-                            evicted++;
-                        } else {
-                            // Re-add to cache to send later.
-                            cache.addToCache(v, serverName);
-                            unsuccessfulEvictions++;
-                        }
-                    }
-                    if (nuVotifier.isDebug()) {
-                        nuVotifier.getLogger().info("Successfully evicted " + evicted + " votes to server '" + serverName + "'.");
-                        if (unsuccessfulEvictions > 0) {
-                            nuVotifier.getLogger().info("Held " + unsuccessfulEvictions + " votes for server '" + serverName + "'.");
-                        }
-                    }
-                }
-            }, 1, TimeUnit.SECONDS);
-        }
-    }
-
-    protected void attemptToAddToCache(Vote v, String server) {
-        if (cache != null) {
-            cache.addToCache(v, server);
-            if (nuVotifier.isDebug())
-                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> " + server);
-        } else if (nuVotifier.isDebug())
-            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
-    }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/FileVoteCache.java

@@ -63,16 +63,19 @@ public class FileVoteCache extends MemoryVoteCache {
 
     public void save() throws IOException {
         cacheLock.lock();
-        // Create a copy of the votes.
         JSONObject votesObject = new JSONObject();
-        for (Map.Entry<String, Collection<Vote>> entry : voteCache.entrySet()) {
-            JSONArray array = new JSONArray();
-            for (Vote vote : entry.getValue()) {
-                array.put(vote.serialize());
+        try {
+            // Create a copy of the votes.
+            for (Map.Entry<String, Collection<Vote>> entry : voteCache.entrySet()) {
+                JSONArray array = new JSONArray();
+                for (Vote vote : entry.getValue()) {
+                    array.put(vote.serialize());
+                }
+                votesObject.put(entry.getKey(), array);
             }
-            votesObject.put(entry.getKey(), array);
+        } finally {
+            cacheLock.unlock();
         }
-        cacheLock.unlock();
 
         try (BufferedWriter writer = Files.newWriter(cacheFile, StandardCharsets.UTF_8)) {
             votesObject.write(writer);

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/MemoryVoteCache.java

@@ -22,28 +22,38 @@ public class MemoryVoteCache implements VoteCache {
     @Override
     public Collection<String> getCachedServers() {
         cacheLock.lock();
-        Set<String> servers = ImmutableSet.copyOf(voteCache.keySet());
-        cacheLock.unlock();
-        return servers;
+        try {
+            return ImmutableSet.copyOf(voteCache.keySet());
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
     @Override
     public void addToCache(Vote v, String server) {
+        if (server == null) throw new NullPointerException();
         cacheLock.lock();
-        Collection<Vote> voteCollection = voteCache.get(server);
-        if (voteCollection == null) {
-            voteCollection = new LinkedHashSet<>();
-            voteCache.put(server, voteCollection);
+        try {
+            Collection<Vote> voteCollection = voteCache.get(server);
+            if (voteCollection == null) {
+                voteCollection = new LinkedHashSet<>();
+                voteCache.put(server, voteCollection);
+            }
+            voteCollection.add(v);
+        } finally {
+            cacheLock.unlock();
         }
-        voteCollection.add(v);
-        cacheLock.unlock();
     }
 
     @Override
     public Collection<Vote> evict(String server) {
+        if (server == null) throw new NullPointerException();
         cacheLock.lock();
-        Collection<Vote> fromCollection = voteCache.remove(server);
-        cacheLock.unlock();
-        return fromCollection != null ? ImmutableSet.copyOf(fromCollection) : ImmutableSet.<Vote>of();
+        try {
+            Collection<Vote> fromCollection = voteCache.remove(server);
+            return fromCollection != null ? ImmutableSet.copyOf(fromCollection) : ImmutableSet.<Vote>of();
+        } finally {
+            cacheLock.unlock();
+        }
     }
 }

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nuvotifier</artifactId>
         <groupId>com.vexsoftware</groupId>
-        <version>2.3.2.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2Decoder.java

@@ -12,10 +12,7 @@ import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
+import java.security.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -92,6 +89,6 @@ public class VotifierProtocol2Decoder extends MessageToMessageDecoder<String> {
         mac2.reset();
         byte[] realSig = mac2.doFinal(calculatedSig);
 
-        return Arrays.equals(clientSig, realSig);
+        return MessageDigest.isEqual(clientSig, realSig);
     }
 }

common/src/main/java/com/vexsoftware/votifier/net/protocol/v1crypto/RSAIO.java

@@ -21,6 +21,7 @@ package com.vexsoftware.votifier.net.protocol.v1crypto;
 import javax.xml.bind.DatatypeConverter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.KeyFactory;
 import java.security.KeyPair;
@@ -45,21 +46,18 @@ public class RSAIO {
         PrivateKey privateKey = keyPair.getPrivate();
         PublicKey publicKey = keyPair.getPublic();
 
-        // Store the public key.
+        // Store the public and private keys.
         X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(
                 publicKey.getEncoded());
-        FileOutputStream out = new FileOutputStream(directory + "/public.key");
-        out.write(DatatypeConverter.printBase64Binary(publicSpec.getEncoded())
-                .getBytes());
-        out.close();
-
-        // Store the private key.
         PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(
                 privateKey.getEncoded());
-        out = new FileOutputStream(directory + "/private.key");
-        out.write(DatatypeConverter.printBase64Binary(privateSpec.getEncoded())
-                .getBytes());
-        out.close();
+        try (FileOutputStream publicOut = new FileOutputStream(directory + "/public.key");
+             FileOutputStream privateOut = new FileOutputStream(directory + "/private.key")) {
+            publicOut.write(DatatypeConverter.printBase64Binary(publicSpec.getEncoded())
+                    .getBytes(StandardCharsets.UTF_8));
+            privateOut.write(DatatypeConverter.printBase64Binary(privateSpec.getEncoded())
+                    .getBytes(StandardCharsets.UTF_8));
+        }
     }
 
     /**
@@ -75,13 +73,13 @@ public class RSAIO {
         File publicKeyFile = new File(directory + "/public.key");
         byte[] encodedPublicKey = Files.readAllBytes(publicKeyFile.toPath());
         encodedPublicKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPublicKey));
+                encodedPublicKey, StandardCharsets.UTF_8));
 
         // Read the private key file.
         File privateKeyFile = new File(directory + "/private.key");
         byte[] encodedPrivateKey = Files.readAllBytes(privateKeyFile.toPath());
         encodedPrivateKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPrivateKey));
+                encodedPrivateKey, StandardCharsets.UTF_8));
 
         // Instantiate and return the key pair.
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");

common/src/main/java/com/vexsoftware/votifier/util/standalone/StandaloneVotifierPlugin.java

@@ -74,7 +74,7 @@ public class StandaloneVotifierPlugin implements VotifierPlugin, VoteHandler {
 
     @Override
     public String getVersion() {
-        return "2.3.2.2";
+        return "2.3.3";
     }
 
     @Override

common/src/main/java/com/vexsoftware/votifier/util/standalone/VotifierServerBuilder.java

@@ -7,6 +7,7 @@ import java.io.File;
 import java.net.InetSocketAddress;
 import java.security.Key;
 import java.security.KeyPair;
+import java.security.interfaces.RSAKey;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -27,6 +28,9 @@ public class VotifierServerBuilder {
 
     public VotifierServerBuilder v1Key(KeyPair v1Key) {
         this.v1Key = Objects.requireNonNull(v1Key, "v1Key");
+        if (!(v1Key.getPrivate() instanceof RSAKey)) {
+            throw new IllegalArgumentException("Provided key is not an RSA key.");
+        }
         return this;
     }
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.vexsoftware</groupId>
     <artifactId>nuvotifier</artifactId>
     <packaging>pom</packaging>
-    <version>2.3.2.2</version>
+    <version>2.3.3</version>
     <modules>
         <module>common</module>
         <module>bukkit</module>

sponge/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nuvotifier</artifactId>
         <groupId>com.vexsoftware</groupId>
-        <version>2.3.2.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sponge/src/main/java/com/vexsoftware/votifier/sponge/VotifierPlugin.java

@@ -53,7 +53,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.3.2.2")
+@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.3.3")
 public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.VotifierPlugin, ForwardedVoteListener {
     private Logger logger;
     @Inject

universal/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nuvotifier</artifactId>
         <groupId>com.vexsoftware</groupId>
-        <version>2.3.2.2</version>
+        <version>2.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>