spotbugs issues + linting

BrightSpots · Oct 23, 2023 · 2fe5650 · 2fe5650
1 parent 3ed3d38
commit 2fe5650
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
@@ -25,4 +25,9 @@
     <Method name="~.*Property"/>
     <Bug code="EI"/>
   </Match>
+  <Match>
+    <Class name="~network\.brightspots\.rcv\.CryptographyXmlParsers\$SignedInfo"/>
+    <Field name="xmlns"/>
+    <Bug code="UrF"/>
+  </Match>
 </FindBugsFilter>
diff --git a/src/main/java/network/brightspots/rcv/CryptographyConfig.java b/src/main/java/network/brightspots/rcv/CryptographyConfig.java
@@ -34,13 +34,17 @@ public static boolean isIsHartSignatureValidationEnabled() {
     return IS_HART_SIGNATURE_VALIDATION_ENABLED;
   }
 
-  public static RsaKeyValue getRsaPublicKey() {
+  public static synchronized RsaKeyValue getRsaPublicKey() {
+    // Synchronized to prevent a race condition. SpotBugs will complain otherwise, even though
+    // this is not currently called on multiple threads.
     if (rsaKeyValue != null) {
       return rsaKeyValue;
     }
+
     rsaKeyValue = new RsaKeyValue();
     rsaKeyValue.modulus = RSA_MODULUS;
     rsaKeyValue.exponent = RSA_EXPONENT;
+
     return rsaKeyValue;
   }
 

diff --git a/src/main/java/network/brightspots/rcv/CryptographyXmlParsers.java b/src/main/java/network/brightspots/rcv/CryptographyXmlParsers.java
@@ -43,7 +43,6 @@ static class SignedInfo {
     Reference reference;
 
     // Required to match Hart's implementation of canonicalization
-    @SuppressWarnings("unused")
     @JacksonXmlProperty(localName = "xmlns", isAttribute = true)
     String xmlns = "http://www.w3.org/2000/09/xmldsig#";
   }

diff --git a/src/test/java/network/brightspots/rcv/SignatureValidationTests.java b/src/test/java/network/brightspots/rcv/SignatureValidationTests.java
@@ -51,7 +51,10 @@ static void setup() {
 
   @AfterAll
   static void teardown() {
-    assertTrue(TEMP_DIRECTORY.delete());
+    boolean didDelete = TEMP_DIRECTORY.delete();
+    if (!didDelete) {
+      Logger.warning("Failed to clean up directory: %s", TEMP_DIRECTORY.getAbsolutePath());
+    }
   }
 
   static RsaKeyValue getPublicKeyFor(File file) {