Bound connection throttling state and reject blocked peers early

VotifierPlus/pom.xml

@@ -79,7 +79,7 @@
                 <version>3.5.4</version>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.5.0</version>
                 <configuration>

VotifierPlus/src/main/java/com/vexsoftware/votifier/net/VoteConnectionHandler.java

@@ -46,6 +46,7 @@ public Vote handle(Socket socket) {
 		String remoteIp = "unknown";
 		String address = "";
 		String throttleKey = null;
+		String aggregateThrottleKey = null;
 		boolean tunnelMode = false;
 		boolean realIpKnown = false;
 
@@ -57,9 +58,21 @@ public Vote handle(Socket socket) {
 			address = accepted.getRemoteSocketAddress() == null ? "/" + remoteIp
 					: accepted.getRemoteSocketAddress().toString();
 
+			throttleKey = "tunnel:" + remoteIp;
+			tunnelMode = throttleService.isTunnelMode(remoteIp);
+			aggregateThrottleKey = throttleKey;
 			receiver.debug("Accepted connection from: " + address);
 			accepted.setSoTimeout(5000);
 
+			if (throttleService.isAggregateBlocked(aggregateThrottleKey)) {
+				long retry = throttleService.aggregateRetryAfterMs(aggregateThrottleKey);
+				String blockedKey = throttleService.aggregateBlockedKey(aggregateThrottleKey);
+				throttleService.logWarning(receiver, "throttle|" + blockedKey,
+						"Votifier throttling " + blockedKey + " (tunnel=" + tunnelMode + "), retry in "
+								+ Math.max(0, retry / 1000) + "s");
+				return null;
+			}
+
 			String challenge = receiver.getChallenge();
 			sendHandshakeIfNeeded(in, writer, challenge);
 
@@ -73,12 +86,12 @@ public Vote handle(Socket socket) {
 			realIp = proxyResult.getRealIp();
 
 			realIpKnown = realIp != null && !realIp.isEmpty();
-			tunnelMode = throttleService.isTunnelMode(remoteIp);
 			throttleKey = realIpKnown ? "ip:" + realIp : "tunnel:" + remoteIp;
 
-			if (throttleService.isBlocked(throttleKey)) {
-				long retry = throttleService.retryAfterMs(throttleKey);
-				throttleService.logWarning(receiver, "throttle|" + throttleKey, "Votifier throttling " + throttleKey
+			if (throttleService.isBlocked(throttleKey, aggregateThrottleKey)) {
+				long retry = throttleService.retryAfterMs(throttleKey, aggregateThrottleKey);
+				String blockedKey = throttleService.blockedKey(throttleKey, aggregateThrottleKey);
+				throttleService.logWarning(receiver, "throttle|" + blockedKey, "Votifier throttling " + blockedKey
 						+ " (tunnel=" + tunnelMode + "), retry in " + Math.max(0, retry / 1000) + "s");
 				return null;
 			}
@@ -97,7 +110,7 @@ public Vote handle(Socket socket) {
 			}
 
 			receiver.log("Received vote record -> " + vote);
-			throttleService.success(throttleKey);
+			throttleService.success(throttleKey, aggregateThrottleKey);
 
 			if (!"TestVote".equalsIgnoreCase(vote.getTimeStamp())) {
 				sendOkResponse(writer);
@@ -109,31 +122,31 @@ public Vote handle(Socket socket) {
 				throttleKey = "tunnel:" + remoteIp;
 			}
 
-			throttleService.fail(throttleKey, tunnelMode, realIpKnown);
+			throttleService.fail(throttleKey, aggregateThrottleKey, tunnelMode, realIpKnown);
 			throttleService.logWarning(receiver, "invalid|" + throttleKey,
 					"Invalid vote format from " + remoteIp + ": " + ex.getMessage());
 		} catch (VoteAuthenticationException ex) {
 			if (throttleKey == null) {
 				throttleKey = "tunnel:" + remoteIp;
 			}
 
-			throttleService.fail(throttleKey, tunnelMode, realIpKnown);
+			throttleService.fail(throttleKey, aggregateThrottleKey, tunnelMode, realIpKnown);
 			throttleService.logWarning(receiver, "auth|" + throttleKey,
 					"Authentication failed from " + remoteIp + ": " + ex.getMessage());
 		} catch (MalformedJsonException ex) {
 			if (throttleKey == null) {
 				throttleKey = "tunnel:" + remoteIp;
 			}
 
-			throttleService.fail(throttleKey, tunnelMode, false);
+			throttleService.fail(throttleKey, aggregateThrottleKey, tunnelMode, false);
 			throttleService.logWarning(receiver, "malformedjson|" + throttleKey,
 					"Invalid vote format: Malformed JSON payload from " + remoteIp + " - " + ex.getMessage());
 		} catch (BadPaddingException ex) {
 			if (throttleKey == null) {
 				throttleKey = "tunnel:" + remoteIp;
 			}
 
-			throttleService.fail(throttleKey, tunnelMode, realIpKnown);
+			throttleService.fail(throttleKey, aggregateThrottleKey, tunnelMode, realIpKnown);
 			throttleService.logWarning(receiver, "badpadding|" + throttleKey,
 					"Decryption failed: Invalid V1 vote block / public key mismatch from " + remoteIp);
 		} catch (SocketTimeoutException ex) {

VotifierPlus/src/main/java/com/vexsoftware/votifier/net/VoteParser.java

@@ -538,7 +538,8 @@ private VoteRequest parseV2(byte[] data, VoteReceiver receiver, String address,
 
 		String serviceName = requireString(votePayload, FIELD_SERVICE_NAME, "Inner JSON from " + address + ": ");
 		String username = requireString(votePayload, FIELD_USERNAME, "Inner JSON from " + address + ": ");
-		String voteAddress = votePayload.get(FIELD_ADDRESS).getAsString();
+		String voteAddress = requirePossiblyEmptyString(votePayload, FIELD_ADDRESS,
+				"Inner JSON from " + address + ": ");
 		String timeStamp = requireString(votePayload, FIELD_TIMESTAMP, "Inner JSON from " + address + ": ");
 		String receivedChallenge = requireString(votePayload, FIELD_CHALLENGE, "Inner JSON from " + address + ": ").trim();
 
@@ -591,6 +592,18 @@ private String requireString(JsonObject obj, String field, String errorPrefix) t
 		return value;
 	}
 
+	private String requirePossiblyEmptyString(JsonObject obj, String field, String errorPrefix)
+			throws InvalidVoteException {
+		if (!obj.has(field)) {
+			throw new InvalidVoteException(errorPrefix + "missing field '" + field + "'");
+		}
+		try {
+			return obj.get(field).getAsString();
+		} catch (Exception ex) {
+			throw new InvalidVoteException(errorPrefix + "invalid field '" + field + "'", ex);
+		}
+	}
+
 	private String readString(byte[] data, int offset) {
 		StringBuilder builder = new StringBuilder();
 		for (int i = offset; i < data.length; i++) {