Skip to content

Fix test helper validation to match VoteReceiver implementation #144

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

Merged
BenCodez merged 6 commits into from
Feb 1, 2026
Merged

Fix test helper validation to match VoteReceiver implementation #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5de5fc8
Initial plan
Copilot Feb 1, 2026
9d2f278
Improve invalid vote error handling with better validation and messages
Copilot Feb 1, 2026
8edf46e
Address code review feedback: improve security and clarity
Copilot Feb 1, 2026
e3c8dd6
Refactor tests to use assertThrows for better readability
Copilot Feb 1, 2026
94e27de
Fix test helper to match main implementation validation logic
Copilot Feb 1, 2026
115c023
Add Base64 validation to test helper method
Copilot Feb 1, 2026
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
94 changes: 72 additions & 22 deletions VotifierPlus/src/main/java/com/vexsoftware/votifier/net/VoteReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ public void run() {
debug("Reading V1 vote block (256 bytes expected) at " + startTime + " ms");

if (in.available() < 256) {
logWarning("Invalid vote format: Insufficient data for V1 vote block from " + address
+ " (expected 256 bytes)");
debug("Insufficient data available for V1 vote block; closing connection from " + address);
writer.close();
in.close();
Expand All @@ -263,20 +265,26 @@ public void run() {
try {
decrypted = RSA.decrypt(block, getKeyPair().getPrivate());
} catch (BadPaddingException e) {
// Log only the first 32 bytes as hex to avoid exposing full vote block
StringBuilder blockHex = new StringBuilder();
for (byte b : block) {
blockHex.append(String.format("%02X ", b));
int bytesToLog = Math.min(32, block.length);
for (int i = 0; i < bytesToLog; i++) {
blockHex.append(String.format("%02X ", block[i]));
}
if (block.length > bytesToLog) {
blockHex.append("... (truncated)");
}
logWarning(
"Decryption failed. Either the vote block is invalid or the public key does not match the server list from "
"Decryption failed: Invalid V1 vote block or public key mismatch from "
+ address);
debug("Vote block preview (first 32 bytes): " + blockHex.toString().trim());
throw e;
}
int position = 0;
String opcode = readString(decrypted, position);
position += opcode.length() + 1;
if (!opcode.equals("VOTE")) {
throw new Exception("Unable to decode RSA: invalid opcode " + opcode);
throw new Exception("Invalid vote format: Expected opcode 'VOTE' but got '" + opcode + "' from " + address);
}
String serviceName = readString(decrypted, position);
position += serviceName.length() + 1;
Expand All @@ -290,6 +298,8 @@ public void run() {
+ "\n";
debug("Processed V1 vote block.");
} else {
logWarning("Invalid vote format: Failed to read complete V1 vote block from " + address
+ " (expected 256 bytes, got " + totalRead + ")");
debug("Failed to read V1 vote, random ping? expected 256 bytes, got " + totalRead);
continue;
// throw new Exception("Failed to read V1 vote block: expected 256 bytes, got "
Expand Down Expand Up @@ -322,7 +332,7 @@ public void run() {
int jsonEnd = voteData.lastIndexOf("}");
if (jsonStart == -1 || jsonEnd == -1 || jsonStart > jsonEnd) {
throw new Exception(
"Expected JSON-formatted vote payload, got: " + voteData + " from " + address);
"Invalid vote format: Expected JSON-formatted vote payload, got: " + voteData + " from " + address);
}
String jsonPayloadRaw = voteData.substring(jsonStart, jsonEnd + 1).trim();
debug("Extracted raw JSON payload: [" + jsonPayloadRaw + "]");
Expand All @@ -332,20 +342,53 @@ public void run() {
if (jsonPayloadRaw.startsWith("[")) {
JsonArray jsonArray = gson.fromJson(jsonPayloadRaw, JsonArray.class);
if (jsonArray.size() == 0) {
throw new Exception("Empty JSON array in vote payload from " + address);
throw new Exception("Invalid vote format: Empty JSON array in vote payload from " + address);
}
voteMessage = jsonArray.get(0).getAsJsonObject();
} else {
voteMessage = gson.fromJson(jsonPayloadRaw, JsonObject.class);
}

// Extract the inner payload and signature.
// Validate and extract the outer payload and signature fields.
if (!voteMessage.has("payload")) {
throw new Exception("Invalid vote format: Missing required 'payload' field in outer JSON from " + address);
}
if (!voteMessage.has("signature")) {
throw new Exception("Invalid vote format: Missing required 'signature' field in outer JSON from " + address);
}
String payload = voteMessage.get("payload").getAsString();
String sigHash = voteMessage.get("signature").getAsString();
byte[] sigBytes = Base64.getDecoder().decode(sigHash);
byte[] sigBytes;
try {
sigBytes = Base64.getDecoder().decode(sigHash);
} catch (IllegalArgumentException e) {
throw new Exception("Invalid vote format: Signature is not valid Base64 from " + address + ": " + e.getMessage());
}

// Parse the inner payload JSON.
JsonObject votePayload = gson.fromJson(payload, JsonObject.class);
JsonObject votePayload;
try {
votePayload = gson.fromJson(payload, JsonObject.class);
} catch (Exception e) {
throw new Exception("Invalid vote format: Inner payload is not valid JSON from " + address + ": " + e.getMessage());
}

// Validate required fields in inner payload.
if (!votePayload.has("serviceName")) {
throw new Exception("Invalid vote format: Missing required 'serviceName' field in vote payload from " + address);
}
if (!votePayload.has("username")) {
throw new Exception("Invalid vote format: Missing required 'username' field in vote payload from " + address);
}
if (!votePayload.has("address")) {
throw new Exception("Invalid vote format: Missing required 'address' field in vote payload from " + address);
}
if (!votePayload.has("timestamp")) {
throw new Exception("Invalid vote format: Missing required 'timestamp' field in vote payload from " + address);
}
if (!votePayload.has("challenge")) {
throw new Exception("Invalid vote format: Missing required 'challenge' field in vote payload from " + address);
}

// Retrieve serviceName from the inner JSON.
String serviceNameFromPayload = votePayload.get("serviceName").getAsString();
Expand All @@ -355,16 +398,19 @@ public void run() {
if (key == null) {
key = getTokens().get("default");
if (key == null) {
throw new Exception("Unknown token for service '" + serviceNameFromPayload + "'");
throw new Exception("Authentication failed: Unknown token for service '" + serviceNameFromPayload + "' from " + address);
}
debug("Using default token for service: " + serviceNameFromPayload);
} else {
debug("Using service-specific token for: " + serviceNameFromPayload);
}

// Debug: log the payload string and its computed HMAC for comparison.
debug("Inner payload string: [" + payload + "]");

// Verify HMAC signature using the payload bytes.
if (!hmacEqual(sigBytes, payload.getBytes(StandardCharsets.UTF_8), key)) {
throw new Exception("Signature is not valid (invalid token?) from " + address);
throw new Exception("Authentication failed: Signature verification failed (invalid token?) for service '" + serviceNameFromPayload + "' from " + address);
}

// Extract vote fields from the inner payload.
Expand All @@ -373,14 +419,11 @@ public void run() {
address1 = votePayload.get("address").getAsString();
timeStamp = votePayload.get("timestamp").getAsString();

// Check the challenge.
if (!votePayload.has("challenge")) {
throw new Exception("Vote payload missing challenge field from " + address);
}
// Verify the challenge.
String receivedChallenge = votePayload.get("challenge").getAsString().trim();
if (!receivedChallenge.equals(challenge.trim())) {
throw new Exception(
"Invalid challenge: expected " + challenge + " but got " + receivedChallenge);
"Authentication failed: Invalid challenge (expected '" + challenge + "' but got '" + receivedChallenge + "') from " + address);
}
} else {
String[] fields = voteData.split("\n");
Expand Down Expand Up @@ -428,25 +471,32 @@ public void run() {
in.close();
socket.close();
} catch (MalformedJsonException ex) {
logWarning("Malformed JSON payload received from: " + address + " - " + ex.getMessage());
logWarning("Invalid vote format: Malformed JSON payload received from " + address + " - " + ex.getMessage());
debug(ex);
} catch (SocketException ex) {
if (running) {
logWarning("Protocol error from: " + address + " - " + ex.getLocalizedMessage());
logWarning("Connection error: Protocol error from " + address + " - " + ex.getLocalizedMessage());
debug(ex);
} else {
logWarning("Votifier socket closed.");
}
} catch (BadPaddingException ex) {
logWarning("Unable to decrypt vote record from: " + address
logWarning("Authentication failed: Unable to decrypt V1 vote record from " + address
+ ". Make sure that your public key matches the one you gave the server list.");
debug(ex);
} catch (SocketTimeoutException ex) {
logWarning("Socket timeout while waiting for vote payload from: " + address + " - " + ex.getMessage());
logWarning("Connection timeout: Socket timeout while waiting for vote payload from " + address + " - " + ex.getMessage());
debug(ex);
} catch (Exception ex) {
logWarning("Exception caught while receiving a vote notification from: " + address + " - "
+ ex.getLocalizedMessage());
String errorMsg = ex.getMessage();
if (errorMsg != null && (errorMsg.startsWith("Invalid vote format:") ||
errorMsg.startsWith("Authentication failed:"))) {
// These are validation errors with detailed messages, log them as-is
logWarning(errorMsg);
} else {
// Generic exception with less context
logWarning("Error processing vote from " + address + ": " + ex.getLocalizedMessage());
}
debug(ex);
}
}
Expand Down
Loading