Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite in favor of ProtocolV2 #70

Closed
wants to merge 11 commits into from
Closed

Rewrite in favor of ProtocolV2 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1db1d6b
Cleanup to pave the way towards ProtocolV2
coelho Mar 31, 2014
1080258
Add ProtocolV2
coelho Mar 31, 2014
201f637
Cleanup
coelho Mar 31, 2014
1ac03b5
Unix time is not in milliseconds
coelho Mar 31, 2014
ed8a3ab
Not all server lists on ProtocolV1 send a unix timestamp
coelho Mar 31, 2014
0782b3c
Votifier v1.9 -> v2.0
coelho Mar 31, 2014
06e4423
Rename domain -> host in the JsonMessagePayload
coelho Apr 1, 2014
77d5938
Add missing toString method in Vote
coelho Apr 1, 2014
f3555e8
Make the replayCache actually work
coelho Apr 1, 2014
0054f7d
Better protect against a replay attack with a random token
coelho Apr 1, 2014
74774f0
Remove the random token and implement a challenge system
coelho May 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.vexsoftware</groupId>
<artifactId>votifier</artifactId>
<version>1.9</version>
<version>2.0</version>
<name>Votifier</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -20,7 +20,7 @@
<!-- Bukkit Dependency -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<artifactId>craftbukkit</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should bundle your own IOUtils rather than relying on CraftBukkit.

<version>1.7.2-R0.1</version>
<type>jar</type>
<scope>compile</scope>
Expand Down
209 changes: 112 additions & 97 deletions src/main/java/com/vexsoftware/votifier/Votifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,31 @@

package com.vexsoftware.votifier;

import java.io.*;
import java.io.File;
import java.net.URL;
import java.security.KeyPair;
import java.security.PublicKey;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.logging.*;
import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import com.vexsoftware.votifier.crypto.RSAIO;
import com.vexsoftware.votifier.crypto.RSAKeygen;

import com.vexsoftware.votifier.model.ListenerLoader;
import com.vexsoftware.votifier.model.VoteListener;
import com.vexsoftware.votifier.net.VoteReceiver;
import com.vexsoftware.votifier.net.VoteAcceptor;
import com.vexsoftware.votifier.util.LogFilter;
import com.vexsoftware.votifier.util.rsa.RSAIO;
import com.vexsoftware.votifier.util.rsa.RSAKeygen;

/**
* The main Votifier plugin class.
*
* @author Blake Beaupain
* @author Kramer Campbell
*/
public class Votifier extends JavaPlugin {

Expand All @@ -46,96 +52,85 @@ public class Votifier extends JavaPlugin {
/** Log entry prefix */
private static final String logPrefix = "[Votifier] ";

/** The Votifier instance. */
private static Votifier instance;

/** The current Votifier version. */
private String version;

/** The vote listeners. */
private final List<VoteListener> listeners = new ArrayList<VoteListener>();
private List<VoteListener> listeners = new ArrayList<VoteListener>();

/** The websites mapped to their public key. */
private Map<String, PublicKey> websites = new HashMap<String, PublicKey>();

/** The vote receiver. */
private VoteReceiver voteReceiver;
private VoteAcceptor voteAcceptor;

/** The RSA key pair. */
private KeyPair keyPair;

/** Debug mode flag */
private boolean debug;

/** Old protocol flag */
private boolean oldProtocol;

/**
* Attach custom log filter to logger.
*/
static {
LOG.setFilter(new LogFilter(logPrefix));
}

@Override
public void onLoad() {
FileConfiguration config = super.getConfig();

if (!new File(getDataFolder() + "/config.yml").exists()) {
LOG.info("Configuring Votifier for the first time...");
LOG.info("------------------------------------------------------------------------------");
LOG.info("Assigning Votifier to listen on port 8192. If you are hosting Craftbukkit on a");
LOG.info("shared server please check with your hosting provider to verify that this port");
LOG.info("is available for your use. Chances are that your hosting provider will assign");
LOG.info("a different port, which you need to specify in config.yml");
LOG.info("------------------------------------------------------------------------------");

/*
* 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";
}
config.set("host", hostAddr);

// Replace to remove a bug with Windows paths - SmilingDevil
config.set("listener_folder", getDataFolder().toString().replace("\\", "/") + "/listeners");
}

if (config.contains("websites")) {
return;
}

config.options().copyDefaults(true);
saveConfig();
reloadConfig();
}

@Override
public void onEnable() {
Votifier.instance = this;

// Set the plugin version.
version = getDescription().getVersion();

// Handle configuration.
if (!getDataFolder().exists()) {
getDataFolder().mkdir();
}
File config = new File(getDataFolder() + "/config.yml");
YamlConfiguration cfg = YamlConfiguration.loadConfiguration(config);
FileConfiguration config = super.getConfig();
File rsaDirectory = new File(getDataFolder() + "/rsa");
// Replace to remove a bug with Windows paths - SmilingDevil
String listenerDirectory = getDataFolder().toString()
.replace("\\", "/") + "/listeners";

/*
* 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.
LOG.info("Configuring Votifier for the first time...");

// Initialize the configuration file.
config.createNewFile();

cfg.set("host", hostAddr);
cfg.set("port", 8192);
cfg.set("debug", false);

/*
* Remind hosted server admins to be sure they have the right
* port number.
*/
LOG.info("------------------------------------------------------------------------------");
LOG.info("Assigning Votifier to listen on port 8192. If you are hosting Craftbukkit on a");
LOG.info("shared server please check with your hosting provider to verify that this port");
LOG.info("is available for your use. Chances are that your hosting provider will assign");
LOG.info("a different port, which you need to specify in config.yml");
LOG.info("------------------------------------------------------------------------------");

cfg.set("listener_folder", listenerDirectory);
cfg.save(config);
} catch (Exception ex) {
LOG.log(Level.SEVERE, "Error creating configuration file", ex);
gracefulExit();
return;
}
} else {
// Load configuration.
cfg = YamlConfiguration.loadConfiguration(config);
}
File listenerDirectory = new File(config.getString("listener_folder"));
listenerDirectory.mkdir();

/*
* Create RSA directory and keys if it does not exist; otherwise, read
Expand All @@ -144,46 +139,62 @@ public void onEnable() {
try {
if (!rsaDirectory.exists()) {
rsaDirectory.mkdir();
new File(listenerDirectory).mkdir();
keyPair = RSAKeygen.generate(2048);
RSAIO.save(rsaDirectory, keyPair);
} else {
keyPair = RSAIO.load(rsaDirectory);
}
} catch (Exception ex) {
} catch (Exception exception) {
LOG.log(Level.SEVERE,
"Error reading configuration file or RSA keys", ex);
"Error reading configuration file or RSA keys",
exception);
gracefulExit();
return;
}

// Load the vote listeners.
listenerDirectory = cfg.getString("listener_folder");
listeners.addAll(ListenerLoader.load(listenerDirectory));

// Load the website public keys
for (Entry<String, Object> website : config.getConfigurationSection("websites").getValues(false).entrySet()) {
try {
websites.put(website.getKey(), RSAIO.loadPublicKey(new URL((String) website.getValue())));
if (!website.getKey().startsWith("https://")) {
LOG.warning("You are loading a public key (" + website.getKey() + ") over a non-SSL connection. This is insecure!");
}
LOG.info("Loaded public key for website: " + website.getKey());
} catch (Exception exception) {
LOG.log(Level.WARNING,
"Error loading public key for website: " + website.getKey(),
exception);
}
}

// Initialize the receiver.
String host = cfg.getString("host", hostAddr);
int port = cfg.getInt("port", 8192);
debug = cfg.getBoolean("debug", false);
if (debug)
// Initialize the acceptor.
String host = config.getString("host");
int port = config.getInt("port");
oldProtocol = config.getBoolean("enable_old_protocol");
debug = config.getBoolean("debug");
if (debug) {
LOG.info("DEBUG mode enabled!");
}

try {
voteReceiver = new VoteReceiver(this, host, port);
voteReceiver.start();
voteAcceptor = new VoteAcceptor(this, host, port);
voteAcceptor.start();

LOG.info("Votifier enabled.");
} catch (Exception ex) {
} catch (Exception exception) {
gracefulExit();
return;
}
}

@Override
public void onDisable() {
// Interrupt the vote receiver.
if (voteReceiver != null) {
voteReceiver.shutdown();
// Interrupt the vote acceptor.
if (voteAcceptor != null) {
voteAcceptor.shutdown();
}
LOG.info("Votifier disabled.");
}
Expand All @@ -192,15 +203,6 @@ private void gracefulExit() {
LOG.log(Level.SEVERE, "Votifier did not initialize properly!");
}

/**
* Gets the instance.
*
* @return The instance
*/
public static Votifier getInstance() {
return instance;
}

/**
* Gets the version.
*
Expand All @@ -218,14 +220,23 @@ public String getVersion() {
public List<VoteListener> getListeners() {
return listeners;
}

/**
* Gets the websites mapped to their public key
*
* @return The websites
*/
public Map<String, PublicKey> getWebsites() {
return websites;
}

/**
* Gets the vote receiver.
* Gets the vote acceptor.
*
* @return The vote receiver
* @return The vote acceptor
*/
public VoteReceiver getVoteReceiver() {
return voteReceiver;
public VoteAcceptor getVoteAcceptor() {
return voteAcceptor;
}

/**
Expand All @@ -240,5 +251,9 @@ public KeyPair getKeyPair() {
public boolean isDebug() {
return debug;
}

public boolean isOldProtocol() {
return oldProtocol;
}

}
Loading