linting

BrightSpots · Oct 20, 2023 · 84015d6 · 84015d6
1 parent 7b34757
commit 84015d6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 107 deletions.
diff --git a/src/main/java/network/brightspots/rcv/CryptographySignatureValidation.java b/src/main/java/network/brightspots/rcv/CryptographySignatureValidation.java
@@ -49,7 +49,7 @@
 import javax.xml.crypto.dsig.XMLSignatureFactory;
 import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
 
-public class CryptographySignatureValidation {
+class CryptographySignatureValidation {
   /**
    * This function returns whether the signature matches validation.
    * It throws an error if it is unable to perform this check, for reasons including:
@@ -133,7 +133,7 @@ private static void ensurePublicKeyMatchesExpectedValue(
     rsaFromFile.exponent = rsaFromFile.exponent.trim();
     rsaFromFile.modulus = rsaFromFile.modulus.trim();
     if (!rsaFromFile.exponent.equals(rsaKeyValue.exponent)
-      || !rsaFromFile.modulus.equals(rsaKeyValue.modulus)) {
+        || !rsaFromFile.modulus.equals(rsaKeyValue.modulus)) {
       throw new CouldNotVerifySignatureException(
               "%s was signed with a different public key than %s.\nActual modulus: %s\nExpected: %s"
               .formatted(signatureKeyFile.getAbsolutePath(), publicKeyFile.getAbsolutePath(),
@@ -242,7 +242,7 @@ private static <T> T readFromXml(File xmlFile, Class<T> classType) throws IOExce
     }
   }
 
-  public static class CouldNotVerifySignatureException extends Exception {
+  static class CouldNotVerifySignatureException extends Exception {
     CouldNotVerifySignatureException(String message) {
       super(message);
     }

diff --git a/src/main/java/network/brightspots/rcv/CryptographyXMLParsers.java b/src/main/java/network/brightspots/rcv/CryptographyXMLParsers.java
diff --git a/src/main/java/network/brightspots/rcv/CryptographyXmlParsers.java b/src/main/java/network/brightspots/rcv/CryptographyXmlParsers.java
@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-public class CryptographyXmlParsers {
+class CryptographyXmlParsers {
   @JacksonXmlRootElement(localName = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
   public static class HartSignature {
     @JacksonXmlProperty(localName = "SignedInfo")

diff --git a/src/main/java/network/brightspots/rcv/HartCvrReader.java b/src/main/java/network/brightspots/rcv/HartCvrReader.java
@@ -48,19 +48,19 @@ void readCastVoteRecords(List<CastVoteRecord> castVoteRecords)
       for (File child : children) {
         String childNameLower = child.getName().toLowerCase();
         if (childNameLower.endsWith("xml") && !childNameLower.endsWith(".sig.xml")) {
-          File signatureXML = new File(child.getAbsolutePath() + ".sig.xml");
+          File signatureXml = new File(child.getAbsolutePath() + ".sig.xml");
           boolean isHashVerified;
           try {
             isHashVerified = CryptographySignatureValidation.verifyPublicKeySignature(
-                    publicKeyTxt, signatureXML, child);
+                    publicKeyTxt, signatureXml, child);
           } catch (CryptographySignatureValidation.CouldNotVerifySignatureException e) {
             Logger.severe("Failure while trying to verify hash %s of %s: \n%s",
-                    signatureXML.getAbsolutePath(), child.getAbsolutePath(), e.getMessage());
+                    signatureXml.getAbsolutePath(), child.getAbsolutePath(), e.getMessage());
             throw new CastVoteRecord.CvrParseException();
           }
           if (!isHashVerified) {
             Logger.severe("Incorrect hash %s of %s",
-                    signatureXML.getAbsolutePath(), child.getAbsolutePath());
+                    signatureXml.getAbsolutePath(), child.getAbsolutePath());
             throw new CastVoteRecord.CvrParseException();
           }
 

diff --git a/src/test/java/network/brightspots/rcv/SignatureValidationTests.java b/src/test/java/network/brightspots/rcv/SignatureValidationTests.java
@@ -20,13 +20,12 @@
 
 import static network.brightspots.rcv.CryptographySignatureValidation.CouldNotVerifySignatureException;
 import static network.brightspots.rcv.CryptographySignatureValidation.verifyPublicKeySignature;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -78,7 +77,7 @@ void testModifiedDataFile() throws IOException {
     Files.write(modifiedDataFile.toPath(), "not the original data".getBytes());
 
     Assertions.assertThrows(CouldNotVerifySignatureException.class, () ->
-      verifyPublicKeySignature(DEFAULT_PUBLIC_KEY_FILE, DEFAULT_SIGNATURE_FILE, modifiedDataFile)
+        verifyPublicKeySignature(DEFAULT_PUBLIC_KEY_FILE, DEFAULT_SIGNATURE_FILE, modifiedDataFile)
     );
   }
 
@@ -101,7 +100,7 @@ void testFailsIfFilenameDiffers() throws IOException {
     Files.copy(DEFAULT_DATA_FILE.toPath(), modifiedDataFile.toPath());
 
     Assertions.assertThrows(CouldNotVerifySignatureException.class, () ->
-      verifyPublicKeySignature(DEFAULT_PUBLIC_KEY_FILE, DEFAULT_SIGNATURE_FILE, modifiedDataFile)
+        verifyPublicKeySignature(DEFAULT_PUBLIC_KEY_FILE, DEFAULT_SIGNATURE_FILE, modifiedDataFile)
     );
   }