1 files changed, 95 insertions, 88 deletions
diff --git a/src/net/java/sip/communicator/impl/dns/SecureMessage.java b/src/net/java/sip/communicator/impl/dns/SecureMessage.java
index 7fe9b68..15f77b0 100644
--- a/src/net/java/sip/communicator/impl/dns/SecureMessage.java
+++ b/src/net/java/sip/communicator/impl/dns/SecureMessage.java
@@ -1,4 +1,4 @@
-/*
+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,90 +15,97 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.impl.dns;
-
-import java.io.*;
-
-import org.xbill.DNS.*;
-
-/**
- * DNS Message that adds DNSSEC validation information.
- *
- * @author Ingo Bauersachs
- */
-public class SecureMessage
-    extends Message
-{
-    private boolean secure;
-    private boolean bogus;
-    private String bogusReason;
-
-    /**
-     * Creates a new instance of this class based on data received from an
-     * Unbound resolve.
-     *
-     * @param msg The answer of the Unbound resolver.
-     * @throws IOException
-     */
-    public SecureMessage(UnboundResult msg) throws IOException
-    {
-        super(msg.answerPacket);
-        secure = msg.secure;
-        bogus = msg.bogus;
-        bogusReason = msg.whyBogus;
-    }
-
-    /**
-     * Indicates whether the answer is secure.
-     * @return True, if the result is validated securely.
-     */
-    public boolean isSecure()
-    {
-        return secure;
-    }
-
-    /**
-     * Indicates if there was a validation failure.
-     *
-     * @return If the result was not secure (secure == false), and this result
-     *         is due to a security failure, bogus is true.
-     */
-    public boolean isBogus()
-    {
-        return bogus;
-    }
-
-    /**
-     * If the result is bogus this contains a string that describes the failure.
-     *
-     * @return string that describes the failure.
-     */
-    public String getBogusReason()
-    {
-        return bogusReason;
-    }
-
-    /**
-     * Converts the Message to a String. The fields secure, bogus and whyBogus
-     * are append as a comment.
-     */
-    @Override
-    public String toString()
-    {
-        StringBuilder s = new StringBuilder(super.toString());
-        s.append('\n');
-        s.append(";; Secure: ");
-        s.append(secure);
-        s.append('\n');
-        s.append(";; Bogus:  ");
-        s.append(bogus);
-        s.append('\n');
-        if(bogus)
-        {
-            s.append(";;  Reason: ");
-            s.append(bogusReason);
-            s.append('\n');
-        }
-        return s.toString();
-    }
-}
+package net.java.sip.communicator.impl.dns;
+
+import java.io.*;
+
+import org.jitsi.dnssec.validator.*;
+import org.xbill.DNS.*;
+
+/**
+ * DNS Message that adds DNSSEC validation information.
+ *
+ * @author Ingo Bauersachs
+ */
+public class SecureMessage
+    extends Message
+{
+    private boolean secure;
+    private boolean bogus;
+    private String bogusReason;
+
+    /**
+     * Creates a new instance of this class based on data received from a
+     * dnssecjava resolve.
+     *
+     * @param msg The answer of the dnssecjava resolver.
+     * @throws IOException
+     */
+    public SecureMessage(Message msg) throws IOException
+    {
+        super(msg.toWire());
+        secure = msg.getHeader().getFlag(Flags.AD);
+        bogus = !secure && msg.getRcode() == Rcode.SERVFAIL;
+        for (RRset set : msg.getSectionRRsets(Section.ADDITIONAL)) {
+            if (set.getName().equals(Name.root) && set.getType() == Type.TXT
+                    && set.getDClass() == ValidatingResolver.VALIDATION_REASON_QCLASS)
+            {
+                bogusReason = ((TXTRecord)set.first()).getStrings().get(0).toString();
+            }
+        }
+    }
+
+    /**
+     * Indicates whether the answer is secure.
+     * @return True, if the result is validated securely.
+     */
+    public boolean isSecure()
+    {
+        return secure;
+    }
+
+    /**
+     * Indicates if there was a validation failure.
+     *
+     * @return If the result was not secure (secure == false), and this result
+     *         is due to a security failure, bogus is true.
+     */
+    public boolean isBogus()
+    {
+        return bogus;
+    }
+
+    /**
+     * If the result is bogus this contains a string that describes the failure.
+     *
+     * @return string that describes the failure.
+     */
+    public String getBogusReason()
+    {
+        return bogusReason;
+    }
+
+    /**
+     * Converts the Message to a String. The fields secure, bogus and whyBogus
+     * are append as a comment.
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder s = new StringBuilder(super.toString());
+        s.append('\n');
+        s.append(";; Secure: ");
+        s.append(secure);
+        s.append('\n');
+        s.append(";; Bogus:  ");
+        s.append(bogus);
+        s.append('\n');
+        if(bogus)
+        {
+            s.append(";;  Reason: ");
+            s.append(bogusReason);
+            s.append('\n');
+        }
+        return s.toString();
+    }
+}