From 360167640606e10b9af463e23fbd0861e66ca3ec Mon Sep 17 00:00:00 2001
From: David Blacka <david@blacka.com>
Date: Mon, 24 Jul 2023 00:12:28 -0400
Subject: [PATCH] Fix critical typo in ZoneVerifier; more sonarlint

---
 build.xml                                            |  4 ++--
 .../java/com/verisignlabs/dnssec/cl/SignKeyset.java  |  1 -
 .../java/com/verisignlabs/dnssec/cl/SignRRset.java   |  1 -
 .../java/com/verisignlabs/dnssec/cl/SignZone.java    |  1 -
 .../dnssec/security/DnsKeyAlgorithm.java             |  4 +---
 .../verisignlabs/dnssec/security/DnsSecVerifier.java |  2 +-
 .../verisignlabs/dnssec/security/ZoneVerifier.java   | 12 +++++++++++-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 7e30180..adec6ff 100644
--- a/build.xml
+++ b/build.xml
@@ -47,8 +47,8 @@
            deprecation="true"
            includeantruntime="false"
            includes="com/verisignlabs/dnssec/"
-           source="8"
-           target="8" />
+           source="11"
+           target="11" />
   </target>
 
   <target name="sectools-jar" depends="usage,sectools">
diff --git a/src/main/java/com/verisignlabs/dnssec/cl/SignKeyset.java b/src/main/java/com/verisignlabs/dnssec/cl/SignKeyset.java
index 4d8c14a..fc2dbf5 100644
--- a/src/main/java/com/verisignlabs/dnssec/cl/SignKeyset.java
+++ b/src/main/java/com/verisignlabs/dnssec/cl/SignKeyset.java
@@ -22,7 +22,6 @@ import java.io.FileFilter;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/src/main/java/com/verisignlabs/dnssec/cl/SignRRset.java b/src/main/java/com/verisignlabs/dnssec/cl/SignRRset.java
index 2cbe32e..940537f 100644
--- a/src/main/java/com/verisignlabs/dnssec/cl/SignRRset.java
+++ b/src/main/java/com/verisignlabs/dnssec/cl/SignRRset.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/src/main/java/com/verisignlabs/dnssec/cl/SignZone.java b/src/main/java/com/verisignlabs/dnssec/cl/SignZone.java
index c343f1e..96f9fa5 100644
--- a/src/main/java/com/verisignlabs/dnssec/cl/SignZone.java
+++ b/src/main/java/com/verisignlabs/dnssec/cl/SignZone.java
@@ -24,7 +24,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
diff --git a/src/main/java/com/verisignlabs/dnssec/security/DnsKeyAlgorithm.java b/src/main/java/com/verisignlabs/dnssec/security/DnsKeyAlgorithm.java
index dc9a971..706dc4f 100644
--- a/src/main/java/com/verisignlabs/dnssec/security/DnsKeyAlgorithm.java
+++ b/src/main/java/com/verisignlabs/dnssec/security/DnsKeyAlgorithm.java
@@ -455,9 +455,7 @@ public class DnsKeyAlgorithm {
    *         alias.
    */
   public boolean supportedAlgorithm(int algorithm) {
-    if (mAlgorithmMap.containsKey(algorithm))
-      return true;
-    return false;
+    return mAlgorithmMap.containsKey(algorithm);
   }
 
   /**
diff --git a/src/main/java/com/verisignlabs/dnssec/security/DnsSecVerifier.java b/src/main/java/com/verisignlabs/dnssec/security/DnsSecVerifier.java
index 1a9994e..578a7d9 100644
--- a/src/main/java/com/verisignlabs/dnssec/security/DnsSecVerifier.java
+++ b/src/main/java/com/verisignlabs/dnssec/security/DnsSecVerifier.java
@@ -262,7 +262,7 @@ public class DnsSecVerifier {
    * @return true if the set verified, false if it did not.
    */
   public boolean verify(RRset rrset) {
-    boolean result = mVerifyAllSigs ? true : false;
+    boolean result = mVerifyAllSigs;
 
     if (rrset.sigs().isEmpty()) {
       log.fine("RRset failed to verify due to lack of signatures");
diff --git a/src/main/java/com/verisignlabs/dnssec/security/ZoneVerifier.java b/src/main/java/com/verisignlabs/dnssec/security/ZoneVerifier.java
index 079d0ea..4d47326 100644
--- a/src/main/java/com/verisignlabs/dnssec/security/ZoneVerifier.java
+++ b/src/main/java/com/verisignlabs/dnssec/security/ZoneVerifier.java
@@ -84,6 +84,14 @@ public class ZoneVerifier {
     private static final long serialVersionUID = 1L;
     private boolean mIsMarked = false;
 
+    @Override
+    public boolean equals(Object o) {
+      return super.equals(o);
+    }
+    @Override
+    public int hashCode() {
+      return super.hashCode();
+    }
     boolean getMark() {
       return mIsMarked;
     }
@@ -161,7 +169,7 @@ public class ZoneVerifier {
       if (mNSEC3Map == null) {
         mNSEC3Map = new TreeMap<>();
       }
-      MarkRRset rrset = mNSECMap.computeIfAbsent(n, k -> new MarkRRset());
+      MarkRRset rrset = mNSEC3Map.computeIfAbsent(n, k -> new MarkRRset());
 
       return addRRtoRRset(rrset, r);
     }
@@ -326,6 +334,8 @@ public class ZoneVerifier {
       }
 
       switch (mDNSSECType) {
+        case UNSIGNED:
+          throw new IllegalArgumentException("Cannot process Unsigned zone");
         case NSEC:
           // all nodes with NSEC records have NSEC and RRSIG types
           typeset.add(Type.NSEC);