More modifications, back to basics

There are a _lot_ of changes, including a ton which segment dependencies
better. So thats cool

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.paypal.me/ibj

.gitignore

@@ -11,13 +11,14 @@
 /build.xml
 
 # maven
-/target
+/*/target/
+dependency-reduced-pom.xml
 
 # vim
 .*.sw[a-p]
 
 # various other potential build files
-/build
+build/
 /bin
 /dist
 /manifest.mf
@@ -42,3 +43,7 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
+
+# gradle stuff
+.gradle/
+.gradletasknamecache

.travis.yml

@@ -1,11 +0,0 @@
-sudo: false
-language: java
-jdk:
-- oraclejdk8
-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.jar
-  on:
-    tags: true

Jenkinsfile

@@ -0,0 +1,37 @@
+pipeline {
+    agent {
+        docker { image 'openjdk:12-jdk' }
+    }
+
+    stages {
+        stage('Build') {
+            steps {
+                sh './gradlew build --no-daemon'            
+            }
+        }
+        
+        stage('Test') {
+            steps {
+                sh './gradlew test --no-daemon'            
+            }
+        }
+        
+        stage('Publish') {
+            when {
+                branch "master"
+            }
+            environment {
+                SNAPSHOT_REPO   = credentials('ibj-nexus-snapshot-repo')
+                RELEASE_REPO    = credentials('ibj-nexus-release-repo')
+                RAW_UPLOAD_PATH = credentials('ibj-nexus-raw-path')
+                REPO            = credentials('ibj-nexus-access')
+                PUBLISH = 'true'
+                LATEST_BUILD = 'true'
+            }
+            steps {
+                sh './gradlew publishVersionedPublicationToIbjRepository'
+                sh './gradlew publishLatestToIbjBlockRaw'
+            }
+        }
+    }
+}

README.markdown

@@ -1,110 +0,0 @@
-# NuVotifier
-
-NuVotifier is a Bukkit plugin whose purpose is to be notified (aka *votified*) when a vote is made on a Minecraft server top list for the server.  NuVotifier creates a *lightweight* server that waits for connections by Minecraft server lists and uses a simple protocol to get the required information.  NuVotifier is *secure*, and makes sure that all vote notifications are delivered by authentic top lists.
-
-## Why fork Votifier?
-
-Votifier has lagged in activity, has severe security flaws in its protocol, and is vulnerable to denial of service attacks.
-
-### Is NuVotifier a drop-in replacement for Votifier?
-
-Yes. NuVotifier is compatible with Votifier server lists and Votifier listeners, with some differences:
-
-* The `Vote` object's setters are deprecated.
-* Support for standalone vote listeners (`.class` files) has been removed, as handling `VotifierEvent` is more flexible.
-
-### Why a new protocol?
-
-The old Votifier protocol has three major flaws, which we feel are corrected in the new protocol.
-
-* The data is encrypted (with RSA) but not hashed to verify its integrity. The new protocol utilizes HMAC with SHA256 (but no encryption, given that the data sent is eventually revealed in some form or another).
-* The canonical Votifier protocol is vulnerable to replay attacks.
-* The canonical Votifier is one key for all clients, which is weak. While NuVotifier still supports a default key (for the less paranoid), this ability can be disabled and force per-server keys.
-
-## Configuring NuVotifier
-
-NuVotifier configures itself the first time it is run. If you have an existing Votifier configuration, NuVotifier will copy it over and use it.
-
-If you want to customize NuVotifier, simply the edit `./plugins/(Nu)Votifier/config.yml` file.
-
-An in-depth configuration guide is located in `usage.md` of this repository.
-
-### Tokens
-
-In `config.yml`, you will notice a `tokens` section. NuVotifier has a new protocol version that requires tokens. The `tokens` section can be used to easily grant or revoke access to a server list based on the keys it uses.
-
-### RSA Keys
-
-RSA keys for use with the old Votifier protocol are available under the `plugins/(Nu)Votifier/rsa` directory.
-
-### Vote Forwarding
-
-Starting from NuVotifier 2.2, there is a feature to forward votes from NuVotifier running on BungeeCord to your Bukkit servers without complicated setup.
-
-You must enable the feature on both your Bukkit and BungeeCord servers. This feature is still in beta but is stable.
-
-## Building NuVotifier
-
-NuVotifier can be built by running `mvn clean package` from within the root directory of NuVotifier. A universal Bukkit/Spigot & BungeeCord plugin will be built to `universal/target/nuvotifier-universal-{version}.jar`
-
-## Protocol Documentation
-
-This documentation is for server lists that wish to add NuVotifier support.
-
-There are two versions of the NuVotifier protocol.
-
-### Handshake
-
-A connection is made to the NuVotifier server by the server list, and immediately NuVotifier will send its version in the following packet:
-
-	"VOTIFIER <version> <challenge>"
-
-The challenge will not be present in version 1.x servers.
-
-### Protocol v2
-
-NuVotifier expects a message composed of `0x733A` (16-bit big-endian integer) and the length of the following JSON message (as a 16-bit big-endian integer) sent plus the message.
-
-The message is JSON-encoded containing the following data:
-
-* `payload` contains the fully encoded vote. It is a JSON message containing the `serviceName` (string), `username` (string), `address` (string, but must be a valid IPv4 or IPv6 address), `timestamp` (a long with the time this vote was taken in _milliseconds_), and `challenge` (from the handshake). It is optional, but recommended to supply a `uuid` field with the player's UUID (with dashes, e.g. `652a2bc4-e8cd-405d-b7b6-98156ee2dc09`).
-* `signature` is a HMAC-SHA256 digest of the payload with a owner-provided key.
-
-A response is given after the vote has been received and parsed, but not yet processed.
-
-For your convenience, the NuVotifier team has provided client libraries in [JavaScript](https://github.com/NuVotifier/votifier2-js) and [PHP](https://github.com/NuVotifier/votifier2-php). If you are stuck, these libraries may help you.
-
-### Protocol v1 (deprecated)
-
-For better compatibility, NuVotifier supports the old Votifier protocol as well.
-
-NuVotifier expects a 256 byte RSA encrypted block (the public key should be obtained by the NuVotifier user), with the following format:
-
-<table>
-  <tr>
-	<th>Type</th>
-	<th>Value</th>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>VOTE</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>serviceName</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>username</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>address</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>timeStamp</td>
-  </tr>
-</table>
-
-The first string of value "VOTE" is an opcode check to ensure that RSA was encoded and decoded properly, if this value is wrong then NuVotifier assumes that there was a problem with encryption and drops the connection. `serviceName` is the name of the top list service, `username` is the username (entered by the voter) of the person who voted, `address` is the IP address of the voter, and `timeStamp` is the time stamp of the vote.  Each string is delimited by the newline character `\n` (byte value 10).  The `space` block is the empty space that is left over, **the block must be exactly 256 bytes** regardless of how much information it holds.

README.md

@@ -0,0 +1,25 @@
+# NuVotifier
+
+NuVotifier is a secure alternative to using the original Votifier project.
+NuVotifier will work in place of Votifier - any vote listener that supports
+Votifier will also support NuVotifier.
+
+NuVotifier supports many different platforms using the same universal JAR:
+
++ Bukkit / Spigot / Paper >=1.8
++ Sponge 7
++ BungeeCord / Waterfall
++ Velocity
+
+NuVotifier also adds forwarding and listener test commands not present in the
+original version.
+
+[Setup Guide](https://github.com/NuVotifier/NuVotifier/wiki/Setup-Guide)
+
+[Troubleshooting Guide](https://github.com/NuVotifier/NuVotifier/wiki/Troubleshooting-Guide)
+
+[Developer Information](https://github.com/NuVotifier/NuVotifier/wiki/Developer-Documentation)
+
+# License
+
+NuVotifier is GNU GPLv3 licensed. This project's license can be viewed [here](LICENSE).

build.gradle

@@ -0,0 +1,44 @@
+
+import org.apache.tools.ant.filters.ReplaceTokens
+
+allprojects {
+    group 'io.ibj.nuvotifier'
+    version '3.0.0-SNAPSHOT'
+}
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'java-library'
+
+    sourceCompatibility = 1.8
+
+    repositories {
+        mavenCentral()
+        maven {
+            url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
+        }
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots"
+        }
+        maven {
+            url "https://repo.spongepowered.org/maven"
+        }
+        maven {
+            url "https://repo.velocitypowered.com/snapshots/"
+        }
+    }
+
+    dependencies {
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+        testRuntime "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+        testCompile "org.mockito:mockito-core:2.+"
+    }
+
+    processResources {
+        filter(ReplaceTokens, tokens: ["app.version": this.project.version])
+    }
+
+    test {
+        useJUnitPlatform()
+    }
+}

bukkit-api/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    api group: "org.spigotmc", name: "spigot-api", version: "1.8.8-R0.1-SNAPSHOT"
+    implementation project(":model")
+}

bukkit-api/src/main/java/com/vexsoftware/votifier/model/VotifierEvent.java

@@ -1,5 +1,6 @@
 package com.vexsoftware.votifier.model;
 
+import io.ibj.nuvotifier.model.NuVote;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -19,14 +20,14 @@ public class VotifierEvent extends Event {
     /**
      * Encapsulated vote record.
      */
-    private Vote vote;
+    private NuVote vote;
 
     /**
      * Constructs a vote event that encapsulated the given vote record.
      *
      * @param vote vote record
      */
-    public VotifierEvent(final Vote vote) {
+    public VotifierEvent(final NuVote vote) {
         this.vote = vote;
     }
 

bukkit/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-bukkit</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>target/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.7.2-R0.1</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>

bukkit/src/main/java/com/vexsoftware/votifier/NuVotifierBukkit.java

@@ -1,382 +0,0 @@
-/*
- * Copyright (C) 2012 Vex Software LLC
- * This file is part of Votifier.
- *
- * Votifier is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Votifier is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.vexsoftware.votifier;
-
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
-import com.vexsoftware.votifier.forwarding.BukkitPluginMessagingForwardingSink;
-import com.vexsoftware.votifier.forwarding.ForwardedVoteListener;
-import com.vexsoftware.votifier.forwarding.ForwardingVoteSink;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.model.VotifierEvent;
-import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAKeygen;
-import com.vexsoftware.votifier.util.KeyCreator;
-import com.vexsoftware.votifier.util.TokenUtil;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-import java.security.KeyPair;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-
-/**
- * The main Votifier plugin class.
- *
- * @author Blake Beaupain
- * @author Kramer Campbell
- */
-public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, VotifierPlugin, ForwardedVoteListener {
-
-    /**
-     * The Votifier instance.
-     */
-    private static NuVotifierBukkit instance;
-
-    /**
-     * The current Votifier version.
-     */
-    private String version;
-
-    /**
-     * The server channel.
-     */
-    private Channel serverChannel;
-
-    /**
-     * The event group handling the channel.
-     */
-    private NioEventLoopGroup serverGroup;
-
-    /**
-     * The RSA key pair.
-     */
-    private KeyPair keyPair;
-
-    /**
-     * Debug mode flag
-     */
-    private boolean debug;
-
-    /**
-     * Keys used for websites.
-     */
-    private Map<String, Key> tokens = new HashMap<>();
-
-    private ForwardingVoteSink forwardingMethod;
-
-    @Override
-    public void onEnable() {
-        NuVotifierBukkit.instance = this;
-
-        // Set the plugin version.
-        version = getDescription().getVersion();
-
-        if (!getDataFolder().exists()) {
-            getDataFolder().mkdir();
-        }
-
-        // Handle configuration.
-        File config = new File(getDataFolder() + "/config.yml");
-        YamlConfiguration cfg;
-        File rsaDirectory = new File(getDataFolder() + "/rsa");
-
-        /*
-         * Use IP address from server.properties as a default for
-         * configurations. Do not use InetAddress.getLocalHost() as it most
-         * likely will return the main server address instead of the address
-         * assigned to the server.
-         */
-        String hostAddr = Bukkit.getServer().getIp();
-        if (hostAddr == null || hostAddr.length() == 0)
-            hostAddr = "0.0.0.0";
-
-        /*
-         * Create configuration file if it does not exists; otherwise, load it
-         */
-        if (!config.exists()) {
-            try {
-                // First time run - do some initialization.
-                getLogger().info("Configuring Votifier for the first time...");
-
-                // Initialize the configuration file.
-                config.createNewFile();
-
-                // Load and manually replace variables in the configuration.
-                String cfgStr = new String(ByteStreams.toByteArray(getResource("bukkitConfig.yml")), StandardCharsets.UTF_8);
-                String token = TokenUtil.newToken();
-                cfgStr = cfgStr.replace("%default_token%", token).replace("%ip%", hostAddr);
-                Files.write(cfgStr, config, StandardCharsets.UTF_8);
-
-                /*
-                 * Remind hosted server admins to be sure they have the right
-                 * port number.
-                 */
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Assigning NuVotifier to listen on port 8192. If you are hosting Craftbukkit on a");
-                getLogger().info("shared server please check with your hosting provider to verify that this port");
-                getLogger().info("is available for your use. Chances are that your hosting provider will assign");
-                getLogger().info("a different port, which you need to specify in config.yml");
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Your default NuVotifier token is " + token + ".");
-                getLogger().info("You will need to provide this token when you submit your server to a voting");
-                getLogger().info("list.");
-                getLogger().info("------------------------------------------------------------------------------");
-            } catch (Exception ex) {
-                getLogger().log(Level.SEVERE, "Error creating configuration file", ex);
-                gracefulExit();
-                return;
-            }
-        }
-
-        // Load configuration.
-        cfg = YamlConfiguration.loadConfiguration(config);
-
-        /*
-         * Create RSA directory and keys if it does not exist; otherwise, read
-         * keys.
-         */
-        try {
-            if (!rsaDirectory.exists()) {
-                rsaDirectory.mkdir();
-                keyPair = RSAKeygen.generate(2048);
-                RSAIO.save(rsaDirectory, keyPair);
-            } else {
-                keyPair = RSAIO.load(rsaDirectory);
-            }
-        } catch (Exception ex) {
-            getLogger().log(Level.SEVERE,
-                    "Error reading configuration file or RSA tokens", ex);
-            gracefulExit();
-            return;
-        }
-
-        debug = cfg.getBoolean("debug", false);
-
-        boolean setUpPort = cfg.getBoolean("enableExternal", true); //Always default to running the external port
-
-        if (setUpPort) {
-            // Load Votifier tokens.
-            ConfigurationSection tokenSection = cfg.getConfigurationSection("tokens");
-
-            if (tokenSection != null) {
-                Map<String, Object> websites = tokenSection.getValues(false);
-                for (Map.Entry<String, Object> website : websites.entrySet()) {
-                    tokens.put(website.getKey(), KeyCreator.createKeyFrom(website.getValue().toString()));
-                    getLogger().info("Loaded token for website: " + website.getKey());
-                }
-            } else {
-                String token = TokenUtil.newToken();
-                tokenSection = cfg.createSection("tokens");
-                tokenSection.set("default", token);
-                tokens.put("default", KeyCreator.createKeyFrom(token));
-                try {
-                    cfg.save(config);
-                } catch (IOException e) {
-                    getLogger().log(Level.SEVERE,
-                            "Error generating Votifier token", e);
-                    gracefulExit();
-                    return;
-                }
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("No tokens were found in your configuration, so we've generated one for you.");
-                getLogger().info("Your default Votifier token is " + token + ".");
-                getLogger().info("You will need to provide this token when you submit your server to a voting");
-                getLogger().info("list.");
-                getLogger().info("------------------------------------------------------------------------------");
-            }
-
-            // Initialize the receiver.
-            final String host = cfg.getString("host", hostAddr);
-            final int port = cfg.getInt("port", 8192);
-            if (debug)
-                getLogger().info("DEBUG mode enabled!");
-
-            final boolean disablev1 = cfg.getBoolean("disable-v1-protocol");
-            if (disablev1) {
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Votifier protocol v1 parsing has been disabled. Most voting websites do not");
-                getLogger().info("currently support the modern Votifier protocol in NuVotifier.");
-                getLogger().info("------------------------------------------------------------------------------");
-            }
-
-            serverGroup = new NioEventLoopGroup(1);
-
-            new ServerBootstrap()
-                    .channel(NioServerSocketChannel.class)
-                    .group(serverGroup)
-                    .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                        @Override
-                        protected void initChannel(NioSocketChannel channel) throws Exception {
-                            channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                            channel.attr(VotifierPlugin.KEY).set(NuVotifierBukkit.this);
-                            channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                            channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !disablev1));
-                            channel.pipeline().addLast("voteHandler", new VoteInboundHandler(NuVotifierBukkit.this));
-                        }
-                    })
-                    .bind(host, port)
-                    .addListener(new ChannelFutureListener() {
-                        @Override
-                        public void operationComplete(ChannelFuture future) throws Exception {
-                            if (future.isSuccess()) {
-                                serverChannel = future.channel();
-                                getLogger().info("Votifier enabled.");
-                            } else {
-                                SocketAddress socketAddress = future.channel().localAddress();
-                                if (socketAddress == null) {
-                                    socketAddress = new InetSocketAddress(host, port);
-                                }
-                                getLogger().log(Level.SEVERE, "Votifier was not able to bind to " + socketAddress, future.cause());
-                            }
-                        }
-                    });
-        } else {
-            getLogger().info("You have enableExternal set to false in your config.yml. NuVotifier will NOT listen to votes coming in from an external voting list.");
-        }
-
-        ConfigurationSection forwardingConfig = cfg.getConfigurationSection("forwarding");
-        if (forwardingConfig != null) {
-            String method = forwardingConfig.getString("method", "none").toLowerCase(); //Default to lower case for case-insensitive searches
-            if ("none".equals(method)) {
-                getLogger().info("Method none selected for vote forwarding: Votes will not be received from a forwarder.");
-            } else if ("pluginmessaging".equals(method)) {
-                String channel = forwardingConfig.getString("pluginMessaging.channel", "NuVotifier");
-                try {
-                    forwardingMethod = new BukkitPluginMessagingForwardingSink(this, channel, this);
-                    getLogger().info("Receiving votes over PluginMessaging channel '" + channel + "'.");
-                } catch (RuntimeException e) {
-                    getLogger().log(Level.SEVERE, "NuVotifier could not set up PluginMessaging for vote forwarding!", e);
-                }
-            } else {
-                getLogger().severe("No vote forwarding method '" + method + "' known. Defaulting to noop implementation.");
-            }
-        }
-    }
-
-    @Override
-    public void onDisable() {
-        // Shut down the network handlers.
-        if (serverGroup != null) {
-            if (serverChannel != null)
-                serverChannel.close();
-            serverGroup.shutdownGracefully();
-        }
-        if (forwardingMethod != null) {
-            forwardingMethod.halt();
-        }
-        getLogger().info("Votifier disabled.");
-    }
-
-    private void gracefulExit() {
-        getLogger().log(Level.SEVERE, "Votifier did not initialize properly!");
-    }
-
-    /**
-     * Gets the instance.
-     *
-     * @return The instance
-     */
-    public static NuVotifierBukkit getInstance() {
-        return instance;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return The version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    public boolean isDebug() {
-        return debug;
-    }
-
-    @Override
-    public Map<String, Key> getTokens() {
-        return tokens;
-    }
-
-    @Override
-    public KeyPair getProtocolV1Key() {
-        return keyPair;
-    }
-
-    @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
-        if (debug) {
-            if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record -> " + vote);
-            } else {
-                getLogger().info("Got a protocol v2 vote record -> " + vote);
-            }
-        }
-        Bukkit.getScheduler().runTask(this, new Runnable() {
-            @Override
-            public void run() {
-                Bukkit.getPluginManager().callEvent(new VotifierEvent(vote));
-            }
-        });
-    }
-
-    @Override
-    public void onError(Channel channel, Throwable throwable) {
-        if (debug) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
-        }
-    }
-
-    @Override
-    public void onForward(final Vote v) {
-        if (debug) {
-            getLogger().info("Got a forwarded vote -> " + v);
-        }
-        Bukkit.getScheduler().runTask(this, new Runnable() {
-            @Override
-            public void run() {
-                Bukkit.getPluginManager().callEvent(new VotifierEvent(v));
-            }
-        });
-    }
-}

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/BukkitPluginMessagingForwardingSink.java

@@ -1,48 +0,0 @@
-package com.vexsoftware.votifier.forwarding;
-
-import com.vexsoftware.votifier.NuVotifierBukkit;
-import com.vexsoftware.votifier.model.Vote;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-import org.json.JSONObject;
-
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Level;
-
-/**
- * Created by Joe Hirschfeld on 10/20/2015.
- */
-public class BukkitPluginMessagingForwardingSink implements ForwardingVoteSink, PluginMessageListener {
-
-    public BukkitPluginMessagingForwardingSink(Plugin p, String channel, ForwardedVoteListener listener) {
-        Validate.notNull(channel, "Channel cannot be null.");
-        this.channel = channel;
-        Bukkit.getMessenger().registerIncomingPluginChannel(p, channel, this);
-        this.listener = listener;
-        this.p = p;
-    }
-
-    private final Plugin p;
-    private final String channel;
-    private final ForwardedVoteListener listener;
-
-    @Override
-    public void halt() {
-        Bukkit.getMessenger().unregisterIncomingPluginChannel(p, channel, this);
-    }
-
-    @Override
-    public void onPluginMessageReceived(String s, Player player, byte[] bytes) {
-        try {
-            String message = new String(bytes, StandardCharsets.UTF_8);
-            JSONObject jsonObject = new JSONObject(message);
-            Vote v = new Vote(jsonObject);
-            listener.onForward(v);
-        } catch (Exception e) {
-            NuVotifierBukkit.getInstance().getLogger().log(Level.SEVERE, "There was an unknown error when processing a forwarded vote.", e);
-        }
-    }
-}

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/ForwardedVoteListener.java

@@ -1,17 +0,0 @@
-package com.vexsoftware.votifier.forwarding;
-
-import com.vexsoftware.votifier.model.Vote;
-
-/**
- * Represents a method to call when a vote is forwarded through the {@link ForwardingVoteSink}.
- */
-public interface ForwardedVoteListener {
-
-    /**
-     * Called whenever a vote is forwarded from a {@link ForwardingVoteSink}
-     *
-     * @param v Vote that was forwarded
-     */
-    void onForward(Vote v);
-
-}

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/ForwardingVoteSink.java

@@ -1,13 +0,0 @@
-package com.vexsoftware.votifier.forwarding;
-
-/**
- * Represents a method at which to receive forwarded votes.
- */
-public interface ForwardingVoteSink {
-
-    /**
-     * Stop or close any oustanding network interfaces. Occurs on the onDisable method of a plugin.
-     */
-    void halt();
-
-}

bukkit/src/main/resources/bukkitConfig.yml

@@ -1,33 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: %ip%
-
-# Port to listen for new votes on
-port: 8192
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
-# Setting this value to false will turn off the votifier port listening for external votes. This is beneficial if the server
-# is only listening for votes coming from NuVotifier running on your BungeeCord.
-enableExternal: true
-
-# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
-# option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
-# using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.
-disable-v1-protocol: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: %default_token%
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging
-  method: none
-  pluginMessaging:
-    channel: NuVotifier

bukkit/src/main/resources/plugin.yml

@@ -1,5 +0,0 @@
-name: Votifier
-main: com.vexsoftware.votifier.NuVotifierBukkit
-version: maven-version-number
-description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [blakeman8192, Kramer, tuxed]

bungeecord-api/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    api group: "net.md-5", name: "bungeecord-api", version: "1.8-SNAPSHOT"
+    implementation project(":model")
+}

bungeecord-api/src/main/java/com/vexsoftware/votifier/bungee/events/VotifierEvent.java

@@ -1,6 +1,6 @@
 package com.vexsoftware.votifier.bungee.events;
 
-import com.vexsoftware.votifier.model.Vote;
+import io.ibj.nuvotifier.model.NuVote;
 import net.md_5.bungee.api.plugin.Event;
 
 /**
@@ -11,13 +11,13 @@ public class VotifierEvent extends Event {
     /**
      * The vote.
      **/
-    private final Vote vote;
+    private final NuVote vote;
 
-    public VotifierEvent(Vote vote) {
+    public VotifierEvent(NuVote vote) {
         this.vote = vote;
     }
 
-    public Vote getVote() {
+    public NuVote getVote() {
         return vote;
     }
 }

bungeecord/pom.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-bungeecord</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>target/classes/bungee.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.8-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/NuVotifier.java

@@ -1,376 +0,0 @@
-package com.vexsoftware.votifier.bungee;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
-import com.vexsoftware.votifier.VoteHandler;
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.bungee.events.VotifierEvent;
-import com.vexsoftware.votifier.bungee.forwarding.ForwardingVoteSource;
-import com.vexsoftware.votifier.bungee.forwarding.OnlineForwardPluginMessagingForwardingSource;
-import com.vexsoftware.votifier.bungee.forwarding.PluginMessagingForwardingSource;
-import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.cache.MemoryVoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.ProxyForwardingVoteSource;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAKeygen;
-import com.vexsoftware.votifier.util.KeyCreator;
-import com.vexsoftware.votifier.util.TokenUtil;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-import java.security.KeyPair;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-import java.util.logging.Level;
-
-public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
-
-    /**
-     * The server channel.
-     */
-    private Channel serverChannel;
-
-    /**
-     * The event group handling the channel.
-     */
-    private NioEventLoopGroup serverGroup;
-
-    /**
-     * The RSA key pair.
-     */
-    private KeyPair keyPair;
-
-    /**
-     * Debug mode flag
-     */
-    private boolean debug;
-
-    /**
-     * Keys used for websites.
-     */
-    private Map<String, Key> tokens = new HashMap<>();
-
-    /**
-     * Method used to forward votes to downstream servers
-     */
-    private ForwardingVoteSource forwardingMethod;
-
-    @Override
-    public void onEnable() {
-        if (!getDataFolder().exists()) {
-            getDataFolder().mkdir();
-        }
-
-        // Handle configuration.
-        File config = new File(getDataFolder() + "/config.yml");
-        File rsaDirectory = new File(getDataFolder() + "/rsa");
-        Configuration configuration;
-
-        if (!config.exists()) {
-            try {
-                // First time run - do some initialization.
-                getLogger().info("Configuring Votifier for the first time...");
-
-                // Initialize the configuration file.
-                config.createNewFile();
-
-                String cfgStr = new String(ByteStreams.toByteArray(getResourceAsStream("bungeeConfig.yml")), StandardCharsets.UTF_8);
-                String token = TokenUtil.newToken();
-                cfgStr = cfgStr.replace("%default_token%", token);
-                Files.write(cfgStr, config, StandardCharsets.UTF_8);
-
-                /*
-                 * Remind hosted server admins to be sure they have the right
-                 * port number.
-                 */
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Assigning NuVotifier to listen on port 8192. If you are hosting BungeeCord on a");
-                getLogger().info("shared server please check with your hosting provider to verify that this port");
-                getLogger().info("is available for your use. Chances are that your hosting provider will assign");
-                getLogger().info("a different port, which you need to specify in config.yml");
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Assigning NuVotifier to listen to interface 0.0.0.0. This is usually alright,");
-                getLogger().info("however, if you want NuVotifier to only listen to one interface for security ");
-                getLogger().info("reasons (or you use a shared host), you may change this in the config.yml.");
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("Your default Votifier token is " + token + ".");
-                getLogger().info("You will need to provide this token when you submit your server to a voting");
-                getLogger().info("list.");
-                getLogger().info("------------------------------------------------------------------------------");
-            } catch (Exception ex) {
-                throw new RuntimeException("Unable to create configuration file", ex);
-            }
-        }
-
-        // Load the configuration.
-        try {
-            configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config);
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to load configuration", e);
-        }
-
-        /*
-         * Create RSA directory and keys if it does not exist; otherwise, read
-         * keys.
-         */
-        try {
-            if (!rsaDirectory.exists()) {
-                rsaDirectory.mkdir();
-                keyPair = RSAKeygen.generate(2048);
-                RSAIO.save(rsaDirectory, keyPair);
-            } else {
-                keyPair = RSAIO.load(rsaDirectory);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Error reading RSA tokens", ex);
-        }
-
-        // Load Votifier tokens.
-        Configuration tokenSection = configuration.getSection("tokens");
-
-        if (configuration.get("tokens") != null) {
-            for (String s : tokenSection.getKeys()) {
-                tokens.put(s, KeyCreator.createKeyFrom(tokenSection.getString(s)));
-                getLogger().info("Loaded token for website: " + s);
-            }
-        } else {
-            String token = TokenUtil.newToken();
-            configuration.set("tokens", ImmutableMap.of("default", token));
-            tokens.put("default", KeyCreator.createKeyFrom(token));
-            try {
-                ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, config);
-            } catch (IOException e) {
-                throw new RuntimeException("Error generating Votifier token", e);
-            }
-            getLogger().info("------------------------------------------------------------------------------");
-            getLogger().info("No tokens were found in your configuration, so we've generated one for you.");
-            getLogger().info("Your default Votifier token is " + token + ".");
-            getLogger().info("You will need to provide this token when you submit your server to a voting");
-            getLogger().info("list.");
-            getLogger().info("------------------------------------------------------------------------------");
-        }
-
-        // Initialize the receiver.
-        final String host = configuration.getString("host", "0.0.0.0");
-        final int port = configuration.getInt("port", 8192);
-        debug = configuration.getBoolean("debug", false);
-        if (debug)
-            getLogger().info("DEBUG mode enabled!");
-
-        final boolean disablev1 = configuration.getBoolean("disable-v1-protocol");
-        if (disablev1) {
-            getLogger().info("------------------------------------------------------------------------------");
-            getLogger().info("Votifier protocol v1 parsing has been disabled. Most voting websites do not");
-            getLogger().info("currently support the modern Votifier protocol in NuVotifier.");
-            getLogger().info("------------------------------------------------------------------------------");
-        }
-
-        // Must set up server asynchronously due to BungeeCord goofiness.
-        FutureTask<?> initTask = new FutureTask<>(Executors.callable(new Runnable() {
-            @Override
-            public void run() {
-                serverGroup = new NioEventLoopGroup(2);
-
-                new ServerBootstrap()
-                        .channel(NioServerSocketChannel.class)
-                        .group(serverGroup)
-                        .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                            @Override
-                            protected void initChannel(NioSocketChannel channel) throws Exception {
-                                channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                                channel.attr(VotifierPlugin.KEY).set(NuVotifier.this);
-                                channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                                channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !disablev1));
-                                channel.pipeline().addLast("voteHandler", new VoteInboundHandler(NuVotifier.this));
-                            }
-                        })
-                        .bind(host, port)
-                        .addListener(new ChannelFutureListener() {
-                            @Override
-                            public void operationComplete(ChannelFuture future) throws Exception {
-                                if (future.isSuccess()) {
-                                    serverChannel = future.channel();
-                                    getLogger().info("Votifier enabled.");
-                                } else {
-                                    SocketAddress socketAddress = future.channel().localAddress();
-                                    if (socketAddress == null) {
-                                        socketAddress = new InetSocketAddress(host, port);
-                                    }
-                                    getLogger().log(Level.SEVERE, "Votifier was not able to bind to " + socketAddress, future.cause());
-                                }
-                            }
-                        });
-            }
-        }));
-        getProxy().getScheduler().runAsync(this, initTask);
-        try {
-            initTask.get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException("Unable to start server", e);
-        }
-
-        Configuration fwdCfg = configuration.getSection("forwarding");
-        String fwdMethod = fwdCfg.getString("method", "none").toLowerCase();
-        if ("none".equals(fwdMethod)) {
-            getLogger().info("Method none selected for vote forwarding: Votes will not be forwarded to backend servers.");
-        } else if ("pluginmessaging".equals(fwdMethod)) {
-            String channel = fwdCfg.getString("pluginMessaging.channel", "NuVotifier");
-            String cacheMethod = fwdCfg.getString("pluginMessaging.cache", "file").toLowerCase();
-            VoteCache voteCache = null;
-            if ("none".equals(cacheMethod)) {
-                getLogger().info("Vote cache none selected for caching: votes that cannot be immediately delivered will be lost.");
-            } else if ("memory".equals(cacheMethod)) {
-                voteCache = new MemoryVoteCache(ProxyServer.getInstance().getServers().size());
-                getLogger().info("Using in-memory cache for votes that are not able to be delivered.");
-            } else if ("file".equals(cacheMethod)) {
-                try {
-                    voteCache = new FileVoteCache(ProxyServer.getInstance().getServers().size(), this, new File(getDataFolder(),
-                            fwdCfg.getString("pluginMessaging.file.name")));
-                } catch (IOException e) {
-                    getLogger().log(Level.SEVERE, "Unload to load file cache. Votes will be lost!", e);
-                }
-            }
-            if (!fwdCfg.getBoolean("pluginMessaging.onlySendToJoinedServer")) {
-
-                List<String> ignoredServers = fwdCfg.getStringList("pluginMessaging.excludedServers");
-
-                try {
-                    forwardingMethod = new PluginMessagingForwardingSource(channel, ignoredServers, this, voteCache);
-                    getLogger().info("Forwarding votes over PluginMessaging channel '" + channel + "' for vote forwarding!");
-                } catch (RuntimeException e) {
-                    getLogger().log(Level.SEVERE, "NuVotifier could not set up PluginMessaging for vote forwarding!", e);
-                }
-            } else {
-                try {
-                    String fallbackServer = fwdCfg.getString("pluginMessaging.joinedServerFallback", null);
-                    if (fallbackServer != null && fallbackServer.isEmpty()) fallbackServer = null;
-                    forwardingMethod = new OnlineForwardPluginMessagingForwardingSource(channel, this, voteCache, fallbackServer);
-                } catch (RuntimeException e) {
-                    getLogger().log(Level.SEVERE, "NuVotifier could not set up PluginMessaging for vote forwarding!", e);
-                }
-            }
-        } else if ("proxy".equals(fwdMethod)) {
-            Configuration serverSection = fwdCfg.getSection("proxy");
-            List<ProxyForwardingVoteSource.BackendServer> serverList = new ArrayList<>();
-            for (String s : serverSection.getKeys()) {
-                Configuration section = serverSection.getSection(s);
-                InetAddress address;
-                try {
-                    address = InetAddress.getByName(section.getString("address"));
-                } catch (UnknownHostException e) {
-                    getLogger().info("Address " + section.getString("address") + " couldn't be looked up. Ignoring!");
-                    continue;
-                }
-                ProxyForwardingVoteSource.BackendServer server = new ProxyForwardingVoteSource.BackendServer(s,
-                        new InetSocketAddress(address, section.getShort("port")), KeyCreator.createKeyFrom(section.getString("key")));
-                serverList.add(server);
-            }
-
-            forwardingMethod = new ProxyForwardingVoteSource(this, serverGroup, serverList, null);
-            getLogger().info("Forwarding votes from this NuVotifier instance to another NuVotifier server.");
-        } else {
-            getLogger().severe("No vote forwarding method '" + fwdMethod + "' known. Defaulting to noop implementation.");
-        }
-    }
-
-
-    @Override
-    public void onDisable() {
-        // Shut down the network handlers.
-        if (serverChannel != null)
-            serverChannel.close();
-        serverGroup.shutdownGracefully();
-
-        if (forwardingMethod != null) {
-            forwardingMethod.halt();
-        }
-
-        getLogger().info("Votifier disabled.");
-    }
-
-    @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
-        if (debug) {
-            if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record -> " + vote);
-            } else {
-                getLogger().info("Got a protocol v2 vote record -> " + vote);
-            }
-        }
-
-        getProxy().getScheduler().runAsync(this, new Runnable() {
-            @Override
-            public void run() {
-                getProxy().getPluginManager().callEvent(new VotifierEvent(vote));
-            }
-        });
-
-        if (forwardingMethod != null) {
-            getProxy().getScheduler().runAsync(this, new Runnable() {
-                @Override
-                public void run() {
-                    forwardingMethod.forward(vote);
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onError(Channel channel, Throwable throwable) {
-        if (debug) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
-        }
-    }
-
-    @Override
-    public Map<String, Key> getTokens() {
-        return tokens;
-    }
-
-    @Override
-    public KeyPair getProtocolV1Key() {
-        return keyPair;
-    }
-
-    @Override
-    public String getVersion() {
-        return getDescription().getVersion();
-    }
-
-    public boolean isDebug() {
-        return debug;
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding;
-
-import com.vexsoftware.votifier.model.Vote;
-
-/**
- * Represents a source for forwarding votes through to servers.
- */
-public interface ForwardingVoteSource {
-
-    /**
-     * Forwards a vote to all servers set up to receive votes.
-     *
-     * @param v Vote to forward to servers
-     */
-    void forward(Vote v);
-
-    /**
-     * Stop or close any oustanding network interfaces. Occurs on the onDisable method of a plugin.
-     */
-    void halt();
-
-}

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

@@ -1,47 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding;
-
-import com.vexsoftware.votifier.bungee.NuVotifier;
-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.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.PluginMessageEvent;
-import net.md_5.bungee.api.event.ServerConnectedEvent;
-import net.md_5.bungee.event.EventHandler;
-
-/**
- * @author Joseph Hirschfeld
- * @date 12/31/2015
- */
-public final class OnlineForwardPluginMessagingForwardingSource extends PluginMessagingForwardingSource {
-    public OnlineForwardPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache cache, String fallbackServer) {
-        super(channel, nuVotifier, cache);
-        this.fallbackServer = fallbackServer;
-    }
-
-    private final String fallbackServer;
-
-    @Override
-    public void forward(Vote v) {
-        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)) {
-                attemptToAddToCache(v, fallbackServer);
-            }
-        }
-    }
-
-    // The below is to allow us to share code since the event handlers from the parent class don't get
-    // picked up.
-    @EventHandler
-    public void onPluginMessage(PluginMessageEvent e) {
-        if (e.getTag().equals(channel)) e.setCancelled(true);
-    }
-
-    @EventHandler
-    public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
-        handleServerConnected(e);
-    }
-}

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

@@ -1,123 +0,0 @@
-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 PluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
-        ProxyServer.getInstance().registerChannel(channel);
-        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);
-            }
-        }
-    }
-
-    @EventHandler
-    public void onPluginMessage(PluginMessageEvent e) {
-        if (e.getTag().equals(channel)) e.setCancelled(true);
-    }
-
-    @EventHandler
-    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

@@ -1,87 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
-
-import com.google.common.io.Files;
-import com.vexsoftware.votifier.model.Vote;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.scheduler.ScheduledTask;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-
-public class FileVoteCache extends MemoryVoteCache {
-
-    private final File cacheFile;
-    private final ScheduledTask saveTask;
-
-    public FileVoteCache(int initialMemorySize, final Plugin plugin, File cacheFile) throws IOException {
-        super(initialMemorySize);
-        this.cacheFile = cacheFile;
-        load();
-
-        saveTask = ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    save();
-                } catch (IOException e) {
-                    plugin.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost if you restart.", e);
-                }
-            }
-        }, 3, 3, TimeUnit.MINUTES);
-    }
-
-    private void load() throws IOException {
-        if (cacheFile.exists()) {
-            // Load the cache from disk
-            JSONObject object = new JSONObject(Files.toString(cacheFile, StandardCharsets.UTF_8));
-
-            // Deserialize all votes contained
-            for (Object server : object.keySet()) {
-                JSONArray voteArray = object.optJSONArray(((String) server));
-                if (voteArray == null) continue;
-                Set<Vote> votes = new LinkedHashSet<>(voteArray.length());
-                for (int i = 0; i < voteArray.length(); i++) {
-                    votes.add(new Vote(voteArray.getJSONObject(i)));
-                }
-                voteCache.put(((String) server), votes);
-            }
-        } else {
-            cacheFile.createNewFile();
-        }
-    }
-
-    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());
-            }
-            votesObject.put(entry.getKey(), array);
-        }
-        cacheLock.unlock();
-
-        try (BufferedWriter writer = Files.newWriter(cacheFile, StandardCharsets.UTF_8)) {
-            votesObject.write(writer);
-        }
-    }
-
-    public void halt() throws IOException {
-        saveTask.cancel();
-        save();
-    }
-
-}

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

@@ -1,49 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
-
-import com.google.common.collect.ImmutableSet;
-import com.vexsoftware.votifier.model.Vote;
-
-import java.util.*;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Created by Joe Hirschfeld on 10/20/2015.
- */
-public class MemoryVoteCache implements VoteCache {
-
-    public MemoryVoteCache(int initialSize) {
-        voteCache = new HashMap<>(initialSize);
-    }
-
-    protected final Map<String, Collection<Vote>> voteCache;
-
-    protected final ReentrantLock cacheLock = new ReentrantLock();
-
-    @Override
-    public Collection<String> getCachedServers() {
-        cacheLock.lock();
-        Set<String> servers = ImmutableSet.copyOf(voteCache.keySet());
-        cacheLock.unlock();
-        return servers;
-    }
-
-    @Override
-    public void addToCache(Vote v, String server) {
-        cacheLock.lock();
-        Collection<Vote> voteCollection = voteCache.get(server);
-        if (voteCollection == null) {
-            voteCollection = new LinkedHashSet<>();
-            voteCache.put(server, voteCollection);
-        }
-        voteCollection.add(v);
-        cacheLock.unlock();
-    }
-
-    @Override
-    public Collection<Vote> evict(String server) {
-        cacheLock.lock();
-        Collection<Vote> fromCollection = voteCache.remove(server);
-        cacheLock.unlock();
-        return fromCollection != null ? ImmutableSet.copyOf(fromCollection) : ImmutableSet.<Vote>of();
-    }
-}

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

@@ -1,34 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.cache;
-
-import com.vexsoftware.votifier.model.Vote;
-
-import java.util.Collection;
-
-/**
- * Represents a method of caching votes for forwarding to a server that it was not previously capable of sending.
- */
-public interface VoteCache {
-
-    /**
-     * Returns the names of all server in which the cache is holding votes for
-     *
-     * @return Collection of all cached servers
-     */
-    Collection<String> getCachedServers();
-
-    /**
-     * Adds a vote to the vote cache for later sending
-     *
-     * @param v      Vote to add to cache
-     * @param server Server to add vote under
-     */
-    void addToCache(Vote v, String server);
-
-    /**
-     * Evicts all votes from the vote cache and returns a collection of vote objects
-     *
-     * @param server Server name of which to evict the votes from the cache
-     * @return A collection of all votes which were previously in the cache under the server
-     */
-    Collection<Vote> evict(String server);
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/ProxyForwardingVoteSource.java

@@ -1,140 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy;
-
-import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.ForwardingVoteSource;
-import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierProtocol2Encoder;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierProtocol2HandshakeHandler;
-import com.vexsoftware.votifier.bungee.forwarding.proxy.client.VotifierResponseHandler;
-import com.vexsoftware.votifier.model.Vote;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.DelimiterBasedFrameDecoder;
-import io.netty.handler.codec.Delimiters;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.timeout.ReadTimeoutHandler;
-
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-
-public class ProxyForwardingVoteSource implements ForwardingVoteSource {
-    private static final int MAX_RETRIES = 5;
-    private final NuVotifier plugin;
-    private final NioEventLoopGroup eventLoopGroup;
-    private final List<BackendServer> backendServers;
-    private final VoteCache voteCache;
-
-    private static final StringDecoder STRING_DECODER = new StringDecoder(StandardCharsets.US_ASCII);
-
-    public ProxyForwardingVoteSource(NuVotifier plugin, NioEventLoopGroup eventLoopGroup, List<BackendServer> backendServers, VoteCache voteCache) {
-        this.plugin = plugin;
-        this.eventLoopGroup = eventLoopGroup;
-        this.backendServers = backendServers;
-        this.voteCache = voteCache;
-    }
-
-    @Override
-    public void forward(Vote v) {
-        for (final BackendServer server : backendServers) {
-            forwardVote(server, v, 0);
-        }
-    }
-
-    private int fib(int t) {
-        if (t <= 1) return 1;
-        return fib(t - 2) + fib(t - 1);
-    }
-
-    private void forwardVote(final BackendServer server, final Vote v, final int tries) {
-        new Bootstrap()
-                .channel(NioSocketChannel.class)
-                .group(eventLoopGroup)
-                .handler(new ChannelInitializer<NioSocketChannel>() {
-                    @Override
-                    protected void initChannel(NioSocketChannel channel) throws Exception {
-                        channel.pipeline().addLast(new DelimiterBasedFrameDecoder(256, true, Delimiters.lineDelimiter()));
-                        channel.pipeline().addLast(new ReadTimeoutHandler(8, TimeUnit.SECONDS));
-                        channel.pipeline().addLast(STRING_DECODER);
-                        channel.pipeline().addLast(new VotifierProtocol2Encoder(server.key));
-                        channel.pipeline().addLast(new VotifierProtocol2HandshakeHandler(v, new VotifierResponseHandler() {
-                            @Override
-                            public void onSuccess() {
-                                if (plugin.isDebug()) {
-                                    plugin.getLogger().info("Successfully forwarded vote " + v + " to " + server.address + ".");
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable error) {
-                                handleFailure(server, v, error, tries);
-                            }
-                        }));
-                    }
-                })
-                .connect(server.address)
-                .addListener(new ChannelFutureListener() {
-                    @Override
-                    public void operationComplete(ChannelFuture future) throws Exception {
-                        if (!future.isSuccess()) {
-                            handleFailure(server, v, future.cause(), tries);
-                        }
-                    }
-                });
-    }
-
-    private void handleFailure(final BackendServer server, final Vote v, Throwable cause, final int tries) {
-        int nextDelay = fib(tries + 1);
-        boolean willRetry = tries < MAX_RETRIES;
-
-        String msg = "Unable to send vote to " + server.address + ".";
-        if (willRetry) {
-            msg += " Will retry sending in " + nextDelay + " second(s).";
-        } else {
-            if (voteCache == null) {
-                msg += " This vote will be lost!";
-            } else {
-                voteCache.addToCache(v, server.name);
-            }
-        }
-
-        if (plugin.isDebug()) {
-            plugin.getLogger().log(Level.SEVERE, msg, cause);
-        } else {
-            plugin.getLogger().log(Level.SEVERE, msg);
-        }
-
-        if (willRetry) {
-            plugin.getProxy().getScheduler().schedule(plugin, new Runnable() {
-                @Override
-                public void run() {
-                    forwardVote(server, v, tries + 1);
-                }
-            }, nextDelay, TimeUnit.SECONDS);
-        }
-    }
-
-    @Override
-    public void halt() {
-
-    }
-
-    public static class BackendServer {
-        private final String name;
-        private final InetSocketAddress address;
-        private final Key key;
-
-        public BackendServer(String name, InetSocketAddress address, Key key) {
-            this.name = name;
-            this.address = address;
-            this.key = key;
-        }
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VoteRequest.java

@@ -1,29 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
-
-import com.vexsoftware.votifier.model.Vote;
-
-public class VoteRequest {
-    private final String challenge;
-    private final Vote vote;
-
-    public VoteRequest(String challenge, Vote vote) {
-        this.challenge = challenge;
-        this.vote = vote;
-    }
-
-    public String getChallenge() {
-        return challenge;
-    }
-
-    public Vote getVote() {
-        return vote;
-    }
-
-    @Override
-    public String toString() {
-        return "VoteRequest{" +
-                "challenge='" + challenge + '\'' +
-                ", vote=" + vote +
-                '}';
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2Encoder.java

@@ -1,46 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
-import org.json.JSONObject;
-
-import javax.crypto.Mac;
-import javax.xml.bind.DatatypeConverter;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-
-public class VotifierProtocol2Encoder extends MessageToByteEncoder<VoteRequest> {
-    private static final short MAGIC = 0x733A;
-
-    private final Key key;
-
-    public VotifierProtocol2Encoder(Key key) {
-        this.key = key;
-    }
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, VoteRequest req, ByteBuf buf) throws Exception {
-        JSONObject object = new JSONObject();
-        JSONObject payloadObject = req.getVote().serialize();
-        payloadObject.put("challenge", req.getChallenge());
-        String payload = payloadObject.toString();
-        object.put("payload", payload);
-
-        // Generate the MAC
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(key);
-        mac.update(payload.getBytes(StandardCharsets.UTF_8));
-        String computed = DatatypeConverter.printBase64Binary(mac.doFinal());
-        object.put("signature", computed);
-
-        // JSON message is ready for encoding.
-        String finalMessage = object.toString();
-        buf.writeShort(MAGIC);
-        buf.writeShort(finalMessage.length());
-        ByteBuf messageBytes = Unpooled.copiedBuffer(finalMessage, StandardCharsets.UTF_8);
-        buf.writeBytes(messageBytes);
-        messageBytes.release();
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2HandshakeHandler.java

@@ -1,37 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
-
-import com.vexsoftware.votifier.model.Vote;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.CorruptedFrameException;
-
-public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandler<String> {
-    private final Vote toSend;
-    private final VotifierResponseHandler responseHandler;
-
-    public VotifierProtocol2HandshakeHandler(Vote toSend, VotifierResponseHandler responseHandler) {
-        this.toSend = toSend;
-        this.responseHandler = responseHandler;
-    }
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exception {
-        String[] handshakeContents = s.split(" ");
-        if (handshakeContents.length != 3) {
-            throw new CorruptedFrameException("Handshake is not valid.");
-        }
-
-        VoteRequest request = new VoteRequest(handshakeContents[2], toSend);
-        System.out.println(request);
-        ctx.writeAndFlush(request);
-        ctx.pipeline().addLast(new VotifierProtocol2ResponseHandler(responseHandler));
-        ctx.pipeline().remove(this);
-    }
-
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        responseHandler.onFailure(cause);
-        ctx.close();
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2ResponseHandler.java

@@ -1,31 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import org.json.JSONObject;
-
-public class VotifierProtocol2ResponseHandler extends SimpleChannelInboundHandler<String> {
-    private final VotifierResponseHandler responseHandler;
-
-    public VotifierProtocol2ResponseHandler(VotifierResponseHandler responseHandler) {
-        this.responseHandler = responseHandler;
-    }
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
-        JSONObject object = new JSONObject(msg);
-        String status = object.getString("status");
-        if (status.equals("ok")) {
-            responseHandler.onSuccess();
-        } else {
-            responseHandler.onFailure(new Exception("Remote server error: " + object.getString("cause") + ": " + object.getString("error")));
-        }
-        ctx.close();
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        responseHandler.onFailure(cause);
-        ctx.close();
-    }
-}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierResponseHandler.java

@@ -1,7 +0,0 @@
-package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
-
-public interface VotifierResponseHandler {
-    void onSuccess();
-
-    void onFailure(Throwable error);
-}

bungeecord/src/main/resources/bungee.yml

@@ -1,4 +0,0 @@
-name: NuVotifier
-main: com.vexsoftware.votifier.bungee.NuVotifier
-version: maven-version-number
-author: blakeman8192, Kramer, tuxed

bungeecord/src/main/resources/bungeeConfig.yml

@@ -1,65 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: 0.0.0.0
-
-# Port to listen for new votes on
-port: 8192
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: %default_token%
-
-# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
-# option is currently not recommended as most voting sites only support the old protocol at present.
-disable-v1-protocol: false
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging.
-  # - proxy - Proxies votes to other NuVotifier servers from this server.
-  method: none
-  pluginMessaging:
-    channel: NuVotifier
-
-    #Only send votes to certain servers. If a server is present on excludedServers, then votes will NOT be forwarded
-    #to them. If excludedServers is not present, votes will be sent to all servers.
-    #If onlySendToJoinedServer is true, this option is ignored.
-
-    #excludedServers:
-    #- server1
-    #- server2
-
-
-    # Sets which cache to use if there are no players on the server that the vote is being sent to. Supported caches:
-    # - none - Votes will simply be lost when no players are present on the server.
-    # - memory - Votes will be cached in memory when no players are present. When Bungee is restarted, the votes will be lost.
-    #   This method is NOT recommended for production systems!
-    # - file - Votes will be saved to a local file every 3 minutes and on shutdown and reloaded when Bungee is restarted. This is suitable for
-    #   most set ups.
-    cache: file
-    # Only sends the vote to the server in which the player is currently joined.
-    onlySendToJoinedServer: false
-    #Sets which server to send the vote in the event the player is not online when the vote is cast
-    #If you do not want the vote forwarded to a fallback, set this value to empty ('')
-    #ONLY USED IF onlySendToJoinedServer is true!!
-    joinedServerFallback: 'Hub'
-    # Options for file caching.
-    file:
-      name: cached-votes.json
-  # Specify servers to proxy votes for.
-  proxy:
-    Hub:
-      address: 127.0.0.1
-      port: 8193
-      key: MyKeyHere
-    Hub2:
-      address: 127.0.0.1
-      port: 8194
-      key: AnotherKeyHere

common/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-common</artifactId>
-
-    <dependencies>
-        <!-- Netty Dependency -->
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.0.31.Final</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- JSON Dependency -->
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20140107</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- JUnit, for tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

common/src/main/java/com/vexsoftware/votifier/VoteHandler.java

@@ -1,11 +0,0 @@
-package com.vexsoftware.votifier;
-
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import io.netty.channel.Channel;
-
-public interface VoteHandler {
-    void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception;
-
-    void onError(Channel channel, Throwable throwable);
-}

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

@@ -1,17 +0,0 @@
-package com.vexsoftware.votifier;
-
-import io.netty.util.AttributeKey;
-
-import java.security.Key;
-import java.security.KeyPair;
-import java.util.Map;
-
-public interface VotifierPlugin {
-    AttributeKey<VotifierPlugin> KEY = AttributeKey.valueOf("votifier_plugin");
-
-    Map<String, Key> getTokens();
-
-    KeyPair getProtocolV1Key();
-
-    String getVersion();
-}

common/src/main/java/com/vexsoftware/votifier/model/Vote.java

@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2011 Vex Software LLC
- * This file is part of Votifier.
- *
- * Votifier is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Votifier is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.vexsoftware.votifier.model;
-
-import org.json.JSONObject;
-
-/**
- * A model for a vote.
- *
- * @author Blake Beaupain
- */
-public class Vote {
-
-    /**
-     * The name of the vote service.
-     */
-    private String serviceName;
-
-    /**
-     * The username of the voter.
-     */
-    private String username;
-
-    /**
-     * The address of the voter.
-     */
-    private String address;
-
-    /**
-     * The date and time of the vote.
-     */
-    private String timeStamp;
-
-    @Deprecated
-    public Vote() {
-    }
-
-    public Vote(String serviceName, String username, String address, String timeStamp) {
-        if (username.length() > 16) {
-            throw new IllegalArgumentException("Username is too long.");
-        }
-        this.serviceName = serviceName;
-        this.username = username;
-        this.address = address;
-        this.timeStamp = timeStamp;
-    }
-
-    private static String getTimestamp(JSONObject object) {
-        try {
-            return Long.toString(object.getLong("timestamp"));
-        } catch (Exception e) {
-            return object.getString("timestamp");
-        }
-    }
-
-    public Vote(JSONObject jsonObject) {
-        this(jsonObject.getString("serviceName"), jsonObject.getString("username"), jsonObject.getString("address"), getTimestamp(jsonObject));
-    }
-
-    @Override
-    public String toString() {
-        return "Vote (from:" + serviceName + " username:" + username
-                + " address:" + address + " timeStamp:" + timeStamp + ")";
-    }
-
-    /**
-     * Sets the serviceName.
-     *
-     * @param serviceName The new serviceName
-     */
-    @Deprecated
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    /**
-     * Gets the serviceName.
-     *
-     * @return The serviceName
-     */
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    /**
-     * Sets the username.
-     *
-     * @param username The new username
-     */
-    @Deprecated
-    public void setUsername(String username) {
-        if (username.length() > 16) {
-            throw new IllegalArgumentException("Username is too long.");
-        }
-        this.username = username;
-    }
-
-    /**
-     * Gets the username.
-     *
-     * @return The username
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Sets the address.
-     *
-     * @param address The new address
-     */
-    @Deprecated
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    /**
-     * Gets the address.
-     *
-     * @return The address
-     */
-    public String getAddress() {
-        return address;
-    }
-
-    /**
-     * Sets the time stamp.
-     *
-     * @param timeStamp The new time stamp
-     */
-    @Deprecated
-    public void setTimeStamp(String timeStamp) {
-        this.timeStamp = timeStamp;
-    }
-
-    /**
-     * Gets the time stamp.
-     *
-     * @return The time stamp
-     */
-    public String getTimeStamp() {
-        return timeStamp;
-    }
-
-    public JSONObject serialize() {
-        JSONObject ret = new JSONObject();
-        ret.put("serviceName", serviceName);
-        ret.put("username", username);
-        ret.put("address", address);
-        ret.put("timestamp", timeStamp);
-        return ret;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Vote vote = (Vote) o;
-
-        if (!serviceName.equals(vote.serviceName)) return false;
-        if (!username.equals(vote.username)) return false;
-        if (!address.equals(vote.address)) return false;
-        return timeStamp.equals(vote.timeStamp);
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = serviceName.hashCode();
-        result = 31 * result + username.hashCode();
-        result = 31 * result + address.hashCode();
-        result = 31 * result + timeStamp.hashCode();
-        return result;
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.VoteHandler;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import org.json.JSONObject;
-
-public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
-    private final VoteHandler handler;
-
-    public VoteInboundHandler(VoteHandler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, final Vote vote) throws Exception {
-        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
-
-        handler.onVoteReceived(vote, session.getVersion());
-
-        if (session.getVersion() == VotifierSession.ProtocolVersion.ONE) {
-            ctx.close();
-        } else {
-            JSONObject object = new JSONObject();
-            object.put("status", "ok");
-            ctx.writeAndFlush(object.toString() + "\r\n").addListener(ChannelFutureListener.CLOSE);
-        }
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
-
-        handler.onError(ctx.channel(), cause);
-
-        if (session.getVersion() == VotifierSession.ProtocolVersion.TWO) {
-            JSONObject object = new JSONObject();
-            object.put("status", "error");
-            object.put("cause", cause.getClass().getSimpleName());
-            object.put("error", cause.getMessage());
-            ctx.writeAndFlush(object.toString() + "\r\n").addListener(ChannelFutureListener.CLOSE);
-        } else {
-            ctx.close();
-        }
-    }
-}

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

@@ -1,90 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import org.json.JSONObject;
-
-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.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * Decodes protocol 2 JSON votes.
- */
-public class VotifierProtocol2Decoder extends MessageToMessageDecoder<String> {
-    private static final SecureRandom RANDOM = new SecureRandom();
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, String s, List<Object> list) throws Exception {
-        JSONObject voteMessage = new JSONObject(s);
-        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
-
-        // Deserialize the payload.
-        JSONObject votePayload = new JSONObject(voteMessage.getString("payload"));
-
-        // Verify challenge.
-        if (!votePayload.getString("challenge").equals(session.getChallenge())) {
-            throw new CorruptedFrameException("Challenge is not valid");
-        }
-
-        // Verify that we have keys available.
-        VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
-        Key key = plugin.getTokens().get(votePayload.getString("serviceName"));
-
-        if (key == null) {
-            key = plugin.getTokens().get("default");
-            if (key == null) {
-                throw new RuntimeException("Unknown service '" + votePayload.getString("serviceName") + "'");
-            }
-        }
-
-        // Verify signature.
-        String sigHash = voteMessage.getString("signature");
-        byte[] sigBytes = DatatypeConverter.parseBase64Binary(sigHash);
-
-        if (!hmacEqual(sigBytes, voteMessage.getString("payload").getBytes(StandardCharsets.UTF_8), key)) {
-            throw new CorruptedFrameException("Signature is not valid (invalid token?)");
-        }
-
-        // Stopgap: verify the "uuid" field is valid, if provided.
-        if (votePayload.has("uuid")) {
-            UUID.fromString(votePayload.getString("uuid"));
-        }
-
-        // Create the vote.
-        Vote vote = new Vote(votePayload);
-        list.add(vote);
-
-        ctx.pipeline().remove(this);
-    }
-
-    private boolean hmacEqual(byte[] sig, byte[] message, Key key) throws NoSuchAlgorithmException, InvalidKeyException {
-        // See https://www.nccgroup.trust/us/about-us/newsroom-and-events/blog/2011/february/double-hmac-verification/
-        // This randomizes the byte order to make timing attacks more difficult.
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(key);
-        byte[] messageCalc = mac.doFinal(message);
-
-        Mac mac2 = Mac.getInstance("HmacSHA256");
-        byte[] randomKey = new byte[32];
-        RANDOM.nextBytes(randomKey);
-        mac2.init(new SecretKeySpec(randomKey, "HmacSHA256"));
-        byte[] clientSig = mac2.doFinal(sig);
-        mac2.reset();
-        byte[] realSig = mac2.doFinal(messageCalc);
-
-        return Arrays.equals(clientSig, realSig);
-    }
-}

common/src/main/java/com/vexsoftware/votifier/util/KeyCreator.java

@@ -1,11 +0,0 @@
-package com.vexsoftware.votifier.util;
-
-import javax.crypto.spec.SecretKeySpec;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-
-public class KeyCreator {
-    public static Key createKeyFrom(String token) {
-        return new SecretKeySpec(token.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
-    }
-}

common/src/test/java/com/vexsoftware/votifier/net/protocol/TestVotifierPlugin.java

@@ -1,87 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.util.KeyCreator;
-
-import javax.xml.bind.DatatypeConverter;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.*;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.HashMap;
-import java.util.Map;
-
-public class TestVotifierPlugin implements VotifierPlugin {
-    private static final byte[] PUBLIC_KEY;
-    private static final byte[] PRIVATE_KEY;
-
-    static byte[] r(String u) throws Exception {
-        URL resourceUrl = TestVotifierPlugin.class.getResource(u);
-        Path resourcePath = Paths.get(resourceUrl.toURI());
-
-        return DatatypeConverter.parseBase64Binary(new String(Files.readAllBytes(resourcePath), StandardCharsets.UTF_8));
-    }
-
-    static {
-        try {
-            PUBLIC_KEY = r("/public.key");
-            PRIVATE_KEY = r("/private.key");
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public static final TestVotifierPlugin I = new TestVotifierPlugin();
-
-    public static TestVotifierPlugin getI() {
-        return I;
-    }
-
-    private final Map<String, Key> keyMap = new HashMap<>();
-    private final KeyPair keyPair;
-
-    public TestVotifierPlugin() {
-        try {
-            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-            X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(
-                    PUBLIC_KEY);
-            PublicKey publicKey = keyFactory.generatePublic(publicKeySpec);
-            PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(
-                    PRIVATE_KEY);
-            PrivateKey privateKey = keyFactory.generatePrivate(privateKeySpec);
-            keyPair = new KeyPair(publicKey, privateKey);
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }
-        keyMap.put("default", KeyCreator.createKeyFrom("test"));
-    }
-
-    @Override
-    public Map<String, Key> getTokens() {
-        return keyMap;
-    }
-
-    @Override
-    public KeyPair getProtocolV1Key() {
-        return keyPair;
-    }
-
-    @Override
-    public String getVersion() {
-        return "2.3";
-    }
-
-    public void specificKeysOnly() {
-        keyMap.clear();
-        keyMap.put("Test", KeyCreator.createKeyFrom("test"));
-    }
-
-    public void restoreDefault() {
-        keyMap.clear();
-        keyMap.put("default", KeyCreator.createKeyFrom("test"));
-    }
-}

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol1DecoderTest.java

@@ -1,94 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSA;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.codec.CorruptedFrameException;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.spec.X509EncodedKeySpec;
-
-import static org.junit.Assert.*;
-
-public class VotifierProtocol1DecoderTest {
-    private static final VotifierSession SESSION = new VotifierSession();
-
-    private EmbeddedChannel createChannel() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocol1Decoder());
-        channel.attr(VotifierSession.KEY).set(SESSION);
-        channel.attr(VotifierPlugin.KEY).set(TestVotifierPlugin.getI());
-        return channel;
-    }
-
-    @Test
-    public void testSuccessfulDecode() throws Exception {
-        // Encode a test vote.
-        String voteString = "VOTE\nTest\ntest\ntest\ntest\n";
-
-        // For reference, this is the same vote as a POJO:
-        Vote votePojo = new Vote("Test", "test", "test", "test");
-
-        // Send the vote
-        EmbeddedChannel channel = createChannel();
-
-        byte[] encrypted = RSA.encrypt(voteString.getBytes(StandardCharsets.UTF_8), TestVotifierPlugin.getI().getProtocolV1Key().getPublic());
-        ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
-
-        assertTrue(channel.writeInbound(encryptedByteBuf));
-        Object presumedVote = channel.readInbound();
-        assertEquals(votePojo, presumedVote);
-        assertFalse(channel.finish());
-    }
-
-    private void verifyFailure(String bad) throws Exception {
-        // Send the bad vote
-        EmbeddedChannel channel = createChannel();
-
-        byte[] encrypted = RSA.encrypt(bad.getBytes(StandardCharsets.UTF_8), TestVotifierPlugin.getI().getProtocolV1Key().getPublic());
-        ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
-
-        try {
-            channel.writeInbound(encryptedByteBuf);
-        } finally {
-            channel.close();
-        }
-    }
-
-    @Test(expected = CorruptedFrameException.class)
-    public void testFailureDecodeMissingField() throws Exception {
-        verifyFailure("VOTE\nTest\ntest\ntest"); // missing field
-    }
-
-    @Test(expected = CorruptedFrameException.class)
-    public void testFailureDecodeBadOpcode() throws Exception {
-        verifyFailure("TEST\nTest\ntest\ntest\ntest\n");
-    }
-
-    @Test(expected = CorruptedFrameException.class)
-    public void testFailureDecodeBadRsa() throws Exception {
-        // Decode our bad RSA key
-        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-        X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(TestVotifierPlugin.r("/bad_public.key"));
-        PublicKey badPublicKey = keyFactory.generatePublic(publicKeySpec);
-
-        // Send the bad vote
-        EmbeddedChannel channel = createChannel();
-
-        String voteString = "VOTE\nTest\ntest\ntest\ntest\n";
-        byte[] encrypted = RSA.encrypt(voteString.getBytes(StandardCharsets.UTF_8), badPublicKey);
-        ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
-
-        try {
-            channel.writeInbound(encryptedByteBuf);
-        } finally {
-            channel.close();
-        }
-    }
-}

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2DecoderTest.java

@@ -1,143 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.util.KeyCreator;
-import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.codec.CorruptedFrameException;
-import io.netty.handler.codec.DecoderException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import javax.crypto.Mac;
-import javax.xml.bind.DatatypeConverter;
-import java.nio.charset.StandardCharsets;
-import java.security.Key;
-
-import static org.junit.Assert.*;
-
-public class VotifierProtocol2DecoderTest {
-    private static final VotifierSession SESSION = new VotifierSession();
-
-    private EmbeddedChannel createChannel() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocol2Decoder());
-        channel.attr(VotifierSession.KEY).set(SESSION);
-        channel.attr(VotifierPlugin.KEY).set(TestVotifierPlugin.getI());
-        return channel;
-    }
-
-    private void sendVote(Vote vote, Key key, boolean expectSuccess) throws Exception {
-        // Create a well-formed request
-        EmbeddedChannel channel = createChannel();
-
-        JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        payload.put("challenge", SESSION.getChallenge());
-        object.put("payload", payload.toString());
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(key);
-        object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
-
-        if (expectSuccess) {
-            assertTrue(channel.writeInbound(object.toString()));
-            assertEquals(vote, channel.readInbound());
-            assertFalse(channel.finish());
-        } else {
-            try {
-                channel.writeInbound(object.toString());
-            } finally {
-                channel.close();
-            }
-        }
-    }
-
-    @Test
-    public void testSuccessfulDecode() throws Exception {
-        sendVote(new Vote("Test", "test", "test", "0"), TestVotifierPlugin.getI().getTokens().get("default"), true);
-    }
-
-    @Test(expected = DecoderException.class)
-    public void testFailureDecodeBadPacket() throws Exception {
-        // Create a well-formed request
-        EmbeddedChannel channel = createChannel();
-
-        Vote vote = new Vote("Test", "test", "test", "0");
-        JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        payload.put("challenge", SESSION.getChallenge());
-        object.put("payload", payload.toString());
-        // We "forget" the signature.
-
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
-    }
-
-    @Test(expected = DecoderException.class)
-    public void testFailureDecodeBadVoteField() throws Exception {
-        // Create a well-formed request
-        EmbeddedChannel channel = createChannel();
-
-        Vote vote = new Vote("Test", "test", "test", "0");
-        JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        // We "forget" the challenge.
-        object.put("payload", payload.toString());
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(TestVotifierPlugin.getI().getTokens().get("default"));
-        object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
-
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
-    }
-
-    @Test(expected = DecoderException.class)
-    public void testFailureDecodeBadChallenge() throws Exception {
-        // Create a well-formed request
-        EmbeddedChannel channel = createChannel();
-
-        Vote vote = new Vote("Test", "test", "test", "0");
-        JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        // We provide the wrong challenge.
-        payload.put("challenge", "not a challenge for me");
-        object.put("payload", payload.toString());
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(TestVotifierPlugin.getI().getTokens().get("default"));
-        object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
-
-        try {
-            channel.writeInbound(object.toString());
-        } finally {
-            channel.close();
-        }
-    }
-
-    @Test(expected = DecoderException.class)
-    public void testFailureDecodeNonExistentKey() throws Exception {
-        TestVotifierPlugin.getI().specificKeysOnly();
-
-        Vote vote = new Vote("Bad Service", "test", "test", "0");
-
-        try {
-            sendVote(vote, TestVotifierPlugin.getI().getTokens().get("Test"), false);
-        } finally {
-            TestVotifierPlugin.getI().restoreDefault();
-        }
-    }
-
-    @Test(expected = CorruptedFrameException.class)
-    public void testFailureDecodeBadSignature() throws Exception {
-        Vote vote = new Vote("Bad Service", "test", "test", "0");
-        sendVote(vote, KeyCreator.createKeyFrom("BadKey"), false);
-    }
-}

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocolDifferentiatorTest.java

@@ -1,96 +0,0 @@
-package com.vexsoftware.votifier.net.protocol;
-
-import com.vexsoftware.votifier.net.VotifierSession;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.codec.DecoderException;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class VotifierProtocolDifferentiatorTest {
-    @Test
-    public void v1Test() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, true));
-
-        VotifierSession session = new VotifierSession();
-        channel.attr(VotifierSession.KEY).set(session);
-
-        ByteBuf test = Unpooled.buffer(256);
-        for (int i = 0; i < 256; i++) {
-            test.writeByte(0);
-        }
-        channel.writeInbound(test);
-
-        assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
-        test.release();
-        channel.close();
-    }
-
-    @Test
-    public void v2Test() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
-
-        VotifierSession session = new VotifierSession();
-        channel.attr(VotifierSession.KEY).set(session);
-
-        ByteBuf test = Unpooled.buffer();
-        test.writeShort(0x733A);
-        channel.writeInbound(test);
-
-        assertEquals(VotifierSession.ProtocolVersion.TWO, session.getVersion());
-        test.release();
-        channel.close();
-    }
-
-    @Test(expected = DecoderException.class)
-    public void failIfv1NotSupported() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
-
-        VotifierSession session = new VotifierSession();
-        channel.attr(VotifierSession.KEY).set(session);
-
-        ByteBuf test = Unpooled.buffer(256);
-        for (int i = 0; i < 256; i++) {
-            test.writeByte(0);
-        }
-        channel.writeInbound(test);
-
-        assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
-        test.release();
-        channel.close();
-    }
-
-    @Test(expected = DecoderException.class)
-    public void failOnSmallBufferTest() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
-
-        ByteBuf buf = Unpooled.buffer(1);
-        buf.writeByte(0);
-
-        try {
-            channel.writeInbound(buf);
-        } finally {
-            buf.release();
-            channel.close();
-        }
-    }
-
-    @Test(expected = DecoderException.class)
-    public void failOnBadPacketTest() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
-
-        ByteBuf buf = Unpooled.buffer();
-        for (int i = 0; i < 3; i++) {
-            buf.writeByte(0);
-        }
-
-        try {
-            channel.writeInbound(buf);
-        } finally {
-            buf.release();
-            channel.close();
-        }
-    }
-}

common/src/test/resources/bad_public.key

@@ -1 +0,0 @@
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrOsFuGPoHDZEFRHXriZRqrUXXjUOhVabC0Xu+WPtVbQrvNngN0igo0ZJIZELflhsFNBUJAnREo+wColfDg1rk2juEUYDt+gRzrN3WiqgzZolF3E4Dg4LrXh6cPuu4AeOZW9CtjXt2JwPBhlWLZb2RFhA6FziFLeMBa42/5VLFCQAmiuuU3OCiBskR3Jz/E5zqc7V/j247OMm+WRJ/k8OFTEFB+zFINOZY1ud3ltwkzQIPi1luGNW8Yt8+CEg/6hDiVlpFwgsazt4uKI/UfU5oP0kAKjQUfFGvNaBtJ0RlsBeJ7VDpOfIG6dDb8pe4IaA9aJLVcXWEn30pHsyYl2NwIDAQAB

common/src/test/resources/private.key

@@ -1 +0,0 @@
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCd5osoNvoLM52pN8U15QkRXpGVxk0WaoNLWgN24pnW30FIAO3bp8qD2FXJzX2hvw43LIwudVEbwmdzeytVWDNuigLqEsJJsXCHh9ORKjGVHvS240r6idfxJ139Jz2d3oSZG8acHdHgs/H/M98O8lz9Zb2KHtm+rxpiwsV2SdhMtfMDJmRx4p0JklgJ8TV1ZApoypbGtRKXHOirVSs6zfgaYaeglUNITAgsZZNZk+j9Pp572FxyYryxkUaWVn09RAD07XvWKJc3f7NBElA2LpuZXTYJh3BXaI/N05tdgPej5o99PXaA2UMhdqo778zoQoeWzOvbNMUqZROqGW5WDwhdAgMBAAECggEAM8xcXB3k2uXc05UrCaoP1nXadnKt+SuJ1J87wbVGWDm21aMQZF1fzu6Z/fB+RSBCzpC7j8YGjH+ypiyCo6WigaGeoSD0QW6HBr7lBZr81vlnt9NKVnP/tel/KLvFt9M2Vm/JMI+LuRXuzhQ7GVEidjH5AqVqMuaIVlukoVBKN6d20KihcHeCjOZLAoL727QYGrHNr0eH9wQpgMzj3A51ubi5ma3bDvnSvN4ZoP3BhmDTRVnHEh4hx/XFYELi3RDGN2SDjegNXlZ+e03BHCGRryOCuwY1eua78gkrWN8sr3QAdWhEN/Pdwq0BpVsdsbyPzmgoamAMmBbKyBnEJxuvlQKBgQDtLQIhFVYA7vNtpwnXV3ahyEPCNf+tLJYsLYjKWRpoTw6bI3FfgMAEPGbDXLsmLi37mvRmCJpoU9j4nfRd/umoEIW6xuaYDdGRpyaiOlkEXyJd0n3uv/3mF7VtyltrPK3Mt2Gb7kGaZqe07B4a5UC02CCvpKqpbFfC0XxHP32GkwKBgQCqbs2D/pNcdA9iHm+AhX/oylK+BfiruTvLx/c2wOFleQOiNZUZCC6zELIDzuQXPlk9mlNshnciIItcjnyLGkDr2lvJpt6Bi65Jx5hYhlWrms883/hRUSjgKtJ9PFWl8wUVTJJsrOg0fm2ZM+YXpO9AvziRTEPj2MeibQjjlfsbTwKBgHc1ZBiUzMFzWM8IYh3mTC5MpiH7WiMEggZ6bIKn/mnnMoQvcFB8OgbnBQ+0kCxEkcAgxi5yrIk7e5aabbTA51gd1dlnF4fdijQXO4fWo99aob9eiQVzYn4/9GTWjNR9jy2SDnF9c2PTrP92njsOd1NuPh+KOG0nk4TMHhcBhmoZAoGAF4ZPy8ZZ5MsITIzS6zSCIUm7/gqo9lsNC+XAE8iv0+fOPpeSyu+8Mm89gxUNmr+6Zaxlk3dD/mvrkI0CV9j52RQ80yq7T7pOBlUMjDuOm680p7xqdB71u2ttvmeTkuJmczgshd+f9Y715c2qFt1nQNKkJjoWrN6BP8Q5E+Dh1jUCgYEApBuFGwmcSob6rIzinM4nJRyMLXqIy6nKCy8bBLkWCFPGztjIxhKBA/pErADhkLaLyM5reeMPNBbxruAFJ3mzfOneKf9lt0oHq2/jq0vJvYUj9tZjD2Sw6dhj0JqQhKIkhux1rU1xAAedY21JGTS+Be0dFfSv5uDrErPJiN+Qyt0=

common/src/test/resources/public.key

@@ -1 +0,0 @@
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAneaLKDb6CzOdqTfFNeUJEV6RlcZNFmqDS1oDduKZ1t9BSADt26fKg9hVyc19ob8ONyyMLnVRG8Jnc3srVVgzbooC6hLCSbFwh4fTkSoxlR70tuNK+onX8Sdd/Sc9nd6EmRvGnB3R4LPx/zPfDvJc/WW9ih7Zvq8aYsLFdknYTLXzAyZkceKdCZJYCfE1dWQKaMqWxrUSlxzoq1UrOs34GmGnoJVDSEwILGWTWZPo/T6ee9hccmK8sZFGllZ9PUQA9O171iiXN3+zQRJQNi6bmV02CYdwV2iPzdObXYD3o+aPfT12gNlDIXaqO+/M6EKHlszr2zTFKmUTqhluVg8IXQIDAQAB

engine/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+group 'io.ibj.nuvotifier'
+version '3.0.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu May 31 03:56:27 EDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

legacyserver/build.gradle

@@ -0,0 +1,10 @@
+dependencies {
+    api project(":model")
+
+    api project(":platform")
+
+    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.google.guava:guava:24.1-jre'
+
+    implementation group: "io.netty", name: "netty-handler", version: "4.1.32.Final"
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/GsonInst.java

@@ -0,0 +1,8 @@
+package io.ibj.nuvotifier.legacyserver;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class GsonInst {
+    public static final Gson gson = new GsonBuilder().create();
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/TokenUtil.java

@@ -1,4 +1,4 @@
-package com.vexsoftware.votifier.util;
+package io.ibj.nuvotifier.legacyserver;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/VotifierServer.java

@@ -0,0 +1,99 @@
+package io.ibj.nuvotifier.legacyserver;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.ibj.nuvotifier.legacyserver.protocol.VoteInboundHandler;
+import io.ibj.nuvotifier.legacyserver.protocol.VotifierGreetingHandler;
+import io.ibj.nuvotifier.legacyserver.protocol.VotifierProtocolDifferentiator;
+import io.ibj.nuvotifier.platform.LoggingAdapter;
+import io.ibj.nuvotifier.platform.V1KeyProvider;
+import io.ibj.nuvotifier.platform.V2TokenProvider;
+import io.ibj.nuvotifier.platform.VoteHandler;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOutboundInvoker;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.ImmediateEventExecutor;
+import io.netty.util.concurrent.PromiseCombiner;
+
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class VotifierServer implements AutoCloseable {
+    private NioEventLoopGroup bossLoopGroup;
+    private NioEventLoopGroup eventLoopGroup;
+
+    private Set<Channel> serverChannels;
+
+    private final List<InetSocketAddress> bindAddresses;
+    private final V1KeyProvider v1KeyProvider;
+    private final V2TokenProvider v2TokenProvider;
+    private final LoggingAdapter loggingAdapter;
+    private final boolean testMode;
+    private final VoteHandler voteHandler;
+
+    VotifierServer(VotifierServerBuilder builder) {
+        this.bindAddresses = builder.bindAddresses;
+        this.v1KeyProvider = builder.v1KeyProvider;
+        this.v2TokenProvider = builder.v2TokenProvider;
+        this.loggingAdapter = builder.loggingAdapter;
+        this.testMode = builder.testMode;
+        this.voteHandler = builder.voteHandler;
+    }
+
+    public void start(Consumer<Throwable> error) {
+        this.bossLoopGroup = new NioEventLoopGroup(1, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Votifier NIO boss").build());
+        this.eventLoopGroup = new NioEventLoopGroup(1, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Votifier NIO worker").build());
+
+        Objects.requireNonNull(error, "error");
+        ServerBootstrap bootstrap = new ServerBootstrap()
+                .channel(NioServerSocketChannel.class)
+                .group(bossLoopGroup, eventLoopGroup)
+                .childHandler(new ChannelInitializer<NioSocketChannel>() {
+                    @Override
+                    protected void initChannel(NioSocketChannel channel) {
+                        channel.attr(VotifierSession.KEY).set(new VotifierSession());
+                        channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
+                        channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(v1KeyProvider, v2TokenProvider, testMode));
+                        channel.pipeline().addLast("voteHandler", new VoteInboundHandler(voteHandler));
+                    }
+                });
+
+        ChannelFutureListener listener = future -> {
+            Channel serverChannel = future.channel();
+            if (future.isSuccess()) {
+                serverChannels.add(serverChannel);
+                loggingAdapter.info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
+                error.accept(null);
+            } else {
+                loggingAdapter.error("Votifier was not able to bind to " + serverChannel.localAddress().toString(), future.cause());
+                error.accept(future.cause());
+            }
+        };
+
+        for (InetSocketAddress socketAddress : this.bindAddresses) {
+            bootstrap.bind(socketAddress).addListener(listener);
+        }
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (!serverChannels.isEmpty()) {
+            PromiseCombiner closePromises = new PromiseCombiner();
+            serverChannels.stream().map(ChannelOutboundInvoker::close).forEach(closePromises::add);
+            DefaultPromise<Void> closesDone = new DefaultPromise<>(ImmediateEventExecutor.INSTANCE);
+            closePromises.finish(closesDone);
+            closesDone.awaitUninterruptibly();
+        }
+
+        eventLoopGroup.shutdownGracefully();
+        bossLoopGroup.shutdownGracefully();
+    }
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/VotifierServerBuilder.java

@@ -0,0 +1,65 @@
+package io.ibj.nuvotifier.legacyserver;
+
+import io.ibj.nuvotifier.platform.LoggingAdapter;
+import io.ibj.nuvotifier.platform.V1KeyProvider;
+import io.ibj.nuvotifier.platform.V2TokenProvider;
+import io.ibj.nuvotifier.platform.VoteHandler;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VotifierServerBuilder {
+    // Which addresses to bind to? We support multiple now!
+    List<InetSocketAddress> bindAddresses = new ArrayList<>();
+
+    // Provides the server the ability to decode v1 keys. Defaults to
+    V1KeyProvider v1KeyProvider = null;
+
+    // Provides the server the ability to validate v2 token payloads
+    V2TokenProvider v2TokenProvider = null;
+
+    // Logging adapter which will be used to communicate various logs
+    LoggingAdapter loggingAdapter = null;
+
+    // Whether not the server is in 'test mode'. Spoiler: unless you are testing, its not.
+    boolean testMode = false;
+
+    // Handler to invoke when a vote is sent.
+    VoteHandler voteHandler = null;
+
+    public VotifierServerBuilder addBindAddress(InetSocketAddress bindAddress) {
+        this.bindAddresses.add(bindAddress);
+        return this;
+    }
+
+    public VotifierServerBuilder setV1KeyProvider(V1KeyProvider v1KeyProvider) {
+        this.v1KeyProvider = v1KeyProvider;
+        return this;
+    }
+
+    public VotifierServerBuilder setV2TokenProvider(V2TokenProvider v2TokenProvider) {
+        this.v2TokenProvider = v2TokenProvider;
+        return this;
+    }
+
+    public VotifierServerBuilder setLoggingAdapter(LoggingAdapter loggingAdapter) {
+        this.loggingAdapter = loggingAdapter;
+        return this;
+    }
+
+    public VotifierServerBuilder setTestMode(boolean testMode) {
+        this.testMode = testMode;
+        return this;
+    }
+
+    public VotifierServerBuilder setVoteHandler(VoteHandler voteHandler) {
+        this.voteHandler = voteHandler;
+        return this;
+    }
+
+
+    public VotifierServer build() {
+        return new VotifierServer(this);
+    }
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/VotifierSession.java

@@ -1,12 +1,12 @@
-package com.vexsoftware.votifier.net;
+package io.ibj.nuvotifier.legacyserver;
 
-import com.vexsoftware.votifier.util.TokenUtil;
 import io.netty.util.AttributeKey;
 
 public class VotifierSession {
     public static final AttributeKey<VotifierSession> KEY = AttributeKey.valueOf("votifier_session");
     private ProtocolVersion version = ProtocolVersion.UNKNOWN;
     private final String challenge;
+    private boolean hasCompletedVote = false;
 
     public VotifierSession() {
         challenge = TokenUtil.newToken();
@@ -27,9 +27,26 @@ public class VotifierSession {
         return challenge;
     }
 
+    public void completeVote() {
+        if (hasCompletedVote)
+            throw new IllegalStateException("Protocol completed vote twice!");
+
+        hasCompletedVote = true;
+    }
+
+    public boolean hasCompletedVote() {
+        return hasCompletedVote;
+    }
+
     public enum ProtocolVersion {
-        UNKNOWN,
-        ONE,
-        TWO
+        UNKNOWN("unknown"),
+        ONE("protocol v1"),
+        TWO("protocol v2"),
+        TEST("test");
+
+        public final String humanReadable;
+        ProtocolVersion(String hr) {
+            this.humanReadable = hr;
+        }
     }
 }

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/VoteInboundHandler.java

@@ -0,0 +1,51 @@
+package io.ibj.nuvotifier.legacyserver.protocol;
+
+import com.google.gson.JsonObject;
+import io.ibj.nuvotifier.legacyserver.GsonInst;
+import io.ibj.nuvotifier.legacyserver.VotifierSession;
+import io.ibj.nuvotifier.model.NuVote;
+import io.ibj.nuvotifier.platform.VoteHandler;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+public class VoteInboundHandler extends SimpleChannelInboundHandler<NuVote> {
+    private final VoteHandler handler;
+
+    public VoteInboundHandler(VoteHandler handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, final NuVote vote) throws Exception {
+        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
+
+        handler.onVote(vote);
+        session.completeVote();
+
+        if (session.getVersion() == VotifierSession.ProtocolVersion.ONE) {
+            ctx.close();
+        } else {
+            JsonObject object = new JsonObject();
+            object.addProperty("status", "ok");
+            ctx.writeAndFlush(GsonInst.gson.toJson(object) + "\r\n").addListener(ChannelFutureListener.CLOSE);
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
+
+        handler.onError(cause, session.hasCompletedVote(), ctx.channel().remoteAddress().toString());
+
+        if (session.getVersion() == VotifierSession.ProtocolVersion.TWO) {
+            JsonObject object = new JsonObject();
+            object.addProperty("status", "error");
+            object.addProperty("cause", cause.getClass().getSimpleName());
+            object.addProperty("error", cause.getMessage());
+            ctx.writeAndFlush(GsonInst.gson.toJson(object) + "\r\n").addListener(ChannelFutureListener.CLOSE);
+        } else {
+            ctx.close();
+        }
+    }
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/VotifierGreetingHandler.java

@@ -1,7 +1,6 @@
-package com.vexsoftware.votifier.net.protocol;
+package io.ibj.nuvotifier.legacyserver.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.net.VotifierSession;
+import io.ibj.nuvotifier.legacyserver.VotifierSession;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
@@ -14,11 +13,9 @@ import java.nio.charset.StandardCharsets;
  */
 public class VotifierGreetingHandler extends ChannelInboundHandlerAdapter {
     @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+    public void channelActive(ChannelHandlerContext ctx) {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
-        VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
-
-        String version = "VOTIFIER " + plugin.getVersion() + " " + session.getChallenge() + "\n";
+        String version = "VOTIFIER 2 " + session.getChallenge() + "\n";
         ByteBuf versionBuf = Unpooled.copiedBuffer(version, StandardCharsets.UTF_8);
         ctx.writeAndFlush(versionBuf);
     }

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/VotifierProtocol1Decoder.java

@@ -1,8 +1,8 @@
-package com.vexsoftware.votifier.net.protocol;
+package io.ibj.nuvotifier.legacyserver.protocol;
 
-import com.vexsoftware.votifier.VotifierPlugin;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSA;
+import io.ibj.nuvotifier.legacyserver.protocol.v1crypto.RSA;
+import io.ibj.nuvotifier.model.NuVote;
+import io.ibj.nuvotifier.platform.V1KeyProvider;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
@@ -15,17 +15,26 @@ import java.util.List;
  * Decodes original protocol votes.
  */
 public class VotifierProtocol1Decoder extends ByteToMessageDecoder {
+
+    private final V1KeyProvider keyProvider;
+
+    public VotifierProtocol1Decoder(V1KeyProvider keyProvider) {
+        this.keyProvider = keyProvider;
+    }
+
     @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
-        byte[] block = new byte[256];
+    protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) {
+        if (buf.readableBytes() < 256) {
+            return;
+        }
+
+        byte[] block = new byte[buf.readableBytes()];
         buf.getBytes(0, block);
         // "Drain" the whole buffer
-        buf.readerIndex(buf.capacity());
-
-        VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
+        buf.readerIndex(buf.readableBytes());
 
         try {
-            block = RSA.decrypt(block, plugin.getProtocolV1Key().getPrivate());
+            block = RSA.decrypt(block, keyProvider.getPrivateKey());
         } catch (Exception e) {
             throw new CorruptedFrameException("Could not decrypt data (is your key correct?)", e);
         }
@@ -42,7 +51,7 @@ public class VotifierProtocol1Decoder extends ByteToMessageDecoder {
         }
 
         // Create the vote.
-        Vote vote = new Vote(split[1], split[2], split[3], split[4]);
+        NuVote vote = NuVote.createLegacy(split[1], split[2], split[3], split[4]);
         list.add(vote);
 
         // We are done, remove ourselves. Why? Sometimes, we will decode multiple vote messages.

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/VotifierProtocol2Decoder.java

@@ -0,0 +1,98 @@
+package io.ibj.nuvotifier.legacyserver.protocol;
+
+import com.google.gson.JsonObject;
+import io.ibj.nuvotifier.legacyserver.GsonInst;
+import io.ibj.nuvotifier.legacyserver.VotifierSession;
+import io.ibj.nuvotifier.platform.V2TokenProvider;
+import com.vexsoftware.votifier.model.Vote;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.MessageToMessageDecoder;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.util.Base64;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Decodes protocol 2 JSON votes.
+ */
+public class VotifierProtocol2Decoder extends MessageToMessageDecoder<String> {
+    private static final SecureRandom RANDOM = new SecureRandom();
+
+    private final V2TokenProvider tokenProvider;
+
+    public VotifierProtocol2Decoder(V2TokenProvider tokenProvider) {
+        this.tokenProvider = tokenProvider;
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, String s, List<Object> list) throws Exception {
+        JsonObject voteMessage = GsonInst.gson.fromJson(s, JsonObject.class);
+        VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
+
+        // Deserialize the payload.
+        String payload = voteMessage.get("payload").getAsString();
+        JsonObject votePayload = GsonInst.gson.fromJson(payload, JsonObject.class);
+
+        // Verify challenge.
+        if (!votePayload.get("challenge").getAsString().equals(session.getChallenge())) {
+            throw new CorruptedFrameException("Challenge is not valid");
+        }
+
+        String serviceName = votePayload.get("serviceName").getAsString();
+        // Get the key for the given service.
+        Key key = tokenProvider.getKeyForService(serviceName);
+
+        // Verify signature.
+        String sigHash = voteMessage.get("signature").getAsString();
+        byte[] sigBytes = Base64.getDecoder().decode(sigHash);
+
+        if (!hmacEqual(sigBytes, payload.getBytes(StandardCharsets.UTF_8), key)) {
+            throw new CorruptedFrameException("Signature is not valid (invalid token?)");
+        }
+
+        // Stopgap: verify the "uuid" field is valid, if provided.
+        if (votePayload.has("uuid")) {
+            UUID.fromString(votePayload.get("uuid").getAsString());
+        }
+
+        String username = votePayload.get("username").getAsString();
+        if (username.length() > 16) {
+            throw new CorruptedFrameException("Username too long");
+        }
+
+        String address = votePayload.get("address").getAsString();
+        long timestamp = votePayload.get("timestamp").getAsLong();
+
+        // Create the vote.
+        Vote vote = new Vote(serviceName, username, address, Long.toString(timestamp));
+        list.add(vote);
+
+        ctx.pipeline().remove(this);
+    }
+
+    private boolean hmacEqual(byte[] sig, byte[] message, Key key) throws NoSuchAlgorithmException, InvalidKeyException {
+        // See https://www.nccgroup.trust/us/about-us/newsroom-and-events/blog/2011/february/double-hmac-verification/
+        // This randomizes the byte order to make timing attacks more difficult.
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(key);
+        byte[] calculatedSig = mac.doFinal(message);
+
+        // Generate a random key for use in comparison
+        byte[] randomKey = new byte[32];
+        RANDOM.nextBytes(randomKey);
+
+        // Then generate two HMACs for the different signatures found
+        Mac mac2 = Mac.getInstance("HmacSHA256");
+        mac2.init(new SecretKeySpec(randomKey, "HmacSHA256"));
+        byte[] clientSig = mac2.doFinal(sig);
+        mac2.reset();
+        byte[] realSig = mac2.doFinal(calculatedSig);
+
+        return MessageDigest.isEqual(clientSig, realSig);
+    }
+}

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/VotifierProtocolDifferentiator.java

@@ -1,6 +1,8 @@
-package com.vexsoftware.votifier.net.protocol;
+package io.ibj.nuvotifier.legacyserver.protocol;
 
-import com.vexsoftware.votifier.net.VotifierSession;
+import io.ibj.nuvotifier.legacyserver.VotifierSession;
+import io.ibj.nuvotifier.platform.V1KeyProvider;
+import io.ibj.nuvotifier.platform.V2TokenProvider;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
@@ -18,23 +20,24 @@ import java.util.List;
 public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
     private static final short PROTOCOL_2_MAGIC = 0x733A;
     private final boolean testMode;
-    private final boolean allowv1;
 
-    public VotifierProtocolDifferentiator(boolean testMode, boolean allowv1) {
+    private final V1KeyProvider v1;
+    private final V2TokenProvider v2;
+
+    public VotifierProtocolDifferentiator(V1KeyProvider v1, V2TokenProvider v2, boolean testMode) {
         this.testMode = testMode;
-        this.allowv1 = allowv1;
+        this.v1 = v1;
+        this.v2 = v2;
     }
 
     @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
+    protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) {
         // Determine the number of bytes that are available.
         int readable = buf.readableBytes();
-        buf.retain(); // TODO: Is this needed?
 
         if (readable < 2) {
             // Some retarded voting sites (PMC?) seem to send empty buffers for no good reason.
-            // TODO: How can we handle this?
-            throw new CorruptedFrameException("Frame is too short");
+            return;
         }
 
         short readMagic = buf.readShort();
@@ -45,25 +48,30 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
         if (readMagic == PROTOCOL_2_MAGIC) {
+            if (v2 == null) {
+                throw new CorruptedFrameException("This server only accepts v1 Votifier packets.");
+            }
+
             // Short 0x733A + Message = Protocol v2 Vote
+            session.setVersion(VotifierSession.ProtocolVersion.TWO);
+
             if (!testMode) {
                 ctx.pipeline().addAfter("protocolDifferentiator", "protocol2LengthDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 2, 0, 4));
                 ctx.pipeline().addAfter("protocol2LengthDecoder", "protocol2StringDecoder", new StringDecoder(StandardCharsets.UTF_8));
-                ctx.pipeline().addAfter("protocol2StringDecoder", "protocol2VoteDecoder", new VotifierProtocol2Decoder());
+                ctx.pipeline().addAfter("protocol2StringDecoder", "protocol2VoteDecoder", new VotifierProtocol2Decoder(v2));
                 ctx.pipeline().addAfter("protocol2VoteDecoder", "protocol2StringEncoder", new StringEncoder(StandardCharsets.UTF_8));
                 ctx.pipeline().remove(this);
             }
-            session.setVersion(VotifierSession.ProtocolVersion.TWO);
         } else {
-            if (!allowv1) {
+            if (v1 == null) {
                 throw new CorruptedFrameException("This server only accepts well-formed Votifier v2 packets.");
             }
             // Probably Protocol v1 Vote Message
+            session.setVersion(VotifierSession.ProtocolVersion.ONE);
             if (!testMode) {
-                ctx.pipeline().addAfter("protocolDifferentiator", "protocol1Handler", new VotifierProtocol1Decoder());
+                ctx.pipeline().addAfter("protocolDifferentiator", "protocol1Handler", new VotifierProtocol1Decoder(v1));
                 ctx.pipeline().remove(this);
             }
-            session.setVersion(VotifierSession.ProtocolVersion.ONE);
         }
     }
 }

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/v1crypto/RSA.java

@@ -16,7 +16,7 @@
  * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.vexsoftware.votifier.net.protocol.v1crypto;
+package io.ibj.nuvotifier.legacyserver.protocol.v1crypto;
 
 import javax.crypto.Cipher;
 import java.security.PrivateKey;

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/v1crypto/RSAIO.java

@@ -16,11 +16,13 @@
  * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.vexsoftware.votifier.net.protocol.v1crypto;
+package io.ibj.nuvotifier.legacyserver.protocol.v1crypto;
 
-import javax.xml.bind.DatatypeConverter;
+import java.io.IOException;
+import java.util.Base64;
 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 +47,30 @@ 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(Base64.getEncoder().encode(publicSpec.getEncoded()));
+            privateOut.write(Base64.getEncoder().encode(privateSpec.getEncoded()));
+        }
+    }
+
+    public static byte[] readB64File(File directory, String name) throws IOException {
+        File f = new File(directory, name);
+        byte[] contents = Files.readAllBytes(f.toPath());
+        String strContents = new String(contents);
+        strContents = strContents.trim();
+        try {
+            return Base64.getDecoder().decode(strContents);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Base64 decoding exception: This is probably due to a corrupted file, " +
+                    "but in case it isn't, here is a b64 representation of what we read: " + new String(Base64.getEncoder().encode(contents), StandardCharsets.UTF_8), e);
+        }
     }
 
     /**
@@ -72,16 +83,10 @@ public class RSAIO {
      */
     public static KeyPair load(File directory) throws Exception {
         // Read the public key file.
-        File publicKeyFile = new File(directory + "/public.key");
-        byte[] encodedPublicKey = Files.readAllBytes(publicKeyFile.toPath());
-        encodedPublicKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPublicKey));
+        byte[] encodedPublicKey = readB64File(directory, "public.key");
 
         // Read the private key file.
-        File privateKeyFile = new File(directory + "/private.key");
-        byte[] encodedPrivateKey = Files.readAllBytes(privateKeyFile.toPath());
-        encodedPrivateKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPrivateKey));
+        byte[] encodedPrivateKey = readB64File(directory, "private.key");
 
         // Instantiate and return the key pair.
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");

legacyserver/src/main/java/io/ibj/nuvotifier/legacyserver/protocol/v1crypto/RSAKeygen.java

@@ -16,7 +16,7 @@
  * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.vexsoftware.votifier.net.protocol.v1crypto;
+package io.ibj.nuvotifier.legacyserver.protocol.v1crypto;
 
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;

model/README.md

@@ -0,0 +1,3 @@
+# model
+
+This module contains the 'model' for Votifier. It includes the legacy 'Vote' object as well as a 'NuVote' object which plugins which require extended information should depend upon.

model/src/main/java/com/vexsoftware/votifier/model/Vote.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2011 Vex Software LLC
+ * This file is part of Votifier.
+ *
+ * Votifier is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Votifier is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Votifier.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.vexsoftware.votifier.model;
+
+/**
+ * A model for a vote.
+ *
+ * @author Blake Beaupain
+ */
+public class Vote {
+
+    /** The name of the vote service. */
+    private final String serviceName;
+
+    /** The username of the voter. */
+    private final String username;
+
+    /** The address of the voter. */
+    private final String address;
+
+    /** The date and time of the vote. */
+    private final String timeStamp;
+
+    public Vote(String serviceName, String username, String address, String timeStamp) {
+        this.serviceName = serviceName;
+        this.username = username;
+        this.address = address;
+        this.timeStamp = timeStamp;
+    }
+
+    @Override
+    public String toString() {
+        return "Vote (from:" + serviceName + " username:" + username
+                + " address:" + address + " timeStamp:" + timeStamp + ")";
+    }
+
+    /**
+     * Gets the serviceName.
+     *
+     * @return The serviceName
+     */
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    /**
+     * Gets the username.
+     *
+     * @return The username
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * Gets the address.
+     *
+     * @return The address
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * Gets the time stamp.
+     *
+     * @return The time stamp
+     */
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+}

model/src/main/java/io/ibj/nuvotifier/model/NuVote.java

@@ -0,0 +1,17 @@
+package io.ibj.nuvotifier.model;
+
+import com.vexsoftware.votifier.model.Vote;
+
+/**
+ * This is the NuVote object. It extends the old 'Vote' object. The old 'Vote' object is frozen - i.e. no changes will be
+ * made to it. API additions to Vote happen in this file.
+ */
+public class NuVote extends Vote {
+    private NuVote(String serviceName, String username, String address, String timeStamp) {
+        super(serviceName, username, address, timeStamp);
+    }
+
+    public static NuVote createLegacy(String serviceName, String username, String address, String timeStamp) {
+        return new NuVote(serviceName, username, address, timeStamp);
+    }
+}

multiplatform/src/main/java/io/ibj/nuvotifier/multiplatform/BackendServer.java

@@ -0,0 +1,7 @@
+package io.ibj.nuvotifier.multiplatform;
+
+public interface BackendServer {
+    String getName();
+
+    boolean sendPluginMessage(String channel, byte[] data);
+}

multiplatform/src/main/java/io/ibj/nuvotifier/multiplatform/ProxyVotifierPlugin.java

@@ -0,0 +1,10 @@
+package io.ibj.nuvotifier.multiplatform;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public interface ProxyVotifierPlugin {
+    Collection<BackendServer> getAllBackendServers();
+
+    Optional<BackendServer> getServer(String name);
+}

platform/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    api project(":model")
+}

platform/src/main/java/io/ibj/nuvotifier/platform/JavaUtilLogger.java

@@ -0,0 +1,43 @@
+package io.ibj.nuvotifier.platform;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class JavaUtilLogger implements LoggingAdapter {
+
+    private final Logger logger;
+
+    public JavaUtilLogger(Logger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    public void error(String s) {
+        logger.severe(s);
+    }
+
+    @Override
+    public void error(String s, Object... o) {
+        logger.log(Level.SEVERE, s, o);
+    }
+
+    @Override
+    public void warn(String s) {
+        logger.warning(s);
+    }
+
+    @Override
+    public void warn(String s, Object... o) {
+        logger.log(Level.WARNING, s, o);
+    }
+
+    @Override
+    public void info(String s) {
+        logger.info(s);
+    }
+
+    @Override
+    public void info(String s, Object... o) {
+        logger.log(Level.INFO, s, o);
+    }
+}

platform/src/main/java/io/ibj/nuvotifier/platform/LoggingAdapter.java

@@ -0,0 +1,13 @@
+package io.ibj.nuvotifier.platform;
+
+public interface LoggingAdapter {
+    void error(String s);
+    void error(String s, Object... o);
+
+    void warn(String s);
+    void warn(String s, Object... o);
+
+    void info(String s);
+    void info(String s, Object... o);
+}
+

platform/src/main/java/io/ibj/nuvotifier/platform/V1KeyProvider.java

@@ -0,0 +1,7 @@
+package io.ibj.nuvotifier.platform;
+
+import java.security.PrivateKey;
+
+public interface V1KeyProvider {
+    PrivateKey getPrivateKey();
+}

platform/src/main/java/io/ibj/nuvotifier/platform/V2TokenProvider.java

@@ -0,0 +1,7 @@
+package io.ibj.nuvotifier.platform;
+
+import java.security.Key;
+
+public interface V2TokenProvider {
+    Key getKeyForService(String serviceName);
+}

platform/src/main/java/io/ibj/nuvotifier/platform/VoteHandler.java

@@ -0,0 +1,12 @@
+package io.ibj.nuvotifier.platform;
+
+import io.ibj.nuvotifier.model.NuVote;
+
+public interface VoteHandler {
+    void onVote(NuVote vote);
+
+    default void onError(Throwable throwable, boolean voteAlreadyCompleted, String remoteAddress) {
+        throw new RuntimeException("Unimplemented onError handler");
+    }
+
+}

platform/src/main/java/io/ibj/nuvotifier/platform/scheduler/ScheduledExecutorServiceVotifierScheduler.java

@@ -0,0 +1,53 @@
+package io.ibj.nuvotifier.platform.scheduler;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+public class ScheduledExecutorServiceVotifierScheduler implements VotifierScheduler {
+    private final ScheduledExecutorService service;
+
+    public ScheduledExecutorServiceVotifierScheduler(ScheduledExecutorService service) {
+        if (service == null)
+            throw new NullPointerException("Service is null");
+        this.service = service;
+    }
+
+    @Override
+    public ScheduledVotifierTask sync(Runnable runnable) {
+        return new ScheduledVotifierTaskWrapper(service.submit(runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask onPool(Runnable runnable) {
+        return new ScheduledVotifierTaskWrapper(service.submit(runnable));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.schedule(runnable, delay, unit));
+    }
+
+    @Override
+    public ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.schedule(runnable, delay, unit));
+    }
+
+    @Override
+    public ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit) {
+        return new ScheduledVotifierTaskWrapper(service.scheduleAtFixedRate(runnable, delay, repeat, unit));
+    }
+
+    private static class ScheduledVotifierTaskWrapper implements ScheduledVotifierTask {
+        private final Future<?> future;
+
+        private ScheduledVotifierTaskWrapper(Future<?> future) {
+            this.future = future;
+        }
+
+        @Override
+        public void cancel() {
+            future.cancel(false);
+        }
+    }
+}

platform/src/main/java/io/ibj/nuvotifier/platform/scheduler/ScheduledVotifierTask.java

@@ -0,0 +1,5 @@
+package io.ibj.nuvotifier.platform.scheduler;
+
+public interface ScheduledVotifierTask {
+    void cancel();
+}

platform/src/main/java/io/ibj/nuvotifier/platform/scheduler/VotifierScheduler.java

@@ -0,0 +1,15 @@
+package io.ibj.nuvotifier.platform.scheduler;
+
+import java.util.concurrent.TimeUnit;
+
+public interface VotifierScheduler {
+    ScheduledVotifierTask sync(Runnable runnable);
+
+    ScheduledVotifierTask onPool(Runnable runnable);
+
+    ScheduledVotifierTask delayedSync(Runnable runnable, int delay, TimeUnit unit);
+
+    ScheduledVotifierTask delayedOnPool(Runnable runnable, int delay, TimeUnit unit);
+
+    ScheduledVotifierTask repeatOnPool(Runnable runnable, int delay, int repeat, TimeUnit unit);
+}

pom.xml

@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.vexsoftware</groupId>
-    <artifactId>nuvotifier</artifactId>
-    <packaging>pom</packaging>
-    <version>2.3.2</version>
-    <modules>
-        <module>common</module>
-        <module>bukkit</module>
-        <module>bungeecord</module>
-        <module>universal</module>
-        <module>sponge</module>
-    </modules>
-    <name>NuVotifier</name>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>bukkit</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>minimumio-repo</id>
-            <url>http://repo.minimum.io/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>minimumio-repo-snapshots</id>
-            <url>http://repo.minimum.io/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <!-- Compiler -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

settings.gradle

@@ -0,0 +1,19 @@
+rootProject.name = 'nuvotifier'
+
+// The model for a 'Vote'.
+include 'model'
+
+// The 'platform' api.
+include 'platform'
+include 'multiplatform'
+
+// Servers
+include 'legacyserver'
+
+// Apis
+include 'bukkit-api'
+include 'bungeecord-api'
+include 'sponge-api'
+include 'velocity-api'
+include 'engine'
+

sponge-api/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    api group: "org.spongepowered", name:"spongeapi", version: "7.1.0"
+    implementation project(":model")
+}

sponge/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-sponge</artifactId>
-
-    <repositories>
-        <repository>
-            <id>sponge-maven-repo</id>
-            <name>Sponge maven repo</name>
-            <url>http://repo.spongepowered.org/maven</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spongepowered</groupId>
-            <artifactId>spongeapi</artifactId>
-            <version>3.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>

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

@@ -1,387 +0,0 @@
-package com.vexsoftware.votifier.sponge;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
-import com.google.inject.Inject;
-import com.vexsoftware.votifier.VoteHandler;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.net.VotifierSession;
-import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
-import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
-import com.vexsoftware.votifier.net.protocol.v1crypto.RSAKeygen;
-import com.vexsoftware.votifier.sponge.event.VotifierEvent;
-import com.vexsoftware.votifier.sponge.forwarding.ForwardedVoteListener;
-import com.vexsoftware.votifier.sponge.forwarding.ForwardingVoteSink;
-import com.vexsoftware.votifier.sponge.forwarding.SpongePluginMessagingForwardingSink;
-import com.vexsoftware.votifier.util.KeyCreator;
-import com.vexsoftware.votifier.util.TokenUtil;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.loader.ConfigurationLoader;
-import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
-import org.slf4j.Logger;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.config.ConfigDir;
-import org.spongepowered.api.event.Listener;
-import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.game.state.GameStartedServerEvent;
-import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
-import org.spongepowered.api.plugin.Plugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.Key;
-import java.security.KeyPair;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.3.2")
-public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.VotifierPlugin, ForwardedVoteListener {
-    private Logger logger;
-    @Inject
-    @ConfigDir(sharedRoot = false)
-    private Path baseDirectory;
-
-    @Inject
-    public VotifierPlugin(Logger logger) {
-        this.logger = logger;
-    }
-
-    @Listener
-    public void onServerStart(GameStartedServerEvent event) {
-        // Set the plugin version.
-        version = this.getClass().getAnnotation(Plugin.class).version();
-
-        // Handle configuration.
-        Path config = baseDirectory.resolve("config.yml");
-        File rsaDirectory = baseDirectory.resolve("rsa").toFile();
-
-        /*
-         * Use IP address from server.properties as a default for
-         * configurations. Do not use InetAddress.getLocalHost() as it most
-         * likely will return the main server address instead of the address
-         * assigned to the server.
-         */
-        String hostAddr;
-        Optional<InetSocketAddress> address = Sponge.getServer().getBoundAddress();
-        if (address.isPresent())
-            hostAddr = address.get().getAddress().getHostAddress();
-        else
-            hostAddr = "0.0.0.0";
-
-        /*
-         * Create configuration file if it does not exists; otherwise, load it
-         */
-        try {
-            Files.createDirectories(baseDirectory);
-        } catch (FileAlreadyExistsException ignored) {
-        } catch (IOException e) {
-            throw new RuntimeException("Can't create base directory", e);
-        }
-
-        if (!Files.exists(config)) {
-            try {
-                // First time run - do some initialization.
-                logger.info("Configuring Votifier for the first time...");
-
-                // Load and manually replace variables in the configuration.
-                String cfgStr = new String(ByteStreams.toByteArray(this.getClass().getResourceAsStream("spongeConfig.yml")),
-                        StandardCharsets.UTF_8);
-                String token = TokenUtil.newToken();
-                cfgStr = cfgStr.replace("%default_token%", token).replace("%ip%", hostAddr);
-                Files.write(config, ImmutableList.<CharSequence>of(cfgStr), StandardCharsets.UTF_8);
-
-                /*
-                 * Remind hosted server admins to be sure they have the right
-                 * port number.
-                 */
-                logger.info("------------------------------------------------------------------------------");
-                logger.info("Assigning NuVotifier to listen on port 8192. If you are hosting Craftbukkit on a");
-                logger.info("shared server please check with your hosting provider to verify that this port");
-                logger.info("is available for your use. Chances are that your hosting provider will assign");
-                logger.info("a different port, which you need to specify in config.yml");
-                logger.info("------------------------------------------------------------------------------");
-                logger.info("Your default NuVotifier token is " + token + ".");
-                logger.info("You will need to provide this token when you submit your server to a voting");
-                logger.info("list.");
-                logger.info("------------------------------------------------------------------------------");
-            } catch (Exception ex) {
-                logger.error("Error creating configuration file", ex);
-                gracefulExit();
-                return;
-            }
-        }
-
-        // Load configuration.
-        ConfigurationLoader loader = YAMLConfigurationLoader.builder()
-                .setPath(config)
-                .build();
-        ConfigurationNode node;
-        try {
-            node = loader.load();
-        } catch (IOException e) {
-            logger.error("Error loading configuration file", e);
-            gracefulExit();
-            return;
-        }
-
-        /*
-         * Create RSA directory and keys if it does not exist; otherwise, read
-         * keys.
-         */
-        try {
-            if (!rsaDirectory.exists()) {
-                rsaDirectory.mkdir();
-                keyPair = RSAKeygen.generate(2048);
-                RSAIO.save(rsaDirectory, keyPair);
-            } else {
-                keyPair = RSAIO.load(rsaDirectory);
-            }
-        } catch (Exception ex) {
-            logger.error("Error creating or reading RSA tokens", ex);
-            gracefulExit();
-            return;
-        }
-
-        debug = node.getNode("debug").getBoolean(false);
-
-        boolean setUpPort = node.getNode("enableExternal").getBoolean(true); //Always default to running the external port
-
-        if (setUpPort) {
-            // Load Votifier tokens.
-            ConfigurationNode tokenSection = node.getNode("tokens");
-
-            if (tokenSection.hasMapChildren()) {
-                for (Map.Entry<Object, ? extends ConfigurationNode> entry : tokenSection.getChildrenMap().entrySet()) {
-                    if (entry.getKey() instanceof String) {
-                        tokens.put((String) entry.getKey(), KeyCreator.createKeyFrom(entry.getValue().getString()));
-                        logger.info("Loaded token for website: " + entry.getKey());
-                    }
-                }
-            } else {
-                String token = TokenUtil.newToken();
-                tokenSection.setValue(ImmutableMap.of("default", token));
-                tokens.put("default", KeyCreator.createKeyFrom(token));
-                try {
-                    loader.save(node);
-                } catch (IOException e) {
-                    logger.error("Error generating Votifier token", e);
-                    gracefulExit();
-                    return;
-                }
-                logger.info("------------------------------------------------------------------------------");
-                logger.info("No tokens were found in your configuration, so we've generated one for you.");
-                logger.info("Your default Votifier token is " + token + ".");
-                logger.info("You will need to provide this token when you submit your server to a voting");
-                logger.info("list.");
-                logger.info("------------------------------------------------------------------------------");
-            }
-
-            // Initialize the receiver.
-            final String host = node.getNode("host").getString(hostAddr);
-            final int port = node.getNode("port").getInt(8192);
-            if (debug)
-                logger.info("DEBUG mode enabled!");
-
-            final boolean disablev1 = node.getNode("disable-v1-protocol").getBoolean(false);
-            if (disablev1) {
-                logger.info("------------------------------------------------------------------------------");
-                logger.info("Votifier protocol v1 parsing has been disabled. Most voting websites do not");
-                logger.info("currently support the modern Votifier protocol in NuVotifier.");
-                logger.info("------------------------------------------------------------------------------");
-            }
-
-            serverGroup = new NioEventLoopGroup(1);
-
-            new ServerBootstrap()
-                    .channel(NioServerSocketChannel.class)
-                    .group(serverGroup)
-                    .childHandler(new ChannelInitializer<NioSocketChannel>() {
-                        @Override
-                        protected void initChannel(NioSocketChannel channel) throws Exception {
-                            channel.attr(VotifierSession.KEY).set(new VotifierSession());
-                            channel.attr(com.vexsoftware.votifier.VotifierPlugin.KEY).set(VotifierPlugin.this);
-                            channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
-                            channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, !disablev1));
-                            channel.pipeline().addLast("voteHandler", new VoteInboundHandler(VotifierPlugin.this));
-                        }
-                    })
-                    .bind(host, port)
-                    .addListener(new ChannelFutureListener() {
-                        @Override
-                        public void operationComplete(ChannelFuture future) throws Exception {
-                            if (future.isSuccess()) {
-                                serverChannel = future.channel();
-                                logger.info("Votifier enabled.");
-                            } else {
-                                SocketAddress socketAddress = future.channel().localAddress();
-                                if (socketAddress == null) {
-                                    socketAddress = new InetSocketAddress(host, port);
-                                }
-                                logger.error("Votifier was not able to bind to " + socketAddress, future.cause());
-                            }
-                        }
-                    });
-        } else {
-            logger.info("You have enableExternal set to false in your config.yml. NuVotifier will NOT listen to votes coming in from an external voting list.");
-        }
-
-        ConfigurationNode forwardingConfig = node.getNode("forwarding");
-        if (forwardingConfig != null) {
-            String method = forwardingConfig.getNode("method").getString("none").toLowerCase(); //Default to lower case for case-insensitive searches
-            if ("none".equals(method)) {
-                getLogger().info("Method none selected for vote forwarding: Votes will not be received from a forwarder.");
-            } else if ("pluginmessaging".equals(method)) {
-                String channel = forwardingConfig.getNode("pluginMessaging").getNode("channel").getString("NuVotifier");
-                try {
-                    forwardingMethod = new SpongePluginMessagingForwardingSink(this, channel, this);
-                    getLogger().info("Receiving votes over PluginMessaging channel '" + channel + "'.");
-                } catch (RuntimeException e) {
-                    logger.error("NuVotifier could not set up PluginMessaging for vote forwarding!", e);
-                }
-            } else {
-                logger.error("No vote forwarding method '" + method + "' known. Defaulting to noop implementation.");
-            }
-        }
-    }
-
-    @Listener
-    public void onServerStop(GameStoppingServerEvent event) {
-        if (serverGroup != null) {
-            if (serverChannel != null)
-                serverChannel.close();
-            serverGroup.shutdownGracefully();
-        }
-        if (forwardingMethod != null)
-            forwardingMethod.halt();
-
-        logger.info("Votifier disabled.");
-    }
-
-    public Logger getLogger() {
-        return logger;
-    }
-
-    /**
-     * The current Votifier version.
-     */
-    private String version;
-
-    /**
-     * The server channel.
-     */
-    private Channel serverChannel;
-
-    /**
-     * The event group handling the channel.
-     */
-    private NioEventLoopGroup serverGroup;
-
-    /**
-     * The RSA key pair.
-     */
-    private KeyPair keyPair;
-
-    /**
-     * Debug mode flag
-     */
-    private boolean debug;
-
-    /**
-     * Keys used for websites.
-     */
-    private Map<String, Key> tokens = new HashMap<>();
-
-    private ForwardingVoteSink forwardingMethod;
-
-    private void gracefulExit() {
-        logger.error("Votifier did not initialize properly!");
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return The version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    public boolean isDebug() {
-        return debug;
-    }
-
-    @Override
-    public Map<String, Key> getTokens() {
-        return tokens;
-    }
-
-    @Override
-    public KeyPair getProtocolV1Key() {
-        return keyPair;
-    }
-
-    @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
-        if (debug) {
-            if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                logger.info("Got a protocol v1 vote record -> " + vote);
-            } else {
-                logger.info("Got a protocol v2 vote record -> " + vote);
-            }
-        }
-        Sponge.getScheduler().createTaskBuilder()
-                .execute(new Runnable() {
-                    @Override
-                    public void run() {
-                        VotifierEvent event = new VotifierEvent(vote, Cause.of(VotifierPlugin.this));
-                        Sponge.getEventManager().post(event);
-                    }
-                })
-                .async()
-                .submit(this);
-    }
-
-    @Override
-    public void onError(Channel channel, Throwable throwable) {
-        if (debug) {
-            logger.error("Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
-            logger.error("Unable to process vote from " + channel.remoteAddress());
-        }
-    }
-
-    @Override
-    public void onForward(final Vote v) {
-        if (debug) {
-            logger.info("Got a forwarded vote -> " + v);
-        }
-        Sponge.getScheduler().createTaskBuilder()
-                .execute(new Runnable() {
-                    @Override
-                    public void run() {
-                        VotifierEvent event = new VotifierEvent(v, Cause.of(VotifierPlugin.this));
-                        Sponge.getEventManager().post(event);
-                    }
-                })
-                .async()
-                .submit(this);
-    }
-}

sponge/src/main/java/com/vexsoftware/votifier/sponge/forwarding/ForwardedVoteListener.java

@@ -1,17 +0,0 @@
-package com.vexsoftware.votifier.sponge.forwarding;
-
-import com.vexsoftware.votifier.model.Vote;
-
-/**
- * Represents a method to call when a vote is forwarded through the {@link ForwardingVoteSink}.
- */
-public interface ForwardedVoteListener {
-
-    /**
-     * Called whenever a vote is forwarded from a {@link ForwardingVoteSink}
-     *
-     * @param v Vote that was forwarded
-     */
-    void onForward(Vote v);
-
-}

sponge/src/main/java/com/vexsoftware/votifier/sponge/forwarding/ForwardingVoteSink.java

@@ -1,13 +0,0 @@
-package com.vexsoftware.votifier.sponge.forwarding;
-
-/**
- * Represents a method at which to receive forwarded votes.
- */
-public interface ForwardingVoteSink {
-
-    /**
-     * Stop or close any oustanding network interfaces. Occurs on the onDisable method of a plugin.
-     */
-    void halt();
-
-}

sponge/src/main/java/com/vexsoftware/votifier/sponge/forwarding/SpongePluginMessagingForwardingSink.java

@@ -1,44 +0,0 @@
-package com.vexsoftware.votifier.sponge.forwarding;
-
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.sponge.VotifierPlugin;
-import org.json.JSONObject;
-import org.spongepowered.api.Platform;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.network.ChannelBinding;
-import org.spongepowered.api.network.ChannelBuf;
-import org.spongepowered.api.network.RawDataListener;
-import org.spongepowered.api.network.RemoteConnection;
-
-import java.nio.charset.StandardCharsets;
-
-public class SpongePluginMessagingForwardingSink implements ForwardingVoteSink, RawDataListener {
-
-    public SpongePluginMessagingForwardingSink(VotifierPlugin p, String channel, ForwardedVoteListener listener) {
-        this.channelBinding = Sponge.getChannelRegistrar().createRawChannel(p, channel);
-        this.channelBinding.addListener(Platform.Type.SERVER, this);
-        this.listener = listener;
-        this.p = p;
-    }
-
-    private final VotifierPlugin p;
-    private final ForwardedVoteListener listener;
-    private final ChannelBinding.RawDataChannel channelBinding;
-
-    @Override
-    public void halt() {
-        channelBinding.removeListener(this);
-    }
-
-    @Override
-    public void handlePayload(ChannelBuf channelBuf, RemoteConnection remoteConnection, Platform.Type type) {
-        try {
-            String message = new String(channelBuf.array(), StandardCharsets.UTF_8);
-            JSONObject jsonObject = new JSONObject(message);
-            Vote v = new Vote(jsonObject);
-            listener.onForward(v);
-        } catch (Exception e) {
-            p.getLogger().error("There was an unknown error when processing a forwarded vote.", e);
-        }
-    }
-}

sponge/src/main/resources/com/vexsoftware/votifier/sponge/spongeConfig.yml

@@ -1,33 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: %ip%
-
-# Port to listen for new votes on
-port: 8192
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
-# Setting this value to false will turn off the votifier port listening for external votes. This is beneficial if the server
-# is only listening for votes coming from NuVotifier running on your BungeeCord.
-enableExternal: true
-
-# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
-# option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
-# using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.
-disable-v1-protocol: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: %default_token%
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging
-  method: none
-  pluginMessaging:
-    channel: NuVotifier

universal/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-universal</artifactId>
-    <name>nuvotifier</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <relocations>
-                        <relocation>
-                            <pattern>io.netty</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.netty</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.json</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.json</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.commons.io</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.commons.io</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-bukkit</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-bungeecord</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-sponge</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-    </dependencies>
-</project>

usage.md

@@ -1,151 +0,0 @@
-This document outlines how to use NuVotifier as a plugin on both Bukkit based servers, as well as BungeeCord/Bukkit based
-networks.
-
-# Installation
-
-The NuVotifier Universal jar (the default jar that is distributed on spigotmc.org) can be installed on Bukkit, BungeeCord,
-and Sponge servers as-is without modification.
-
-The Universal JAR can be downloaded off our [SpigotMC resource page](https://www.spigotmc.org/resources/nuvotifier.13449/).
-
-# Votifier v1 vs NuVotifier v2 Protocols
-
-NuVotifier introduces a more secure and failure tolerant protocol for sending votes. In this document, this new protocol
-will be referred to as v2. NuVotifier also supports the legacy Votifier protocol (using public key encryption). In this document,
-the legacy protocol will be referred to v1. As of writing, most if not all vote websites still use v1.
-
-# Configuration
-
-## Enabling the NuVotifier Server port
-
-NuVotifier allows for the server port to be turned off when NuVotifier is only being used to forward votes. This is only
-an option on Bukkit based servers, since it would not make logical sense for the port to be turned off on Bungee servers.
-
-If you are receiving votes from a server list directly on the server in question (votes are not being forwarded through plugin
-messaging), or if votes are being forwarded through the `proxy` method, then `enableExternal` should be set to true. Only
-if you are receiving forwarded votes from your bungee through the `pluginMessaging` forwarding method should `enableExternal`
-be set to false.
-
-## Port Configuration
-
-One of NuVotifier's functions is acting as a vote server (receiver). The IP for NuVotifier to bind to is configured
-by the `host` and `ip` configuration values within the config.yml files within the NuVotifier plugin folder.
-Most times, you will want this `host` value to be set to `0.0.0.0` or your server's ip. `0.0.0.0` will bind to all
-ip ports on your machine, while specifying a certain IP will only bind to that ip. If you don't know what to set this
-to, `0.0.0.0` is a safe bet. By default, NuVotifier listens on port 8192. This is the same as the default Votifier port.
-If you change this, you will have to remember this when setting up forwarding or server lists.
-
-## Debug mode
-
-When first setting up NuVotifier, you will probably want debug mode to be enabled. This prints extra information to the
-console, ensuring that votes are being processed as they should. If you are experiencing an error, or having issues with
-votes being processed, you should first look to enable this. Debug mode can be turned on by setting `debug` in the config.yml
-to true.
-
-## Tokens vs Public Key
-
-As explained earlier, NuVotifier supports 2 different protocols for receiving votes, v1 and v2. v1 uses the private and public
-key pair located in `rsa/` in NuVotifier's plugin folder. When setting up voting websites, the public key, `rsa/public.key`
-should be used. When setting up the `proxy` forwarding method, tokens should be used.
-
-Making a new token is as easy as adding another entry into `tokens` with the serviceName as the key and whatever string you want
-as the value. You can usually find the serviceName of a vote provider on their setup page if they use v2.
-
-Unless a website specifies it, you should assume that the website is using v1, and you should enter your `rsa/public.key`.
-
-## Forwarding
-
-NuVotifier allows for various methods for forwarding the vote from an upstream Bungeecord instance. Currently, 2 methods
-are supported: `proxy` and `pluginMessaging`. These are configured through the `forwarding` configuration section in your
-config.yml files.
-
-### Plugin Messaging Based Forwarding
-
-Plugin Messaging based forwarding works by sending a forwarded vote over Minecraft's plugin messaging system. NuVotifier
-is only capable of forwarding the vote if a player is on each backend server through the BungeeCord running NuVotifier.
-Plugin Messaging can be enabled by setting `method` in `forwarding` to `pluginMessaging`. You may also set the plugin messaging
-channel NuVotifier is to use by setting `channel` in the `pluginMessaging` section. This may be whatever you want, but it
-must be the same on your BungeeCord as well as your backend Bukkit servers. If they are not the same, the backend will not
-be able to receive the vote.
-
-#### Filtering servers
-
-If you only wish to send votes to some servers, but not all, there is a section within `pluginMessaging` called `excludedServers`.
-By default, this section is commented out, and will never filter out any servers. If you wish to filter out servers, uncomment
-this list and fill it with the names of servers you do not want to send votes to.
-
-#### Plugin Messaging Vote Caching
-
-In the event that the backend server does not have anyone on it from the BungeeCord instance, the vote will need to be cached
-until a player joins and the vote may be sent. There are 3 options for caching, however one is only suitable for actual
-production.
-
-##### Memory Vote Caching
-
-For votes to simply be cached in memory, you can set the `cache` setting of the `pluginMessaging` section of your BungeeCord's
-NuVotifier's config.yml to `memory`. This stores votes in memory. The votes are lost when the BungeeCord server shuts down.
-This is suitable for testing, but not for production system.
-
-##### File Vote Caching
-
-Votes can also be cached in a file located in the NuVotifier plugin folder. To enable this, you can set `cache` to file.
-If you want to change the file location from the default, you can set this under the `name` config under the `file` section.
-This caching method is suitable for most people.
-
-##### No Caching
-
-Caching can also be turned off. This is the default option. You can do this by setting `cache` to `none`. This is also not
-recommended, and is only suitable for a certain number of setups.
-
-### Proxy Based Forwarding
-
-You can also forward votes using the proxy method. This will cause the BungeeCord to act as a voting websites, sending votes
-to each server's NuVotifier port. To enable this method, you must set the `method` under `forwarding` to `proxy` in your
-BungeeCord config.yml. Within the server's config.yml, `forwarding` should be set to `none`.
-
-For each server you wish to forward to, you must add each to your BungeeCord config.yml under the `proxy` section of `forwarding`.
-For each, you must specify the ip address (`address`), port (`port`) and token (`key`). Each backend Bukkit server should have
-1 default token under the `tokens` section. This is the token that should be used as the token for the `key` in that server's
-section within the `proxy` section. If the server is on the same server (same ip) as the BungeeCord server, you may
-use the `127.0.0.1` or `localhost` address, setting both the `proxy` forwarding address and Bukkit config.yml address to it.
-
-In order for vote proxying to work, the backend server __must__ have `enableExternal` set to true. If it is set to
-false, the Bungee server will not be able to forward the vote. 
-
-
-## Default Configurations
-
-The default configuration for Bukkit can be found [here](https://github.com/NuVotifier/NuVotifier/blob/master/bukkit/src/main/resources/bukkitConfig.yml),
-for BungeeCord [here](https://github.com/NuVotifier/NuVotifier/blob/master/bungeecord/src/main/resources/bungeeConfig.yml),
-and for Sponge [here](https://github.com/NuVotifier/NuVotifier/blob/master/sponge/src/main/resources/com/vexsoftware/votifier/sponge/spongeConfig.yml).
-
-
-## Testing
-
-There is a free resource for testing your NuVotifier setups at [ibj.io/v](https://ibj.io/v). If you are setting up your
-network or server and want a server to get test votes on, you are more than welcome to use it.
-
-
-## Basic Setups
-
-### Single Server Quickstart
-
-A single server setup should have `enableExternal` set to `true`, and `forwarding.method` set to `none`. The IP and port
-should also be set to appropriate values. For server lists, you should use the public key found in `rsa/public.key`.
-
-## Advanced Setups
-
-### Multi BungeeCord Setups
-
-Using NuVotifier with multiple BungeeCords is a more tricky setup. You can use one of your player-facing proxies for the
-NuVotifier server, or use a separate one. You are not guaranteed to have players on all of your servers to allow votes to
-be dispatched, so proxy forwarding (requiring `enableExternal` set to `true` on your Bukkit servers) is highly recommended.
-
-## Contributing
-
-If you wish to contribute code wise, feel free to submit a pull request!
-
-## Client Libraries
-
-NuVotifier has libraries available for [NodeJS](https://github.com/NuVotifier/votifier2-js) and [PHP](https://github.com/NuVotifier/votifier2-php).
-Both are free to use by serverlists.

velocity-api/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    api group: "com.velocitypowered", name: "velocity-api", version: "1.0-SNAPSHOT"
+    implementation project(":model")
+}

velocity-api/src/main/java/com/vexsoftware/votifier/velocity/event/VotifierEvent.java

@@ -0,0 +1,23 @@
+package com.vexsoftware.votifier.velocity.event;
+
+import com.vexsoftware.votifier.model.Vote;
+import io.ibj.nuvotifier.model.NuVote;
+
+public class VotifierEvent {
+    private final NuVote vote;
+
+    public VotifierEvent(NuVote vote) {
+        this.vote = vote;
+    }
+
+    public Vote getVote() {
+        return vote;
+    }
+
+    @Override
+    public String toString() {
+        return "VotifierEvent{" +
+                "vote=" + vote +
+                '}';
+    }
+}